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

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).

diff --git a/ChangeLog b/ChangeLog
index f81625331cd0cfdf94426822000c7bb37d55897b..56c264ee6ad4e39beaa744f3ee546888194ff3ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * sys/v4l2/v4l2src_calls.c:

diff --git a/ext/gconf/gstgconfaudiosink.c b/ext/gconf/gstgconfaudiosink.c
index 0737af67a5d0d42be2d303a3011c4ce57af86100..a8bf330566a7062376278c6e8d732d813ed2c262 100644 (file)
--- a/ext/gconf/gstgconfaudiosink.c
+++ b/ext/gconf/gstgconfaudiosink.c
@@ -206,10 +206,8 @@ gst_gconf_switch_profile (GstGConfAudioSink * sink, GstGConfProfile profile)
     return;
 
   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",
-        key, sink->profile);
+        gst_gconf_get_key_for_sink_profile (sink->profile), sink->profile);
     gconf_client_notify_remove (sink->client, sink->connection);
     sink->connection = 0;
   }

diff --git a/sys/oss/gstossmixertrack.c b/sys/oss/gstossmixertrack.c
index b8333864e9718e91186c5f4cc65489491540765d..4b1d962f5592de00524054df5f85379adead8e37 100644 (file)
--- a/sys/oss/gstossmixertrack.c
+++ b/sys/oss/gstossmixertrack.c
@@ -84,9 +84,10 @@ fill_labels (void)
 {
   gint i, pos;
   gchar *origs[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
-  struct
+  const struct
   {
-    gchar *given, *wanted;
+    const gchar *given;
+    const gchar *wanted;
   }
   cases[] = {
     /* 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
      * I'm doing this in such a horribly complicated way. */
     {
-    "Vol  ", _("Volume")}
-    , {
-    "Bass ", _("Bass")}
-    , {
-    "Trebl", _("Treble")}
-    , {
-    "Synth", _("Synth")}
-    , {
-    "Pcm  ", _("PCM")}
-    , {
-    "Spkr ", _("Speaker")}
-    , {
-    "Line ", _("Line-in")}
-    , {
-    "Mic  ", _("Microphone")}
-    , {
-    "CD   ", _("CD")}
-    , {
-    "Mix  ", _("Mixer")}
-    , {
-    "Pcm2 ", _("PCM-2")}
-    , {
-    "Rec  ", _("Record")}
-    , {
-    "IGain", _("In-gain")}
-    , {
-    "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")}
-    , {
+    "Vol  ", _("Volume")}, {
+    "Bass ", _("Bass")}, {
+    "Trebl", _("Treble")}, {
+    "Synth", _("Synth")}, {
+    "Pcm  ", _("PCM")}, {
+    "Spkr ", _("Speaker")}, {
+    "Line ", _("Line-in")}, {
+    "Mic  ", _("Microphone")}, {
+    "CD   ", _("CD")}, {
+    "Mix  ", _("Mixer")}, {
+    "Pcm2 ", _("PCM-2")}, {
+    "Rec  ", _("Record")}, {
+    "IGain", _("In-gain")}, {
+    "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}
   };