mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/gconf/gstgconfaudiosink.c: Fix warning when building without debug.

Browse source 
Original commit message from CVS:
* ext/gconf/gstgconfaudiosink.c:
Fix warning when building without debug.
* sys/oss/gstossmixertrack.c:
Use const like in alsamixertrack.c (fixes warnings).
This commit is contained in:
Stefan Kost 2007-09-12 09:13:39 +00:00
parent eb2aee1b34
commit 5ff86cd792
3 changed files with 37 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-09-12 Stefan Kost <ensonic@users.sf.net>
* ext/gconf/gstgconfaudiosink.c:
Fix warning when building without debug.
* sys/oss/gstossmixertrack.c:
Use const like in alsamixertrack.c (fixes warnings).
2007-09-11 Wim Taymans <wim.taymans@gmail.com> 2007-09-11 Wim Taymans <wim.taymans@gmail.com>
* sys/v4l2/v4l2src_calls.c: * sys/v4l2/v4l2src_calls.c:

4
ext/gconf/gstgconfaudiosink.c
View file

@ -206,10 +206,8 @@ gst_gconf_switch_profile (GstGConfAudioSink * sink, GstGConfProfile profile)
return; return;
if (sink->connection) { if (sink->connection) {
const gchar *key = gst_gconf_get_key_for_sink_profile (sink->profile);
GST_DEBUG_OBJECT (sink, "Unsubscribing old key %s for profile %d", GST_DEBUG_OBJECT (sink, "Unsubscribing old key %s for profile %d",
key, sink->profile); gst_gconf_get_key_for_sink_profile (sink->profile), sink->profile);
gconf_client_notify_remove (sink->client, sink->connection); gconf_client_notify_remove (sink->client, sink->connection);
sink->connection = 0; sink->connection = 0;
} }

80
sys/oss/gstossmixertrack.c
View file

@ -84,9 +84,10 @@ fill_labels (void)
{ {
gint i, pos; gint i, pos;
gchar *origs[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS; gchar *origs[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
struct const struct
{ {
gchar *given, *wanted; const gchar *given;
const gchar *wanted;
} }
cases[] = { cases[] = {
/* Note: this list is simply ripped from soundcard.h. For /* Note: this list is simply ripped from soundcard.h. For
@ -94,56 +95,31 @@ fill_labels (void)
* etc.) - feel free to add them. That's the reason why * etc.) - feel free to add them. That's the reason why
* I'm doing this in such a horribly complicated way. */ * I'm doing this in such a horribly complicated way. */
{ {
"Vol ", _("Volume")} "Vol ", _("Volume")}, {
, { "Bass ", _("Bass")}, {
"Bass ", _("Bass")} "Trebl", _("Treble")}, {
, { "Synth", _("Synth")}, {
"Trebl", _("Treble")} "Pcm ", _("PCM")}, {
, { "Spkr ", _("Speaker")}, {
"Synth", _("Synth")} "Line ", _("Line-in")}, {
, { "Mic ", _("Microphone")}, {
"Pcm ", _("PCM")} "CD ", _("CD")}, {
, { "Mix ", _("Mixer")}, {
"Spkr ", _("Speaker")} "Pcm2 ", _("PCM-2")}, {
, { "Rec ", _("Record")}, {
"Line ", _("Line-in")} "IGain", _("In-gain")}, {
, { "OGain", _("Out-gain")}, {
"Mic ", _("Microphone")} "Line1", _("Line-1")}, {
, { "Line2", _("Line-2")}, {
"CD ", _("CD")} "Line3", _("Line-3")}, {
, { "Digital1", _("Digital-1")}, {
"Mix ", _("Mixer")} "Digital2", _("Digital-2")}, {
, { "Digital3", _("Digital-3")}, {
"Pcm2 ", _("PCM-2")} "PhoneIn", _("Phone-in")}, {
, { "PhoneOut", _("Phone-out")}, {
"Rec ", _("Record")} "Video", _("Video")}, {
, { "Radio", _("Radio")}, {
"IGain", _("In-gain")} "Monitor", _("Monitor")}, {
, {
"OGain", _("Out-gain")}
, {
"Line1", _("Line-1")}
, {
"Line2", _("Line-2")}
, {
"Line3", _("Line-3")}
, {
"Digital1", _("Digital-1")}
, {
"Digital2", _("Digital-2")}
, {
"Digital3", _("Digital-3")}
, {
"PhoneIn", _("Phone-in")}
, {
"PhoneOut", _("Phone-out")}
, {
"Video", _("Video")}
, {
"Radio", _("Radio")}
, {
"Monitor", _("Monitor")}
, {
NULL, NULL} NULL, NULL}
}; };