From 00d7f5c760f73dc8331fca460012f28cd9a83d08 Mon Sep 17 00:00:00 2001 From: Edgard Lima Date: Fri, 3 Feb 2006 17:45:44 +0000 Subject: [PATCH] Just make it compile with --disable-gst-debug. Original commit message from CVS: Just make it compile with --disable-gst-debug. --- ChangeLog | 9 +++++++++ ext/ogg/gstoggdemux.c | 9 +++++++++ ext/ogg/gstoggparse.c | 2 ++ gst/tcp/gsttcpserversink.c | 2 ++ sys/v4l/v4lsrc_calls.c | 2 ++ sys/v4l/v4lsrc_calls.h | 2 ++ 6 files changed, 26 insertions(+) diff --git a/ChangeLog b/ChangeLog index 50477f292a..4cb5e03f9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-02-03 Edgard Lima + + * ext/ogg/gstoggdemux.c: + * ext/ogg/gstoggparse.c: + * gst/tcp/gsttcpserversink.c: + * sys/v4l/v4lsrc_calls.c: + * sys/v4l/v4lsrc_calls.h: + Just make it compile with --disable-gst-debug. + 2006-02-03 Wim Taymans * ext/alsa/gstalsasink.c: (gst_alsasink_finalise), diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index aa5cbced90..a4106f4dab 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -620,7 +620,10 @@ gst_ogg_pad_typefind (GstOggPad * pad, ogg_packet * packet) { GstCaps *caps; GstElement *element = NULL; + +#ifndef GST_DISABLE_GST_DEBUG GstOggDemux *ogg = pad->ogg; +#endif if (GST_PAD_CAPS (pad) != NULL) return TRUE; @@ -699,7 +702,10 @@ gst_ogg_demux_chain_elem_pad (GstOggPad * pad, ogg_packet * packet) { GstBuffer *buf; GstFlowReturn ret; + +#ifndef GST_DISABLE_GST_DEBUG GstOggDemux *ogg = pad->ogg; +#endif /* initialize our internal decoder with packets */ if (!pad->elem_pad) @@ -737,7 +743,10 @@ static GstFlowReturn gst_ogg_demux_queue_data (GstOggPad * pad, ogg_packet * packet) { GstBuffer *buf; + +#ifndef GST_DISABLE_GST_DEBUG GstOggDemux *ogg = pad->ogg; +#endif GST_DEBUG_OBJECT (ogg, "%p queueing data serial %08lx", pad, pad->serialno); diff --git a/ext/ogg/gstoggparse.c b/ext/ogg/gstoggparse.c index 38a51f0998..1b825c695e 100644 --- a/ext/ogg/gstoggparse.c +++ b/ext/ogg/gstoggparse.c @@ -390,8 +390,10 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer) /* discontinuity; track how many bytes we skipped (-ret) */ ogg->offset -= ret; } else { +#ifndef GST_DISABLE_GST_DEBUG gint64 granule = ogg_page_granulepos (&page); int bos = ogg_page_bos (&page); +#endif guint64 startoffset = ogg->offset; GST_LOG_OBJECT (ogg, "Timestamping outgoing buffer as %" GST_TIME_FORMAT, diff --git a/gst/tcp/gsttcpserversink.c b/gst/tcp/gsttcpserversink.c index 50803d82cd..a1b03ec4f5 100644 --- a/gst/tcp/gsttcpserversink.c +++ b/gst/tcp/gsttcpserversink.c @@ -170,7 +170,9 @@ gst_tcp_server_sink_handle_server_read (GstTCPServerSink * sink) static void gst_tcp_server_sink_removed (GstMultiFdSink * sink, int fd) { +#ifndef GST_DISABLE_GST_DEBUG GstTCPServerSink *this = GST_TCP_SERVER_SINK (sink); +#endif GST_LOG_OBJECT (this, "closing fd %d", fd); if (close (fd) < 0) { diff --git a/sys/v4l/v4lsrc_calls.c b/sys/v4l/v4lsrc_calls.c index b51d40abda..da33ffdfc8 100644 --- a/sys/v4l/v4lsrc_calls.c +++ b/sys/v4l/v4lsrc_calls.c @@ -494,11 +494,13 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4lsrc, gint width, gint height, return TRUE; } +#ifndef GST_DISABLE_GST_DEBUG const char * gst_v4lsrc_palette_name (int i) { return v4l_palette_name[i]; } +#endif gboolean gst_v4lsrc_get_fps (GstV4lSrc * v4lsrc, gint * fps_n, gint * fps_d) diff --git a/sys/v4l/v4lsrc_calls.h b/sys/v4l/v4lsrc_calls.h index b4f14a7780..18b35254cc 100644 --- a/sys/v4l/v4lsrc_calls.h +++ b/sys/v4l/v4lsrc_calls.h @@ -47,7 +47,9 @@ GstBuffer *gst_v4lsrc_buffer_new (GstV4lSrc * v4lsrc, gint num); gboolean gst_v4lsrc_try_capture (GstV4lSrc *v4lsrc, gint width, gint height, gint palette); /* For debug purposes, share the palette names */ +#ifndef GST_DISABLE_GST_DEBUG const char *gst_v4lsrc_palette_name (int i); +#endif G_END_DECLS