From 6eb167a17698506fc08f47594e133fa4e44afd3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 19 Jun 2009 16:21:28 +0100 Subject: [PATCH] Make build without warnings with debugging disabled --- ext/apexsink/gstapexsink.c | 8 ++------ ext/directfb/dfbvideosink.c | 12 +++++++----- ext/libmms/gstmms.c | 7 +++---- ext/metadata/metadataexif.c | 2 ++ ext/mythtv/gstmythtvsrc.c | 4 +--- ext/resindvd/resindvdsrc.c | 3 +-- ext/sdl/sdlvideosink.c | 10 +++++----- gst/dvdspu/gstdvdspu.c | 5 ++--- gst/liveadder/liveadder.c | 5 ++--- gst/mpegtsmux/mpegtsmux.c | 12 +++++------- gst/mpegvideoparse/mpegvideoparse.c | 2 ++ gst/rtpmanager/gstrtpjitterbuffer.c | 5 ++--- sys/oss4/oss4-mixer.c | 16 ++++++++-------- 13 files changed, 42 insertions(+), 49 deletions(-) diff --git a/ext/apexsink/gstapexsink.c b/ext/apexsink/gstapexsink.c index 425308d474..69f34bcbf2 100644 --- a/ext/apexsink/gstapexsink.c +++ b/ext/apexsink/gstapexsink.c @@ -523,9 +523,7 @@ gst_apexsink_write (GstAudioSink * asink, gpointer data, guint length) static gboolean gst_apexsink_unprepare (GstAudioSink * asink) { - GstApExSink *apexsink = (GstApExSink *) asink; - - GST_INFO_OBJECT (apexsink, "UNPREPARE"); + GST_INFO_OBJECT (asink, "UNPREPARE"); return TRUE; } @@ -534,9 +532,7 @@ gst_apexsink_unprepare (GstAudioSink * asink) static guint gst_apexsink_delay (GstAudioSink * asink) { - GstApExSink *apexsink = (GstApExSink *) asink; - - GST_INFO_OBJECT (apexsink, "DELAY"); + GST_LOG_OBJECT (asink, "DELAY"); return 0; } diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c index a6450a06cd..f48864d69f 100644 --- a/ext/directfb/dfbvideosink.c +++ b/ext/directfb/dfbvideosink.c @@ -144,6 +144,7 @@ static void gst_dfbvideosink_surface_destroy (GstDfbVideoSink * dfbvideosink, static GstVideoSinkClass *parent_class = NULL; static GstBufferClass *surface_parent_class = NULL; +#ifndef GST_DISABLE_GST_DEBUG static const char * gst_dfbvideosink_get_format_name (DFBSurfacePixelFormat format) { @@ -192,6 +193,7 @@ gst_dfbvideosink_get_format_name (DFBSurfacePixelFormat format) return "UNKNOWN"; } } +#endif /* GST_DISABLE_GST_DEBUG */ /* Creates miniobject and our internal surface */ static GstDfbSurface * @@ -1945,7 +1947,7 @@ gst_dfbvideosink_navigation_send_event (GstNavigation * navigation, GstDfbVideoSink *dfbvideosink = GST_DFBVIDEOSINK (navigation); GstEvent *event; GstVideoRectangle src, dst, result; - double x, y; + double x, y, old_x, old_y; GstPad *pad = NULL; src.w = GST_VIDEO_SINK_WIDTH (dfbvideosink); @@ -1959,8 +1961,8 @@ gst_dfbvideosink_navigation_send_event (GstNavigation * navigation, /* Our coordinates can be wrong here if we centered the video */ /* Converting pointer coordinates to the non scaled geometry */ - if (gst_structure_get_double (structure, "pointer_x", &x)) { - double old_x = x; + if (gst_structure_get_double (structure, "pointer_x", &old_x)) { + x = old_x; if (x >= result.x && x <= (result.x + result.w)) { x -= result.x; @@ -1973,8 +1975,8 @@ gst_dfbvideosink_navigation_send_event (GstNavigation * navigation, "coordinate from %f to %f", old_x, x); gst_structure_set (structure, "pointer_x", G_TYPE_DOUBLE, x, NULL); } - if (gst_structure_get_double (structure, "pointer_y", &y)) { - double old_y = y; + if (gst_structure_get_double (structure, "pointer_y", &old_y)) { + y = old_y; if (y >= result.y && y <= (result.y + result.h)) { y -= result.y; diff --git a/ext/libmms/gstmms.c b/ext/libmms/gstmms.c index 33a1a7d267..5ccbb73283 100644 --- a/ext/libmms/gstmms.c +++ b/ext/libmms/gstmms.c @@ -240,23 +240,22 @@ gst_mms_prepare_seek_segment (GstBaseSrc * src, GstEvent * event, GstSeekFlags flags; GstFormat seek_format; gdouble rate; - GstMMS *mmssrc = GST_MMS (src); gst_event_parse_seek (event, &rate, &seek_format, &flags, &cur_type, &cur, &stop_type, &stop); if (seek_format != GST_FORMAT_BYTES && seek_format != GST_FORMAT_TIME) { - GST_LOG_OBJECT (mmssrc, "Only byte or time seeking is supported"); + GST_LOG_OBJECT (src, "Only byte or time seeking is supported"); return FALSE; } if (stop_type != GST_SEEK_TYPE_NONE) { - GST_LOG_OBJECT (mmssrc, "Stop seeking not supported"); + GST_LOG_OBJECT (src, "Stop seeking not supported"); return FALSE; } if (cur_type != GST_SEEK_TYPE_NONE && cur_type != GST_SEEK_TYPE_SET) { - GST_LOG_OBJECT (mmssrc, "Only absolute seeking is supported"); + GST_LOG_OBJECT (src, "Only absolute seeking is supported"); return FALSE; } diff --git a/ext/metadata/metadataexif.c b/ext/metadata/metadataexif.c index 73cb275b81..58d83e2dea 100644 --- a/ext/metadata/metadataexif.c +++ b/ext/metadata/metadataexif.c @@ -739,6 +739,7 @@ metadataparse_exif_content_foreach_entry_func (ExifEntry * entry, done: { +#ifndef GST_DISABLE_GST_DEBUG char buf[2048]; GST_LOG ("\n Entry %p: %s (%s)\n" " Size, Comps: %d, %d\n" @@ -752,6 +753,7 @@ done: (int) (entry->components), exif_entry_get_value (entry, buf, sizeof (buf)), exif_tag_get_title (entry->tag), exif_tag_get_description (entry->tag)); +#endif } return; diff --git a/ext/mythtv/gstmythtvsrc.c b/ext/mythtv/gstmythtvsrc.c index 4d1ddb5311..6a11f2d4dd 100644 --- a/ext/mythtv/gstmythtvsrc.c +++ b/ext/mythtv/gstmythtvsrc.c @@ -1017,9 +1017,7 @@ gst_mythtv_src_uri_handler_init (gpointer g_iface, gpointer iface_data) } void -size_header_handler (void *userdata, const char *value) +size_header_handler (void *src, const char *value) { - GstMythtvSrc *src = GST_MYTHTV_SRC (userdata); - GST_DEBUG_OBJECT (src, "content size = %lld bytes", src->content_size); } diff --git a/ext/resindvd/resindvdsrc.c b/ext/resindvd/resindvdsrc.c index 122f2b6747..7b44bf9c19 100644 --- a/ext/resindvd/resindvdsrc.c +++ b/ext/resindvd/resindvdsrc.c @@ -1069,9 +1069,8 @@ rsn_dvdsrc_step (resinDvdSrc * src, gboolean have_dvd_lock) break; } case DVDNAV_HIGHLIGHT:{ - dvdnav_highlight_event_t *event = (dvdnav_highlight_event_t *) data; GST_DEBUG_OBJECT (src, "highlight change event, button %d", - event->buttonN); + ((dvdnav_highlight_event_t *) data)->buttonN); rsn_dvdsrc_update_highlight (src); break; } diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index ef8147ea87..85f2653482 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -948,7 +948,7 @@ gst_sdlvideosink_navigation_send_event (GstNavigation * navigation, GstSDLVideoSink *sdlvideosink = GST_SDLVIDEOSINK (navigation); GstEvent *event; GstVideoRectangle src, dst, result; - double x, y; + double x, y, old_x, old_y; GstPad *pad = NULL; src.w = GST_VIDEO_SINK_WIDTH (sdlvideosink); @@ -962,8 +962,8 @@ gst_sdlvideosink_navigation_send_event (GstNavigation * navigation, /* Our coordinates can be wrong here if we centered the video */ /* Converting pointer coordinates to the non scaled geometry */ - if (gst_structure_get_double (structure, "pointer_x", &x)) { - double old_x = x; + if (gst_structure_get_double (structure, "pointer_x", &old_x)) { + x = old_x; if (x >= result.x && x <= (result.x + result.w)) { x -= result.x; @@ -976,8 +976,8 @@ gst_sdlvideosink_navigation_send_event (GstNavigation * navigation, "coordinate from %f to %f", old_x, x); gst_structure_set (structure, "pointer_x", G_TYPE_DOUBLE, x, NULL); } - if (gst_structure_get_double (structure, "pointer_y", &y)) { - double old_y = y; + if (gst_structure_get_double (structure, "pointer_y", &old_y)) { + y = old_y; if (y >= result.y && y <= (result.y + result.h)) { y -= result.y; diff --git a/gst/dvdspu/gstdvdspu.c b/gst/dvdspu/gstdvdspu.c index f5fce4bc94..af8bc99e92 100644 --- a/gst/dvdspu/gstdvdspu.c +++ b/gst/dvdspu/gstdvdspu.c @@ -716,12 +716,11 @@ gst_dvd_spu_redraw_still (GstDVDSpu * dvdspu, gboolean force) static void gst_dvd_spu_handle_dvd_event (GstDVDSpu * dvdspu, GstEvent * event) { - const GstStructure *structure = gst_event_get_structure (event); - const gchar *event_type = gst_structure_get_string (structure, "event"); gboolean hl_change = FALSE; GST_INFO_OBJECT (dvdspu, "DVD event of type %s on subp pad OOB=%d", - event_type, (GST_EVENT_TYPE (event) == GST_EVENT_CUSTOM_DOWNSTREAM_OOB)); + gst_structure_get_string (event->structure, "event"), + (GST_EVENT_TYPE (event) == GST_EVENT_CUSTOM_DOWNSTREAM_OOB)); switch (dvdspu->spu_input_type) { case SPU_INPUT_TYPE_VOBSUB: diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c index d10f54f0ae..25fa406395 100644 --- a/gst/liveadder/liveadder.c +++ b/gst/liveadder/liveadder.c @@ -1349,9 +1349,8 @@ no_clock: pause: { - const gchar *reason = gst_flow_get_name (result); - - GST_DEBUG_OBJECT (adder, "pausing task, reason %s", reason); + GST_DEBUG_OBJECT (adder, "pausing task, reason %s", + gst_flow_get_name (result)); GST_OBJECT_LOCK (adder); diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c index f24c4a3ec4..2df635bcf4 100644 --- a/gst/mpegtsmux/mpegtsmux.c +++ b/gst/mpegtsmux/mpegtsmux.c @@ -523,6 +523,8 @@ mpegtsmux_choose_best_stream (MpegTsMux * mux) return best; } +#define COLLECT_DATA_PAD(collect_data) ((GstCollectData *)(collect_data))->pad) + static GstFlowReturn mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux) { @@ -540,10 +542,8 @@ mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux) if (mux->pcr_stream == NULL) { if (best) { - GstCollectData *c_data = (GstCollectData *) best; /* Take the first data stream for the PCR */ - GST_DEBUG_OBJECT (mux, "Use stream from pad %" GST_PTR_FORMAT " as PCR", - c_data->pad); + GST_DEBUG_OBJECT (COLLECT_DATA_PAD (best), "Use stream as PCR"); mux->pcr_stream = best->stream; } } @@ -564,14 +564,12 @@ mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux) if (best != NULL) { GstBuffer *buf = best->queued_buf; - GstCollectData *c_data = (GstCollectData *) best; gint64 pts = -1; g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR); - GST_DEBUG_OBJECT (mux, - "Chose stream from pad %" GST_PTR_FORMAT " for output (PID: 0x%04x)", - c_data->pad, best->pid); + GST_DEBUG_OBJECT (COLLECT_DATA_PAD (best), + "Chose stream for output (PID: 0x%04x)", best->pid); if (GST_CLOCK_TIME_IS_VALID (best->cur_ts)) { pts = GSTTIME_TO_MPEGTIME (best->cur_ts); diff --git a/gst/mpegvideoparse/mpegvideoparse.c b/gst/mpegvideoparse/mpegvideoparse.c index 312b33f46a..d0badbfcda 100644 --- a/gst/mpegvideoparse/mpegvideoparse.c +++ b/gst/mpegvideoparse/mpegvideoparse.c @@ -278,6 +278,7 @@ mpegvideoparse_handle_sequence (MpegVideoParse * mpegvideoparse, return TRUE; } +#ifndef GST_DISABLE_GST_DEBUG static const gchar * picture_start_code_name (guint8 psc) { @@ -333,6 +334,7 @@ picture_type_name (guint8 pct) return "Reserved/Unknown"; } +#endif /* GST_DISABLE_GST_DEBUG */ static gboolean mpegvideoparse_handle_picture (MpegVideoParse * mpegvideoparse, GstBuffer * buf) diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index e023df108b..55126054d7 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -1688,9 +1688,8 @@ flushing: } pause: { - const gchar *reason = gst_flow_get_name (result); - - GST_DEBUG_OBJECT (jitterbuffer, "pausing task, reason %s", reason); + GST_DEBUG_OBJECT (jitterbuffer, "pausing task, reason %s", + gst_flow_get_name (result)); JBUF_LOCK (priv); /* store result */ diff --git a/sys/oss4/oss4-mixer.c b/sys/oss4/oss4-mixer.c index 91b14a2cc1..031549b3cd 100644 --- a/sys/oss4/oss4-mixer.c +++ b/sys/oss4/oss4-mixer.c @@ -103,7 +103,7 @@ static void gst_oss4_mixer_close (GstOss4Mixer * mixer); static gboolean gst_oss4_mixer_enum_control_update_enum_list (GstOss4Mixer * m, GstOss4MixerControl * mc); -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG static const gchar *mixer_ext_type_get_name (gint type); static const gchar *mixer_ext_flags_get_string (gint flags); #endif @@ -874,7 +874,7 @@ gst_oss4_mixer_control_get_translated_name (GstOss4MixerControl * mc) return g_quark_to_string (g_quark_from_string (name)); /* eek */ } -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG static const gchar * mixer_ext_type_get_name (gint type) { @@ -924,9 +924,9 @@ mixer_ext_type_get_name (gint type) } return "unknown"; } -#endif /* GST_DISABLE_DEBUG */ +#endif /* GST_DISABLE_GST_DEBUG */ -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG static const gchar * mixer_ext_flags_get_string (gint flags) { @@ -987,9 +987,9 @@ mixer_ext_flags_get_string (gint flags) return g_quark_to_string (q); } -#endif /* GST_DISABLE_DEBUG */ +#endif /* GST_DISABLE_GST_DEBUG */ -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG static void gst_oss4_mixer_control_dump_tree (GstOss4MixerControl * mc, gint depth) { @@ -1010,7 +1010,7 @@ gst_oss4_mixer_control_dump_tree (GstOss4MixerControl * mc, gint depth) gst_oss4_mixer_control_dump_tree (child_mc, depth + 2); } } -#endif /* GST_DISABLE_DEBUG */ +#endif /* GST_DISABLE_GST_DEBUG */ static GList * gst_oss4_mixer_get_controls (GstOss4Mixer * mixer) @@ -1103,7 +1103,7 @@ gst_oss4_mixer_get_controls (GstOss4Mixer * mixer) controls = g_list_prepend (controls, mc); } -#ifndef GST_DISABLE_DEBUG +#ifndef GST_DISABLE_GST_DEBUG gst_oss4_mixer_control_dump_tree (root_mc, 0); #endif