compile fixes for --disable-gst-debug, G_DISABLE_ASSERT and friends

Original commit message from CVS:
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_get_volume),
(gst_alsa_mixer_set_volume), (gst_alsa_mixer_set_mute),
(gst_alsa_mixer_set_record), (gst_alsa_mixer_set_option),
(gst_alsa_mixer_get_option):
* ext/dvdnav/dvdnavsrc.c: (dvdnav_get_event_name),
(dvdnavsrc_print_event):
* ext/ogg/gstoggdemux.c: (_find_chain_process), (gst_ogg_print):
* ext/ogg/gstoggmux.c: (gst_ogg_mux_pad_link),
(gst_ogg_mux_pad_unlink):
* gst/multipart/multipartmux.c: (gst_multipart_mux_pad_link),
(gst_multipart_mux_pad_unlink):
* gst/videofilter/gstvideobalance.c:
(gst_videobalance_colorbalance_set_value):
* gst/videomixer/videomixer.c: (gst_videomixer_pad_link),
(gst_videomixer_pad_unlink):
* po/uk.po:
* sys/oss/gstossmixer.c:
* sys/v4l/gstv4lcolorbalance.c:
* sys/v4l/gstv4ltuner.c:
* sys/v4l/v4lsrc_calls.c:
* sys/v4l2/gstv4l2colorbalance.c:
* sys/v4l2/gstv4l2tuner.c:
compile fixes for --disable-gst-debug, G_DISABLE_ASSERT and friends

diff --git a/ChangeLog b/ChangeLog
index 56ea378fb931ee802381102f0cdb981d08c1c0e6..8ec701f4eeb0d911259fc33b542d7f5631366e59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2004-08-03  Benjamin Otte  <otte@gnome.org>
+
+       * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_get_volume),
+       (gst_alsa_mixer_set_volume), (gst_alsa_mixer_set_mute),
+       (gst_alsa_mixer_set_record), (gst_alsa_mixer_set_option),
+       (gst_alsa_mixer_get_option):
+       * ext/dvdnav/dvdnavsrc.c: (dvdnav_get_event_name),
+       (dvdnavsrc_print_event):
+       * ext/ogg/gstoggdemux.c: (_find_chain_process), (gst_ogg_print):
+       * ext/ogg/gstoggmux.c: (gst_ogg_mux_pad_link),
+       (gst_ogg_mux_pad_unlink):
+       * gst/multipart/multipartmux.c: (gst_multipart_mux_pad_link),
+       (gst_multipart_mux_pad_unlink):
+       * gst/videofilter/gstvideobalance.c:
+       (gst_videobalance_colorbalance_set_value):
+       * gst/videomixer/videomixer.c: (gst_videomixer_pad_link),
+       (gst_videomixer_pad_unlink):
+       * po/uk.po:
+       * sys/oss/gstossmixer.c:
+       * sys/v4l/gstv4lcolorbalance.c:
+       * sys/v4l/gstv4ltuner.c:
+       * sys/v4l/v4lsrc_calls.c:
+       * sys/v4l2/gstv4l2colorbalance.c:
+       * sys/v4l2/gstv4l2tuner.c:
+         compile fixes for --disable-gst-debug, G_DISABLE_ASSERT and friends
+
 2004-08-03  Benjamin Otte  <otte@gnome.org>
 
        * examples/dynparams/filter.c: (ui_control_create):

