From a189f2d0ecdbd9f5efd4cd0f38a0fcddb1134906 Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Sun, 11 Feb 2001 15:45:44 +0000 Subject: [PATCH] Completed mixer API. Improved iterators. Renamed control values struct. Rewritten simple elements implementation --- envy24control/envy24control.c | 2 +- envy24control/hardware.c | 12 ++++++------ envy24control/levelmeters.c | 2 +- envy24control/mixer.c | 6 +++--- envy24control/patchbay.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/envy24control/envy24control.c b/envy24control/envy24control.c index d9cc63f..d0dbd77 100644 --- a/envy24control/envy24control.c +++ b/envy24control/envy24control.c @@ -1029,7 +1029,7 @@ int main(int argc, char **argv) char name[32], title[128]; int err; unsigned int cards_mask; - snd_ctl_elem_t ctl; + snd_ctl_elem_value_t ctl; // snd_mixer_filter_t filter; /* Go through gtk initialization */ diff --git a/envy24control/hardware.c b/envy24control/hardware.c index 6f1bd98..f108939 100644 --- a/envy24control/hardware.c +++ b/envy24control/hardware.c @@ -19,11 +19,11 @@ #include "envy24control.h" -static snd_ctl_elem_t spdif_master; -static snd_ctl_elem_t word_clock_sync; -static snd_ctl_elem_t volume_rate; -static snd_ctl_elem_t spdif_input; -static snd_ctl_elem_t spdif_output; +static snd_ctl_elem_value_t spdif_master; +static snd_ctl_elem_value_t word_clock_sync; +static snd_ctl_elem_value_t volume_rate; +static snd_ctl_elem_value_t spdif_input; +static snd_ctl_elem_value_t spdif_output; #define toggle_set(widget, state) \ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), state); @@ -96,7 +96,7 @@ void master_clock_toggled(GtkWidget *togglebutton, gpointer data) gint master_clock_status_timeout_callback(gpointer data) { - snd_ctl_elem_t sw; + snd_ctl_elem_value_t sw; int err; if (card_eeprom.subvendor != ICE1712_SUBDEVICE_DELTA1010) diff --git a/envy24control/levelmeters.c b/envy24control/levelmeters.c index 9263cfb..e68ed71 100644 --- a/envy24control/levelmeters.c +++ b/envy24control/levelmeters.c @@ -26,7 +26,7 @@ static GdkGC *penOrangeLight[21] = { NULL, }; static GdkGC *penRedShadow[21] = { NULL, }; static GdkGC *penRedLight[21] = { NULL, }; static GdkPixmap *pixmap[21] = { NULL, }; -static snd_ctl_elem_t peaks; +static snd_ctl_elem_value_t peaks; static void update_peak_switch(void) { diff --git a/envy24control/mixer.c b/envy24control/mixer.c index 701e327..ad74039 100644 --- a/envy24control/mixer.c +++ b/envy24control/mixer.c @@ -29,7 +29,7 @@ static int is_active(GtkWidget *widget) void mixer_update_stream(int stream, int vol_flag, int sw_flag) { - snd_ctl_elem_t vol, sw; + snd_ctl_elem_value_t vol, sw; int err; if (vol_flag) { @@ -62,7 +62,7 @@ void mixer_update_stream(int stream, int vol_flag, int sw_flag) static void set_switch1(int stream, int left, int right) { - snd_ctl_elem_t sw; + snd_ctl_elem_value_t sw; int err; memset(&sw, 0, sizeof(sw)); @@ -147,7 +147,7 @@ void mixer_toggled_mute(GtkWidget *togglebutton, gpointer data) static void set_volume1(int stream, int left, int right) { - snd_ctl_elem_t vol; + snd_ctl_elem_value_t vol; int err; memset(&vol, 0, sizeof(vol)); diff --git a/envy24control/patchbay.c b/envy24control/patchbay.c index f36a005..f95ff94 100644 --- a/envy24control/patchbay.c +++ b/envy24control/patchbay.c @@ -19,7 +19,7 @@ #include "envy24control.h" -static snd_ctl_elem_t routes; +static snd_ctl_elem_value_t routes; #define toggle_set(widget, state) \ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), state); -- 2.47.1