From 44651c5d2334da5dd295eca9c2e530b99348bdd6 Mon Sep 17 00:00:00 2001 From: Michal Ratajsky Date: Sat, 8 Nov 2014 23:04:31 +0100 Subject: Split MateMixerSwitchRole into MateMixerDeviceSwitchRole and MateMixerStreamSwitchRole --- backends/alsa/alsa-constants.c | 54 ++++++++++++++++++------------------ backends/alsa/alsa-constants.h | 6 ++-- backends/alsa/alsa-device.c | 46 +++++++++++++++--------------- backends/alsa/alsa-switch.c | 10 +++---- backends/alsa/alsa-switch.h | 10 +++---- backends/alsa/alsa-toggle.c | 12 ++++---- backends/alsa/alsa-toggle.h | 12 ++++---- backends/oss/oss-switch.c | 2 +- backends/pulse/pulse-device-switch.c | 2 +- backends/pulse/pulse-sink-switch.c | 2 +- backends/pulse/pulse-source-switch.c | 2 +- 11 files changed, 79 insertions(+), 79 deletions(-) (limited to 'backends') diff --git a/backends/alsa/alsa-constants.c b/backends/alsa/alsa-constants.c index 1bc29bc..853db95 100644 --- a/backends/alsa/alsa-constants.c +++ b/backends/alsa/alsa-constants.c @@ -113,35 +113,35 @@ const AlsaControlInfo alsa_controls[] = const AlsaSwitchInfo alsa_switches[] = { /* Switches */ - { "Analog Output", N_("Analog Output"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Analog Source", N_("Analog Source"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Capture Source", N_("Capture Source"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Input Source", N_("Input Source"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Input Source Select", N_("Input Source"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Digital Input Source", N_("Digital Input Source"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "PCM Capture Source", N_("PCM Capture Source"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "IEC958 Playback Source", N_("Digital Playback Source"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Mono Output Select", N_("Mono Output"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Shared Mic/Line in", N_("Shared Microphone/Line In"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Mic Select", N_("Microphone"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Mic Jack Mode", N_("Microphone Jack Mode"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Surround Jack Mode", N_("Surround Jack Mode"), MATE_MIXER_SWITCH_ROLE_UNKNOWN }, - { "Auto-Mute Mode", N_("Auto-Mute Mode"), MATE_MIXER_SWITCH_ROLE_UNKNOWN }, + { "Analog Output", N_("Analog Output"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Analog Source", N_("Analog Source"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Capture Source", N_("Capture Source"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Input Source", N_("Input Source"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Input Source Select", N_("Input Source"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Digital Input Source", N_("Digital Input Source"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "PCM Capture Source", N_("PCM Capture Source"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "IEC958 Playback Source", N_("Digital Playback Source"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Mono Output Select", N_("Mono Output"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Shared Mic/Line in", N_("Shared Microphone/Line In"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Mic Select", N_("Microphone"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Mic Jack Mode", N_("Microphone Jack Mode"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Surround Jack Mode", N_("Surround Jack Mode"), MATE_MIXER_STREAM_SWITCH_ROLE_UNKNOWN }, + { "Auto-Mute Mode", N_("Auto-Mute Mode"), MATE_MIXER_STREAM_SWITCH_ROLE_UNKNOWN }, /* Toggles */ - { "External Amplifier", N_("External Amplifier"), MATE_MIXER_SWITCH_ROLE_UNKNOWN }, - { "Bass Boost", N_("Bass Boost"), MATE_MIXER_SWITCH_ROLE_BOOST }, - { "Capture Boost", N_("Capture Boost"), MATE_MIXER_SWITCH_ROLE_BOOST }, - { "IEC958", N_("Digital"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "IEC958 In", N_("Digital In"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "IEC958 Default PCM", N_("Digital Default PCM"), MATE_MIXER_SWITCH_ROLE_UNKNOWN }, - { "IEC958 Optical", N_("Optical"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Auto Gain Control", N_("Auto Gain Control"), MATE_MIXER_SWITCH_ROLE_UNKNOWN }, - { "Mix", N_("Mix"), MATE_MIXER_SWITCH_ROLE_UNKNOWN }, - { "Mix Mono", N_("Mix Mono"), MATE_MIXER_SWITCH_ROLE_UNKNOWN }, - { "Mic Capture", N_("Microphone Capture"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Input 1", N_("Input 1"), MATE_MIXER_SWITCH_ROLE_PORT }, - { "Input 2", N_("Input 2"), MATE_MIXER_SWITCH_ROLE_PORT }, + { "External Amplifier", N_("External Amplifier"), MATE_MIXER_STREAM_SWITCH_ROLE_UNKNOWN }, + { "Bass Boost", N_("Bass Boost"), MATE_MIXER_STREAM_SWITCH_ROLE_BOOST }, + { "Capture Boost", N_("Capture Boost"), MATE_MIXER_STREAM_SWITCH_ROLE_BOOST }, + { "IEC958", N_("Digital"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "IEC958 In", N_("Digital In"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "IEC958 Default PCM", N_("Digital Default PCM"), MATE_MIXER_STREAM_SWITCH_ROLE_UNKNOWN }, + { "IEC958 Optical", N_("Optical"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Auto Gain Control", N_("Auto Gain Control"), MATE_MIXER_STREAM_SWITCH_ROLE_UNKNOWN }, + { "Mix", N_("Mix"), MATE_MIXER_STREAM_SWITCH_ROLE_UNKNOWN }, + { "Mix Mono", N_("Mix Mono"), MATE_MIXER_STREAM_SWITCH_ROLE_UNKNOWN }, + { "Mic Capture", N_("Microphone Capture"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Input 1", N_("Input 1"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, + { "Input 2", N_("Input 2"), MATE_MIXER_STREAM_SWITCH_ROLE_PORT }, { NULL } }; diff --git a/backends/alsa/alsa-constants.h b/backends/alsa/alsa-constants.h index 8137289..9ec4a0a 100644 --- a/backends/alsa/alsa-constants.h +++ b/backends/alsa/alsa-constants.h @@ -33,9 +33,9 @@ typedef struct { } AlsaControlInfo; typedef struct { - gchar *name; - gchar *label; - MateMixerSwitchRole role; + gchar *name; + gchar *label; + MateMixerStreamSwitchRole role; } AlsaSwitchInfo; typedef struct { diff --git a/backends/alsa/alsa-device.c b/backends/alsa/alsa-device.c index a4f625c..4c78f9d 100644 --- a/backends/alsa/alsa-device.c +++ b/backends/alsa/alsa-device.c @@ -147,7 +147,7 @@ static MateMixerDirection get_switch_direction (snd_mixer_elem_t static void get_switch_info (snd_mixer_elem_t *el, gchar **name, gchar **label, - MateMixerSwitchRole *role); + MateMixerStreamSwitchRole *role); static void close_mixer (AlsaDevice *device); @@ -585,12 +585,12 @@ add_stream_output_control (AlsaDevice *device, snd_mixer_elem_t *el) static AlsaToggle * create_toggle (AlsaDevice *device, snd_mixer_elem_t *el, AlsaToggleType type) { - AlsaToggle *toggle; - AlsaSwitchOption *on; - AlsaSwitchOption *off; - gchar *name; - gchar *label; - MateMixerSwitchRole role; + AlsaToggle *toggle; + AlsaSwitchOption *on; + AlsaSwitchOption *off; + gchar *name; + gchar *label; + MateMixerStreamSwitchRole role; on = alsa_switch_option_new ("On", _("On"), NULL, 1); off = alsa_switch_option_new ("Off", _("Off"), NULL, 0); @@ -612,14 +612,14 @@ create_toggle (AlsaDevice *device, snd_mixer_elem_t *el, AlsaToggleType type) static void add_switch (AlsaDevice *device, AlsaStream *stream, snd_mixer_elem_t *el) { - AlsaElement *element = NULL; - GList *options = NULL; - gchar *name; - gchar *label; - gchar item[128]; - guint i; - gint count; - MateMixerSwitchRole role; + AlsaElement *element = NULL; + GList *options = NULL; + gchar *name; + gchar *label; + gchar item[128]; + guint i; + gint count; + MateMixerStreamSwitchRole role; count = snd_mixer_selem_get_enum_items (el); if G_UNLIKELY (count <= 0) { @@ -1138,15 +1138,15 @@ get_switch_direction (snd_mixer_elem_t *el) } static void -get_switch_info (snd_mixer_elem_t *el, - gchar **name, - gchar **label, - MateMixerSwitchRole *role) +get_switch_info (snd_mixer_elem_t *el, + gchar **name, + gchar **label, + MateMixerStreamSwitchRole *role) { - MateMixerSwitchRole r = MATE_MIXER_SWITCH_ROLE_UNKNOWN; - const gchar *n; - const gchar *l = NULL; - gint i; + MateMixerStreamSwitchRole r = MATE_MIXER_STREAM_SWITCH_ROLE_UNKNOWN; + const gchar *n; + const gchar *l = NULL; + gint i; n = snd_mixer_selem_get_name (el); diff --git a/backends/alsa/alsa-switch.c b/backends/alsa/alsa-switch.c index b080188..c2a95ca 100644 --- a/backends/alsa/alsa-switch.c +++ b/backends/alsa/alsa-switch.c @@ -103,11 +103,11 @@ alsa_switch_init (AlsaSwitch *swtch) } AlsaSwitch * -alsa_switch_new (AlsaStream *stream, - const gchar *name, - const gchar *label, - MateMixerSwitchRole role, - GList *options) +alsa_switch_new (AlsaStream *stream, + const gchar *name, + const gchar *label, + MateMixerStreamSwitchRole role, + GList *options) { AlsaSwitch *swtch; diff --git a/backends/alsa/alsa-switch.h b/backends/alsa/alsa-switch.h index 9ebf907..e15b960 100644 --- a/backends/alsa/alsa-switch.h +++ b/backends/alsa/alsa-switch.h @@ -57,11 +57,11 @@ struct _AlsaSwitchClass GType alsa_switch_get_type (void) G_GNUC_CONST; -AlsaSwitch *alsa_switch_new (AlsaStream *stream, - const gchar *name, - const gchar *label, - MateMixerSwitchRole role, - GList *options); +AlsaSwitch *alsa_switch_new (AlsaStream *stream, + const gchar *name, + const gchar *label, + MateMixerStreamSwitchRole role, + GList *options); G_END_DECLS diff --git a/backends/alsa/alsa-toggle.c b/backends/alsa/alsa-toggle.c index c843985..3ceedf5 100644 --- a/backends/alsa/alsa-toggle.c +++ b/backends/alsa/alsa-toggle.c @@ -78,12 +78,12 @@ alsa_toggle_init (AlsaToggle *toggle) } AlsaToggle * -alsa_toggle_new (const gchar *name, - const gchar *label, - MateMixerSwitchRole role, - AlsaToggleType type, - AlsaSwitchOption *on, - AlsaSwitchOption *off) +alsa_toggle_new (const gchar *name, + const gchar *label, + MateMixerStreamSwitchRole role, + AlsaToggleType type, + AlsaSwitchOption *on, + AlsaSwitchOption *off) { AlsaToggle *toggle; diff --git a/backends/alsa/alsa-toggle.h b/backends/alsa/alsa-toggle.h index 112b78e..2d772f9 100644 --- a/backends/alsa/alsa-toggle.h +++ b/backends/alsa/alsa-toggle.h @@ -62,12 +62,12 @@ struct _AlsaToggleClass GType alsa_toggle_get_type (void) G_GNUC_CONST; -AlsaToggle *alsa_toggle_new (const gchar *name, - const gchar *label, - MateMixerSwitchRole role, - AlsaToggleType type, - AlsaSwitchOption *on, - AlsaSwitchOption *off); +AlsaToggle *alsa_toggle_new (const gchar *name, + const gchar *label, + MateMixerStreamSwitchRole role, + AlsaToggleType type, + AlsaSwitchOption *on, + AlsaSwitchOption *off); G_END_DECLS diff --git a/backends/oss/oss-switch.c b/backends/oss/oss-switch.c index 40527b9..6b78833 100644 --- a/backends/oss/oss-switch.c +++ b/backends/oss/oss-switch.c @@ -117,7 +117,7 @@ oss_switch_new (OssStream *stream, swtch = g_object_new (OSS_TYPE_SWITCH, "name", name, "label", label, - "role", MATE_MIXER_SWITCH_ROLE_PORT, + "role", MATE_MIXER_STREAM_SWITCH_ROLE_PORT, "stream", stream, NULL); diff --git a/backends/pulse/pulse-device-switch.c b/backends/pulse/pulse-device-switch.c index b41d8ea..c6b8316 100644 --- a/backends/pulse/pulse-device-switch.c +++ b/backends/pulse/pulse-device-switch.c @@ -92,7 +92,7 @@ pulse_device_switch_new (const gchar *name, const gchar *label, PulseDevice *dev return g_object_new (PULSE_TYPE_DEVICE_SWITCH, "name", name, "label", label, - "role", MATE_MIXER_SWITCH_ROLE_DEVICE_PROFILE, + "role", MATE_MIXER_DEVICE_SWITCH_ROLE_PROFILE, "device", device, NULL); } diff --git a/backends/pulse/pulse-sink-switch.c b/backends/pulse/pulse-sink-switch.c index 0e08dac..62aca94 100644 --- a/backends/pulse/pulse-sink-switch.c +++ b/backends/pulse/pulse-sink-switch.c @@ -55,7 +55,7 @@ pulse_sink_switch_new (const gchar *name, const gchar *label, PulseSink *sink) return g_object_new (PULSE_TYPE_SINK_SWITCH, "name", name, "label", label, - "role", MATE_MIXER_SWITCH_ROLE_PORT, + "role", MATE_MIXER_STREAM_SWITCH_ROLE_PORT, "stream", sink, NULL); } diff --git a/backends/pulse/pulse-source-switch.c b/backends/pulse/pulse-source-switch.c index 178702e..9616bb1 100644 --- a/backends/pulse/pulse-source-switch.c +++ b/backends/pulse/pulse-source-switch.c @@ -55,7 +55,7 @@ pulse_source_switch_new (const gchar *name, const gchar *label, PulseSource *sou return g_object_new (PULSE_TYPE_SOURCE_SWITCH, "name", name, "label", label, - "role", MATE_MIXER_SWITCH_ROLE_PORT, + "role", MATE_MIXER_STREAM_SWITCH_ROLE_PORT, "stream", source, NULL); } -- cgit v1.2.1