Changed codes to adapt for the latest control interface.

Seems working now..
This commit is contained in:
Takashi Iwai 2001-06-06 13:58:01 +00:00
parent eaaf0e43b8
commit a78e4c037f
7 changed files with 249 additions and 250 deletions

View file

@ -29,53 +29,60 @@ static int is_active(GtkWidget *widget)
void mixer_update_stream(int stream, int vol_flag, int sw_flag)
{
snd_ctl_elem_value_t vol, sw;
int err;
if (vol_flag) {
memset(&vol, 0, sizeof(vol));
vol.id.iface = SND_CTL_ELEM_IFACE_MIXER;
strcpy(vol.id.name, stream <= 10 ? "Multi Playback Volume" : "Multi Capture Volume");
vol.id.index = (stream - 1) % 10;
if ((err = snd_ctl_elem_read(card_ctl, &vol)) < 0)
snd_ctl_elem_value_t *vol;
int v[2];
snd_ctl_elem_value_alloca(&vol);
snd_ctl_elem_value_set_interface(vol, SND_CTL_ELEM_IFACE_MIXER);
snd_ctl_elem_value_set_name(vol, stream <= 10 ? "Multi Playback Volume" : "Multi Capture Volume");
snd_ctl_elem_value_set_index(vol, (stream - 1) % 10);
if ((err = snd_ctl_elem_read(ctl, vol)) < 0)
g_print("Unable to read multi playback volume: %s\n", snd_strerror(err));
gtk_adjustment_set_value(GTK_ADJUSTMENT(mixer_adj[stream-1][0]), 96 - vol.value.integer.value[0]);
gtk_adjustment_set_value(GTK_ADJUSTMENT(mixer_adj[stream-1][1]), 96 - vol.value.integer.value[1]);
if (vol.value.integer.value[0] != vol.value.integer.value[1])
v[0] = snd_ctl_elem_value_get_integer(vol, 0);
v[1] = snd_ctl_elem_value_get_integer(vol, 1);
gtk_adjustment_set_value(GTK_ADJUSTMENT(mixer_adj[stream-1][0]), 96 - v[0]);
gtk_adjustment_set_value(GTK_ADJUSTMENT(mixer_adj[stream-1][1]), 96 - v[1]);
if (v[0] != v[1])
toggle_set(mixer_stereo_toggle[stream-1], FALSE);
}
if (sw_flag) {
memset(&sw, 0, sizeof(sw));
sw.id.iface = SND_CTL_ELEM_IFACE_MIXER;
strcpy(sw.id.name, stream <= 10 ? "Multi Playback Switch" : "Multi Capture Switch");
sw.id.index = (stream - 1) % 10;
if ((err = snd_ctl_elem_read(card_ctl, &sw)) < 0)
snd_ctl_elem_value_t *sw;
int v[2];
snd_ctl_elem_value_alloca(&sw);
snd_ctl_elem_value_set_interface(sw, SND_CTL_ELEM_IFACE_MIXER);
snd_ctl_elem_value_set_name(sw, stream <= 10 ? "Multi Playback Switch" : "Multi Capture Switch");
snd_ctl_elem_value_set_index(sw, (stream - 1) % 10);
if ((err = snd_ctl_elem_read(ctl, sw)) < 0)
g_print("Unable to read multi playback switch: %s\n", snd_strerror(err));
toggle_set(mixer_solo_toggle[stream-1][0], sw.value.integer.value[0] ? TRUE : FALSE);
toggle_set(mixer_solo_toggle[stream-1][1], sw.value.integer.value[1] ? TRUE : FALSE);
toggle_set(mixer_mute_toggle[stream-1][0], !sw.value.integer.value[0] ? TRUE : FALSE);
toggle_set(mixer_mute_toggle[stream-1][1], !sw.value.integer.value[1] ? TRUE : FALSE);
if (sw.value.integer.value[0] != sw.value.integer.value[1])
v[0] = snd_ctl_elem_value_get_boolean(sw, 0);
v[1] = snd_ctl_elem_value_get_boolean(sw, 1);
toggle_set(mixer_solo_toggle[stream-1][0], v[0] ? TRUE : FALSE);
toggle_set(mixer_solo_toggle[stream-1][1], v[1] ? TRUE : FALSE);
toggle_set(mixer_mute_toggle[stream-1][0], !v[0] ? TRUE : FALSE);
toggle_set(mixer_mute_toggle[stream-1][1], !v[1] ? TRUE : FALSE);
if (v[0] != v[1])
toggle_set(mixer_stereo_toggle[stream-1], FALSE);
}
}
static void set_switch1(int stream, int left, int right)
{
snd_ctl_elem_value_t sw;
snd_ctl_elem_value_t *sw;
int err;
memset(&sw, 0, sizeof(sw));
sw.id.iface = SND_CTL_ELEM_IFACE_MIXER;
strcpy(sw.id.name, stream <= 10 ? "Multi Playback Switch" : "Multi Capture Switch");
sw.id.index = (stream - 1) % 10;
if ((err = snd_ctl_elem_read(card_ctl, &sw)) < 0)
snd_ctl_elem_value_alloca(&sw);
snd_ctl_elem_value_set_interface(sw, SND_CTL_ELEM_IFACE_MIXER);
snd_ctl_elem_value_set_name(sw, stream <= 10 ? "Multi Playback Switch" : "Multi Capture Switch");
snd_ctl_elem_value_set_index(sw, (stream - 1) % 10);
if ((err = snd_ctl_elem_read(ctl, sw)) < 0)
g_print("Unable to read multi switch: %s\n", snd_strerror(err));
if (left >= 0)
sw.value.integer.value[0] = left != 0;
snd_ctl_elem_value_set_boolean(sw, 0, left != 0);
if (right >= 0)
sw.value.integer.value[1] = right != 0;
if ((err = snd_ctl_elem_write(card_ctl, &sw)) < 0 && err != -EBUSY)
snd_ctl_elem_value_set_boolean(sw, 1, right != 0);
if ((err = snd_ctl_elem_write(ctl, sw)) < 0 && err != -EBUSY)
g_print("Unable to write multi switch: %s\n", snd_strerror(err));
}
@ -147,20 +154,20 @@ void mixer_toggled_mute(GtkWidget *togglebutton, gpointer data)
static void set_volume1(int stream, int left, int right)
{
snd_ctl_elem_value_t vol;
snd_ctl_elem_value_t *vol;
int err;
memset(&vol, 0, sizeof(vol));
vol.id.iface = SND_CTL_ELEM_IFACE_MIXER;
strcpy(vol.id.name, stream <= 10 ? "Multi Playback Volume" : "Multi Capture Volume");
vol.id.index = (stream - 1) % 10;
if ((err = snd_ctl_elem_read(card_ctl, &vol)) < 0)
snd_ctl_elem_value_alloca(&vol);
snd_ctl_elem_value_set_interface(vol, SND_CTL_ELEM_IFACE_MIXER);
snd_ctl_elem_value_set_name(vol, stream <= 10 ? "Multi Playback Volume" : "Multi Capture Volume");
snd_ctl_elem_value_set_index(vol, (stream - 1) % 10);
if ((err = snd_ctl_elem_read(ctl, vol)) < 0)
g_print("Unable to read multi volume: %s\n", snd_strerror(err));
if (left >= 0)
vol.value.integer.value[0] = left;
snd_ctl_elem_value_set_integer(vol, 0, left);
if (right >= 0)
vol.value.integer.value[1] = right;
if ((err = snd_ctl_elem_write(card_ctl, &vol)) < 0 && err != -EBUSY)
snd_ctl_elem_value_set_integer(vol, 1, right);
if ((err = snd_ctl_elem_write(ctl, vol)) < 0 && err != -EBUSY)
g_print("Unable to write multi volume: %s\n", snd_strerror(err));
}