diff --git a/ext/alsa/gstalsamixer.c b/ext/alsa/gstalsamixer.c
index 9c40b429f6b83ea19ce2ef13a8afafc03d8beaba..d8867d61e38779b4a83a2dede1f3c63d97c69223 100644 (file)
--- a/ext/alsa/gstalsamixer.c
+++ b/ext/alsa/gstalsamixer.c
@@ -368,10 +368,9 @@ gst_alsa_mixer_get_volume (GstMixer * mixer,
     GstMixerTrack * track, gint * volumes)
 {
   gint i;
-  GstAlsaMixer *alsa_mixer = GST_ALSA_MIXER (mixer);
   GstAlsaMixerTrack *alsa_track = (GstAlsaMixerTrack *) track;
 
-  g_return_if_fail (alsa_mixer->mixer_handle != NULL);
+  g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
 
   if (track->flags & GST_MIXER_TRACK_MUTE &&
       !snd_mixer_selem_has_playback_switch (alsa_track->element)) {
@@ -396,10 +395,9 @@ gst_alsa_mixer_set_volume (GstMixer * mixer,
     GstMixerTrack * track, gint * volumes)
 {
   gint i;
-  GstAlsaMixer *alsa_mixer = GST_ALSA_MIXER (mixer);
   GstAlsaMixerTrack *alsa_track = (GstAlsaMixerTrack *) track;
 
-  g_return_if_fail (alsa_mixer->mixer_handle != NULL);
+  g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
 
   /* only set the volume with ALSA lib if the track isn't muted. */
   for (i = 0; i < track->num_channels; i++) {
@@ -422,10 +420,9 @@ static void
 gst_alsa_mixer_set_mute (GstMixer * mixer, GstMixerTrack * track, gboolean mute)
 {
   gint i;
-  GstAlsaMixer *alsa_mixer = GST_ALSA_MIXER (mixer);
   GstAlsaMixerTrack *alsa_track = (GstAlsaMixerTrack *) track;
 
-  g_return_if_fail (alsa_mixer->mixer_handle != NULL);
+  g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
 
   if (mute) {
     track->flags |= GST_MIXER_TRACK_MUTE;
@@ -452,10 +449,9 @@ static void
 gst_alsa_mixer_set_record (GstMixer * mixer,
     GstMixerTrack * track, gboolean record)
 {
-  GstAlsaMixer *alsa_mixer = GST_ALSA_MIXER (mixer);
   GstAlsaMixerTrack *alsa_track = (GstAlsaMixerTrack *) track;
 
-  g_return_if_fail (alsa_mixer->mixer_handle != NULL);
+  g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
 
   if (record) {
     track->flags |= GST_MIXER_TRACK_RECORD;
@@ -472,10 +468,9 @@ gst_alsa_mixer_set_option (GstMixer * mixer,
 {
   gint idx = -1, n = 0;
   GList *item;
-  GstAlsaMixer *alsa_mixer = (GstAlsaMixer *) mixer;
   GstAlsaMixerOptions *alsa_opts = (GstAlsaMixerOptions *) opts;
 
-  g_return_if_fail (alsa_mixer->mixer_handle != NULL);
+  g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
 
   for (item = opts->values; item != NULL; item = item->next, n++) {
     if (!strcmp (item->data, value)) {
@@ -492,11 +487,10 @@ gst_alsa_mixer_set_option (GstMixer * mixer,
 static const gchar *
 gst_alsa_mixer_get_option (GstMixer * mixer, GstMixerOptions * opts)
 {
-  GstAlsaMixer *alsa_mixer = (GstAlsaMixer *) mixer;
   GstAlsaMixerOptions *alsa_opts = (GstAlsaMixerOptions *) opts;
   gint idx = -1;
 
-  g_return_val_if_fail (alsa_mixer->mixer_handle != NULL, NULL);
+  g_return_val_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL, NULL);
 
   snd_mixer_selem_get_enum_item (alsa_opts->element, 0, &idx);
 

diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index c1ce40162ad7495cab45dc5ae777ac7f8a2655d9..48a623421766622013070d9b7e3f8d5ce0af60ba 100644 (file)
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -533,8 +533,7 @@ gst_ogg_demux_src_event (GstPad * pad, GstEvent * event)
 
       GST_OGG_SET_STATE (ogg, GST_OGG_STATE_SEEK);
       FOR_PAD_IN_CURRENT_CHAIN (ogg, pad,
-          pad->flags |= GST_OGG_PAD_NEEDS_DISCONT;
-          );
+          pad->flags |= GST_OGG_PAD_NEEDS_DISCONT;);
       GST_DEBUG_OBJECT (ogg,
           "initiating seeking to format %d, offset %" G_GUINT64_FORMAT, format,
           offset);
@@ -607,8 +606,7 @@ gst_ogg_demux_handle_event (GstPad * pad, GstEvent * event)
       gst_event_unref (event);
       GST_FLAG_UNSET (ogg, GST_OGG_FLAG_WAIT_FOR_DISCONT);
       FOR_PAD_IN_CURRENT_CHAIN (ogg, pad,
-          pad->flags |= GST_OGG_PAD_NEEDS_DISCONT;
-          );
+          pad->flags |= GST_OGG_PAD_NEEDS_DISCONT;);
       break;
     default:
       gst_pad_event_default (pad, event);
@@ -878,8 +876,7 @@ _find_chain_get_unknown_part (GstOggDemux * ogg, gint64 * start, gint64 * end)
   *end = G_MAXINT64;
 
   g_assert (ogg->current_chain >= 0);
-  FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, *start = MAX (*start, pad->end_offset);
-      );
+  FOR_PAD_IN_CURRENT_CHAIN (ogg, pad, *start = MAX (*start, pad->end_offset););
 
   if (ogg->setup_state == SETUP_FIND_LAST_CHAIN) {
     *end = gst_file_pad_get_length (ogg->sinkpad);
@@ -969,7 +966,6 @@ _find_chain_init (GstOggDemux * ogg)
 static gboolean
 _find_chain_process (GstOggDemux * ogg, ogg_page * page)
 {
-  GstOggPad *pad = gst_ogg_pad_get (ogg, page);
   gint64 start, end;
 
   if (!_find_chain_get_unknown_part (ogg, &start, &end))
@@ -979,7 +975,7 @@ _find_chain_process (GstOggDemux * ogg, ogg_page * page)
      * - we seeked to a point in the known chain
      * - we're now in a part that belongs to the unordered streams
      */
-    g_assert (g_slist_find (ogg->unordered, pad));
+    g_assert (g_slist_find (ogg->unordered, gst_ogg_pad_get (ogg, page)));
     if (!ogg_page_bos (page)) {
       /* broken stream */
       return FALSE;
@@ -1009,8 +1005,7 @@ _find_streams_check (GstOggDemux * ogg)
   } else {
     endpos = G_MAXINT64;
     FOR_PAD_IN_CHAIN (ogg, pad, ogg->chains->len - 1,
-        endpos = MIN (endpos, pad->start_offset);
-        );
+        endpos = MIN (endpos, pad->start_offset););
   }
   if (!ogg->seek_skipped || gst_ogg_demux_position (ogg) >= endpos) {
     /* have we found the endposition for all streams yet? */
@@ -1544,11 +1539,17 @@ gst_ogg_demux_plugin_init (GstPlugin * plugin)
 /* prints all info about the element */
 #undef GST_CAT_DEFAULT
 #define GST_CAT_DEFAULT gst_ogg_demux_setup_debug
-#if 0
-/* use a define here so the function name in debugging output stays the same */
+
+#ifdef GST_DISABLE_GST_DEBUG
+
 static void
-gst_ogg_print_pad (GstOggDemux * ogg, GstOggPad * pad)
-#endif
+gst_ogg_print (GstOggDemux * ogg)
+{
+  /* NOP */
+}
+
+#else /* !GST_DISABLE_GST_DEBUG */
+
 #define gst_ogg_print_pad(ogg, _pad) \
 G_STMT_START{\
   GstOggPad *pad = (_pad); \
@@ -1559,7 +1560,8 @@ G_STMT_START{\
       pad->start_offset, pad->start_found ? "" : " (?)", \
       pad->end_offset, pad->end_found ? "" : " (?)"); \
 }G_STMT_END
-     static void gst_ogg_print (GstOggDemux * ogg)
+static void
+gst_ogg_print (GstOggDemux * ogg)
 {
   guint i;
   GSList *walk;
@@ -1580,4 +1582,6 @@ G_STMT_START{\
       gst_ogg_print_pad (ogg, walk->data);
     }
   }
+
 }
+#endif /* GST_DISABLE_GST_DEBUG */

diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index 1c311c8167baa5516cf4d132d4e4d603c4d27f45..bb641abeacb40aea5606b9901780b58feae79f91 100644 (file)
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -288,18 +288,16 @@ static void
 gst_ogg_mux_pad_link (GstPad * pad, GstPad * peer, gpointer data)
 {
   GstOggMux *ogg_mux = ogg_mux = GST_OGG_MUX (gst_pad_get_parent (pad));
-  const gchar *padname = gst_pad_get_name (pad);
 
-  GST_DEBUG_OBJECT (ogg_mux, "pad '%s' connected", padname);
+  GST_DEBUG_OBJECT (ogg_mux, "pad '%s' connected", gst_pad_get_name (pad));
 }
 
 static void
 gst_ogg_mux_pad_unlink (GstPad * pad, GstPad * peer, gpointer data)
 {
   GstOggMux *ogg_mux = ogg_mux = GST_OGG_MUX (gst_pad_get_parent (pad));
-  const gchar *padname = gst_pad_get_name (pad);
 
-  GST_DEBUG_OBJECT (ogg_mux, "pad '%s' unlinked", padname);
+  GST_DEBUG_OBJECT (ogg_mux, "pad '%s' unlinked", gst_pad_get_name (pad));
 }
 
 static GstPad *

diff --git a/po/uk.po b/po/uk.po
index 2be6520dbe97a9f39f090dccc96c50403796b541..0be83db80a07a6c1dce0379bb0d6d716433aa148 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-22 16:47+0200\n"
+"POT-Creation-Date: 2004-08-03 17:41+0200\n"
 "PO-Revision-Date: 2004-08-03 15:40+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -37,12 +37,14 @@ msgstr "Не вдається відкрити пристрій компакт-
 #: ext/gnomevfs/gstgnomevfssrc.c:1067 ext/gnomevfs/gstgnomevfssrc.c:1090
 #, c-format
 msgid "Could not open vfs file \"%s\" for reading."
-msgstr "Не вдається відкрити файл віртуальної файлової системи \"%s\" для читання."
+msgstr ""
+"Не вдається відкрити файл віртуальної файлової системи \"%s\" для читання."
 
 #: ext/gnomevfs/gstgnomevfssink.c:344
 #, c-format
 msgid "Could not open vfs file \"%s\" for writing: %s."
-msgstr "Не вдається відкрити файл віртуальної файлової системи \"%s\" для запису: %s."
+msgstr ""
+"Не вдається відкрити файл віртуальної файлової системи \"%s\" для запису: %s."
 
 #: ext/gnomevfs/gstgnomevfssink.c:351
 msgid "No filename given"
@@ -66,6 +68,20 @@ msgstr "Не вдається записати у файл \"%s\"."
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Відсутній або неправильний вхід звуку, AVI потік буде пошкоджений."
 
+#: gst-libs/gst/play/play.c:110
+#, c-format
+msgid ""
+"The %s element could not be found. This element is essential for playback. "
+"Please install the right plug-in and verify that it works by running 'gst-"
+"inspect %s'"
+msgstr ""
+
+#: gst-libs/gst/play/play.c:139
+msgid ""
+"No usable colorspace element could be found.\n"
+"Please install one and restart."
+msgstr ""
+
 #: sys/dxr3/dxr3audiosink.c:298
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
@@ -111,33 +127,36 @@ msgstr "Не вдається закрити відео пристрій \"%s\".
 msgid "Could not write to device \"%s\"."
 msgstr "Не вдається записати у пристрій \"%s\"."
 
-#: sys/oss/gstosselement.c:723
+#: sys/oss/gstosselement.c:725
 #, c-format
 msgid "OSS device \"%s\" is already in use by another program."
 msgstr "OSS пристрій \"%s\" вже використовується іншою програмою."
 
-#: sys/oss/gstosselement.c:730 sys/oss/gstosselement.c:734
+#: sys/oss/gstosselement.c:732 sys/oss/gstosselement.c:736
 #, c-format
 msgid "Could not access device \"%s\", check its permissions."
-msgstr "Не вдається отримати доступ до пристрою \"%s\", перевірте права доступу до нього."
+msgstr ""
+"Не вдається отримати доступ до пристрою \"%s\", перевірте права доступу до "
+"нього."
 
-#: sys/oss/gstosselement.c:741 sys/v4l/v4l_calls.c:167
+#: sys/oss/gstosselement.c:743 sys/v4l/v4l_calls.c:167
 #, c-format
 msgid "Device \"%s\" does not exist."
 msgstr "Пристрій \"%s\" не існує."
 
-#: sys/oss/gstosselement.c:748
+#: sys/oss/gstosselement.c:750
 #, c-format
 msgid "Could not open device \"%s\" for writing."
 msgstr "Не вдається відкрити пристрій \"%s\" для запису."
 
-#: sys/oss/gstosselement.c:752
+#: sys/oss/gstosselement.c:754
 #, c-format
 msgid "Could not open device \"%s\" for reading."
 msgstr "Не вдається відкрити пристрій \"%s\" для читання."
 
-#: sys/oss/gstosselement.c:1129
-msgid "Your oss device could not be probed correctly"
+#: sys/oss/gstosselement.c:1131
+#, fuzzy
+msgid "Your OSS device could not be probed correctly"
 msgstr "Ваш OSS пристрій неможливо коректно перевірити"
 
 #: sys/oss/gstossmixer.c:98

diff --git a/sys/v4l/gstv4lcolorbalance.c b/sys/v4l/gstv4lcolorbalance.c
index e1571579d6f193f3da8057771159c04d56121464..d815c10be08c4152fbe15cf70bae60466ba5e3ca 100644 (file)
--- a/sys/v4l/gstv4lcolorbalance.c
+++ b/sys/v4l/gstv4lcolorbalance.c
@@ -94,7 +94,7 @@ gst_v4l_color_balance_interface_init (GstColorBalanceClass * klass)
   klass->get_value = gst_v4l_color_balance_get_value;
 }
 
-static gboolean
+static G_GNUC_UNUSED gboolean
 gst_v4l_color_balance_contains_channel (GstV4lElement * v4lelement,
     GstV4lColorBalanceChannel * v4lchannel)
 {

diff --git a/sys/v4l/gstv4ltuner.c b/sys/v4l/gstv4ltuner.c
index 5d681594236dd4039883361dc466b208e7c15b4f..f02c5da6c59202b10a5f70d2dce0d5eabe50f5aa 100644 (file)
--- a/sys/v4l/gstv4ltuner.c
+++ b/sys/v4l/gstv4ltuner.c
@@ -153,7 +153,7 @@ gst_v4l_tuner_interface_init (GstTunerClass * klass)
   klass->signal_strength = gst_v4l_tuner_signal_strength;
 }
 
-static gboolean
+static G_GNUC_UNUSED gboolean
 gst_v4l_tuner_contains_channel (GstV4lElement * v4lelement,
     GstV4lTunerChannel * v4lchannel)
 {
@@ -207,7 +207,7 @@ gst_v4l_tuner_get_channel (GstTuner * tuner)
   return NULL;
 }
 
-static gboolean
+static G_GNUC_UNUSED gboolean
 gst_v4l_tuner_contains_norm (GstV4lElement * v4lelement,
     GstV4lTunerNorm * v4lnorm)
 {

diff --git a/sys/v4l/v4lsrc_calls.c b/sys/v4l/v4lsrc_calls.c
index 41fd5753d51cb2371b2030a7e9d23b5e774d7bf5..f6aa0854b563298222395ba14eaadf5442c74385 100644 (file)
--- a/sys/v4l/v4lsrc_calls.c
+++ b/sys/v4l/v4lsrc_calls.c
@@ -47,6 +47,7 @@ GST_DEBUG_CATEGORY_EXTERN (v4l_debug);
 
 #define GST_CAT_DEFAULT v4l_debug
 
+#ifndef GST_DISABLE_GST_DEBUG
 /* palette names */
 static const char *palette_name[] = {
   "",                           /* 0 */
@@ -67,6 +68,7 @@ static const char *palette_name[] = {
   "YUV-4:2:0 (planar)",         /* VIDEO_PALETTE_YUV420P */
   "YUV-4:1:0 (planar)"          /* VIDEO_PALETTE_YUV410P */
 };
+#endif
 
 /******************************************************
  * gst_v4lsrc_queue_frame():