diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-06-22 19:31:04 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-06-22 19:31:04 +0000 |
| commit | 05eaedc496de5e686a5a6d875598104459d60af6 (patch) | |
| tree | c5a7fc1ab7a0b5427a4bf0eaa06317ba830dcdf7 | |
| parent | 45c10ca9de093be4a2a7023b3ce121515a300ce3 (diff) | |
Use GST_DEBUG_CATEGORY_STATIC where possible (#342503) plus two minor macro fixes.
Original commit message from CVS:
* ext/annodex/gstcmmldec.c:
* ext/annodex/gstcmmlenc.c:
* ext/annodex/gstcmmlparser.c:
* ext/dv/gstdvdec.c:
* ext/dv/gstdvdemux.c:
* ext/gdk_pixbuf/pixbufscale.c:
* ext/jpeg/gstjpegenc.c:
* ext/jpeg/gstsmokedec.c:
* ext/jpeg/gstsmokeenc.c:
* ext/libpng/gstpngdec.c:
* ext/libpng/gstpngenc.c:
* ext/speex/gstspeexenc.c:
* gst/alpha/gstalphacolor.c:
* gst/cutter/gstcutter.c:
* gst/debug/gstnavigationtest.c:
* gst/icydemux/gsticydemux.c:
* gst/level/gstlevel.c:
* gst/multipart/multipart.c:
* gst/rtp/gstrtpamrpay.c:
* gst/rtp/gstrtpdepay.c:
* gst/rtp/gstrtpilbcpay.c:
* gst/rtp/gstrtpmp4gpay.c:
* gst/rtp/gstrtpmp4vpay.c:
* gst/rtsp/gstrtpdec.c:
* gst/rtsp/gstrtspsrc.c:
* gst/udp/gstdynudpsink.c:
* gst/udp/gstmultiudpsink.c:
* gst/udp/gstudpsrc.c:
* gst/videobox/gstvideobox.c:
* gst/videofilter/gstvideoflip.c:
Use GST_DEBUG_CATEGORY_STATIC where possible (#342503)
plus two minor macro fixes.
31 files changed, 67 insertions, 34 deletions
@@ -1,5 +1,40 @@ 2006-06-22 Tim-Philipp Müller <tim at centricular dot net> + * ext/annodex/gstcmmldec.c: + * ext/annodex/gstcmmlenc.c: + * ext/annodex/gstcmmlparser.c: + * ext/dv/gstdvdec.c: + * ext/dv/gstdvdemux.c: + * ext/gdk_pixbuf/pixbufscale.c: + * ext/jpeg/gstjpegenc.c: + * ext/jpeg/gstsmokedec.c: + * ext/jpeg/gstsmokeenc.c: + * ext/libpng/gstpngdec.c: + * ext/libpng/gstpngenc.c: + * ext/speex/gstspeexenc.c: + * gst/alpha/gstalphacolor.c: + * gst/cutter/gstcutter.c: + * gst/debug/gstnavigationtest.c: + * gst/icydemux/gsticydemux.c: + * gst/level/gstlevel.c: + * gst/multipart/multipart.c: + * gst/rtp/gstrtpamrpay.c: + * gst/rtp/gstrtpdepay.c: + * gst/rtp/gstrtpilbcpay.c: + * gst/rtp/gstrtpmp4gpay.c: + * gst/rtp/gstrtpmp4vpay.c: + * gst/rtsp/gstrtpdec.c: + * gst/rtsp/gstrtspsrc.c: + * gst/udp/gstdynudpsink.c: + * gst/udp/gstmultiudpsink.c: + * gst/udp/gstudpsrc.c: + * gst/videobox/gstvideobox.c: + * gst/videofilter/gstvideoflip.c: + Use GST_DEBUG_CATEGORY_STATIC where possible (#342503) + plus two minor macro fixes. + +2006-06-22 Tim-Philipp Müller <tim at centricular dot net> + * gst/matroska/matroska-demux.c: (gst_matroska_demux_check_subtitle_buffer), (gst_matroska_demux_parse_blockgroup_or_simpleblock), diff --git a/ext/annodex/gstcmmldec.c b/ext/annodex/gstcmmldec.c index 71f322f37..b38848806 100644 --- a/ext/annodex/gstcmmldec.c +++ b/ext/annodex/gstcmmldec.c @@ -53,7 +53,7 @@ #include "gstcmmldec.h" #include "gstcmmlutils.h" -GST_DEBUG_CATEGORY (cmmldec); +GST_DEBUG_CATEGORY_STATIC (cmmldec); #define GST_CAT_DEFAULT cmmldec #define CMML_IDENT_HEADER_SIZE 29 diff --git a/ext/annodex/gstcmmlenc.c b/ext/annodex/gstcmmlenc.c index fabe6ec2a..d8392c63b 100644 --- a/ext/annodex/gstcmmlenc.c +++ b/ext/annodex/gstcmmlenc.c @@ -47,7 +47,7 @@ #include "gstcmmlenc.h" #include "gstannodex.h" -GST_DEBUG_CATEGORY (cmmlenc); +GST_DEBUG_CATEGORY_STATIC (cmmlenc); #define GST_CAT_DEFAULT cmmlenc #define CMML_IDENT_HEADER_SIZE 29 diff --git a/ext/annodex/gstcmmlparser.c b/ext/annodex/gstcmmlparser.c index 4e22fd382..abc79e76b 100644 --- a/ext/annodex/gstcmmlparser.c +++ b/ext/annodex/gstcmmlparser.c @@ -29,7 +29,7 @@ #include "gstannodex.h" #include "gstcmmlutils.h" -GST_DEBUG_CATEGORY (cmmlparser); +GST_DEBUG_CATEGORY_STATIC (cmmlparser); #define GST_CAT_DEFAULT cmmlparser static void gst_cmml_parser_generic_error (void *ctx, const char *msg, ...); diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index 730981209..501c57bd6 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -64,7 +64,7 @@ GST_ELEMENT_DETAILS ("DV video decoder", #define DV_DEFAULT_QUALITY DV_QUALITY_BEST #define DV_DEFAULT_DECODE_NTH 1 -GST_DEBUG_CATEGORY (dvdec_debug); +GST_DEBUG_CATEGORY_STATIC (dvdec_debug); #define GST_CAT_DEFAULT dvdec_debug enum diff --git a/ext/dv/gstdvdemux.c b/ext/dv/gstdvdemux.c index 1d005fb55..e8d704156 100644 --- a/ext/dv/gstdvdemux.c +++ b/ext/dv/gstdvdemux.c @@ -107,7 +107,7 @@ #define NTSC_WIDE_PAR_X 40 #define NTSC_WIDE_PAR_Y 33 -GST_DEBUG_CATEGORY (dvdemux_debug); +GST_DEBUG_CATEGORY_STATIC (dvdemux_debug); #define GST_CAT_DEFAULT dvdemux_debug static const GstElementDetails dvdemux_details = diff --git a/ext/gdk_pixbuf/pixbufscale.c b/ext/gdk_pixbuf/pixbufscale.c index df5ba53a3..78da1b7e6 100644 --- a/ext/gdk_pixbuf/pixbufscale.c +++ b/ext/gdk_pixbuf/pixbufscale.c @@ -36,7 +36,7 @@ #define GST_RGB24_SIZE(width,height) ((height)*GST_RGB24_ROWSTRIDE(width)) -GST_DEBUG_CATEGORY (pixbufscale_debug); +GST_DEBUG_CATEGORY_STATIC (pixbufscale_debug); #define GST_CAT_DEFAULT pixbufscale_debug /* elementfactory information */ diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index 2fc16b448..ae91a8a22 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -33,7 +33,7 @@ GST_ELEMENT_DETAILS ("JPEG image encoder", "Encode images in JPEG format", "Wim Taymans <wim.taymans@tvd.be>"); -GST_DEBUG_CATEGORY (jpegenc_debug); +GST_DEBUG_CATEGORY_STATIC (jpegenc_debug); #define GST_CAT_DEFAULT jpegenc_debug #define JPEG_DEFAULT_QUALITY 85 diff --git a/ext/jpeg/gstsmokedec.c b/ext/jpeg/gstsmokedec.c index 2cfc790db..133763ee4 100644 --- a/ext/jpeg/gstsmokedec.c +++ b/ext/jpeg/gstsmokedec.c @@ -34,7 +34,7 @@ GST_ELEMENT_DETAILS ("Smoke video decoder", "Decode video from Smoke format", "Wim Taymans <wim@fluendo.com>"); -GST_DEBUG_CATEGORY (smokedec_debug); +GST_DEBUG_CATEGORY_STATIC (smokedec_debug); #define GST_CAT_DEFAULT smokedec_debug /* SmokeDec signals and args */ diff --git a/ext/jpeg/gstsmokeenc.c b/ext/jpeg/gstsmokeenc.c index 2ea7cf81a..186911ead 100644 --- a/ext/jpeg/gstsmokeenc.c +++ b/ext/jpeg/gstsmokeenc.c @@ -33,7 +33,7 @@ GST_ELEMENT_DETAILS ("Smoke video encoder", "Encode images into the Smoke format", "Wim Taymans <wim@fluendo.com>"); -GST_DEBUG_CATEGORY (smokeenc_debug); +GST_DEBUG_CATEGORY_STATIC (smokeenc_debug); #define GST_CAT_DEFAULT smokeenc_debug #define SMOKEENC_DEFAULT_MIN_QUALITY 10 diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c index 3be0149df..67f087835 100644 --- a/ext/libpng/gstpngdec.c +++ b/ext/libpng/gstpngdec.c @@ -29,7 +29,7 @@ GST_ELEMENT_DETAILS ("PNG image decoder", "Decode a png video frame to a raw image", "Wim Taymans <wim@fluendo.com>"); -GST_DEBUG_CATEGORY (pngdec_debug); +GST_DEBUG_CATEGORY_STATIC (pngdec_debug); #define GST_CAT_DEFAULT pngdec_debug static void gst_pngdec_base_init (gpointer g_class); diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c index 8736b330b..dab1cdf27 100644 --- a/ext/libpng/gstpngenc.c +++ b/ext/libpng/gstpngenc.c @@ -34,7 +34,7 @@ GST_ELEMENT_DETAILS ("PNG image encoder", "Encode a video frame to a .png image", "Jeremy SIMON <jsimon13@yahoo.fr>"); -GST_DEBUG_CATEGORY (pngenc_debug); +GST_DEBUG_CATEGORY_STATIC (pngenc_debug); #define GST_CAT_DEFAULT pngenc_debug /* Filter signals and args */ diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index bbd9e0110..8f832a1e3 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -32,7 +32,7 @@ #include <gst/tag/tag.h> #include "gstspeexenc.h" -GST_DEBUG_CATEGORY (speexenc_debug); +GST_DEBUG_CATEGORY_STATIC (speexenc_debug); #define GST_CAT_DEFAULT speexenc_debug static GstPadTemplate *gst_speexenc_src_template, *gst_speexenc_sink_template; diff --git a/gst/alpha/gstalphacolor.c b/gst/alpha/gstalphacolor.c index 3cf6c7cfc..15c26c127 100644 --- a/gst/alpha/gstalphacolor.c +++ b/gst/alpha/gstalphacolor.c @@ -26,7 +26,7 @@ #include <string.h> -GST_DEBUG_CATEGORY (alpha_color_debug); +GST_DEBUG_CATEGORY_STATIC (alpha_color_debug); #define GST_CAT_DEFAULT alpha_color_debug #define GST_TYPE_ALPHA_COLOR \ @@ -37,7 +37,7 @@ GST_DEBUG_CATEGORY (alpha_color_debug); (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ALPHA_COLOR,GstAlphaColorClass)) #define GST_IS_ALPHA_COLOR(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ALPHA_COLOR)) -#define GST_IS_ALPHA_COLOR_CLASS(obj) \ +#define GST_IS_ALPHA_COLOR_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ALPHA_COLOR)) typedef struct _GstAlphaColor GstAlphaColor; diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c index b45af6ee4..fc75754f7 100644 --- a/gst/cutter/gstcutter.c +++ b/gst/cutter/gstcutter.c @@ -27,7 +27,7 @@ #include "gstcutter.h" #include "math.h" -GST_DEBUG_CATEGORY (cutter_debug); +GST_DEBUG_CATEGORY_STATIC (cutter_debug); #define GST_CAT_DEFAULT cutter_debug #define CUTTER_DEFAULT_THRESHOLD_LEVEL 0.1 diff --git a/gst/debug/gstnavigationtest.c b/gst/debug/gstnavigationtest.c index b9c84b061..0b3e549c3 100644 --- a/gst/debug/gstnavigationtest.c +++ b/gst/debug/gstnavigationtest.c @@ -28,7 +28,7 @@ #include <gst/video/video.h> -GST_DEBUG_CATEGORY (navigationtest_debug); +GST_DEBUG_CATEGORY_STATIC (navigationtest_debug); #define GST_CAT_DEFAULT navigationtest_debug static const GstElementDetails navigationtest_details = diff --git a/gst/icydemux/gsticydemux.c b/gst/icydemux/gsticydemux.c index 688e7df1d..1518b2614 100644 --- a/gst/icydemux/gsticydemux.c +++ b/gst/icydemux/gsticydemux.c @@ -56,7 +56,7 @@ GST_ELEMENT_DETAILS ("ICY tag demuxer", #define ICY_TYPE_FIND_MAX_SIZE (40*1024) -GST_DEBUG_CATEGORY (icydemux_debug); +GST_DEBUG_CATEGORY_STATIC (icydemux_debug); #define GST_CAT_DEFAULT (icydemux_debug) static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index 9097e5def..b68b70ccf 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -83,7 +83,7 @@ #include "gstlevel.h" #include "math.h" -GST_DEBUG_CATEGORY (level_debug); +GST_DEBUG_CATEGORY_STATIC (level_debug); #define GST_CAT_DEFAULT level_debug static const GstElementDetails level_details = GST_ELEMENT_DETAILS ("Level", diff --git a/gst/multipart/multipart.c b/gst/multipart/multipart.c index 871f98724..c1598232e 100644 --- a/gst/multipart/multipart.c +++ b/gst/multipart/multipart.c @@ -26,8 +26,6 @@ extern gboolean gst_multipart_demux_plugin_init (GstPlugin * plugin); extern gboolean gst_multipart_mux_plugin_init (GstPlugin * plugin); -GST_DEBUG_CATEGORY (vorbisdec_debug); - static gboolean plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpamrpay.c b/gst/rtp/gstrtpamrpay.c index fd715ac27..b7e15e67e 100644 --- a/gst/rtp/gstrtpamrpay.c +++ b/gst/rtp/gstrtpamrpay.c @@ -27,7 +27,7 @@ #include "gstrtpamrpay.h" -GST_DEBUG_CATEGORY (rtpamrpay_debug); +GST_DEBUG_CATEGORY_STATIC (rtpamrpay_debug); #define GST_CAT_DEFAULT (rtpamrpay_debug) /* references: diff --git a/gst/rtp/gstrtpdepay.c b/gst/rtp/gstrtpdepay.c index d5623e8f0..c309ae31c 100644 --- a/gst/rtp/gstrtpdepay.c +++ b/gst/rtp/gstrtpdepay.c @@ -20,7 +20,7 @@ #include "gstrtpdepay.h" -GST_DEBUG_CATEGORY (rtpdepay_debug); +GST_DEBUG_CATEGORY_STATIC (rtpdepay_debug); #define GST_CAT_DEFAULT (rtpdepay_debug) /* elementfactory information */ diff --git a/gst/rtp/gstrtpilbcpay.c b/gst/rtp/gstrtpilbcpay.c index 3882556ae..cb9409cd7 100644 --- a/gst/rtp/gstrtpilbcpay.c +++ b/gst/rtp/gstrtpilbcpay.c @@ -32,7 +32,7 @@ static GstElementDetails gst_rtpilbcpay_details = { "Philippe Kalaf <philippe.kalaf@collabora.co.uk>" }; -GST_DEBUG_CATEGORY (rtpilbcpay_debug); +GST_DEBUG_CATEGORY_STATIC (rtpilbcpay_debug); #define GST_CAT_DEFAULT (rtpilbcpay_debug) static GstStaticPadTemplate gst_rtpilbcpay_sink_template = @@ -144,8 +144,8 @@ gst_rtpilbcpay_setcaps (GstBaseRTPPayload * basertppayload, GstCaps * caps) gst_basertppayload_set_outcaps (basertppayload, "mode", G_TYPE_INT, mode, NULL); if (mode != rtpilbcpay->mode && rtpilbcpay->mode != -1) { - GST_ERROR_OBJECT (rtpilbcpay, "Mode has changed from %d to %d! \ - Mode cannot change while streaming", rtpilbcpay->mode, mode); + GST_ERROR_OBJECT (rtpilbcpay, "Mode has changed from %d to %d! " + "Mode cannot change while streaming", rtpilbcpay->mode, mode); return FALSE; } rtpilbcpay->mode = mode; diff --git a/gst/rtp/gstrtpmp4gpay.c b/gst/rtp/gstrtpmp4gpay.c index abe60892c..e09195e88 100644 --- a/gst/rtp/gstrtpmp4gpay.c +++ b/gst/rtp/gstrtpmp4gpay.c @@ -27,7 +27,7 @@ #include "gstrtpmp4gpay.h" -GST_DEBUG_CATEGORY (rtpmp4gpay_debug); +GST_DEBUG_CATEGORY_STATIC (rtpmp4gpay_debug); #define GST_CAT_DEFAULT (rtpmp4gpay_debug) /* elementfactory information */ diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c index 1d4c9c1e3..fc091e71b 100644 --- a/gst/rtp/gstrtpmp4vpay.c +++ b/gst/rtp/gstrtpmp4vpay.c @@ -27,7 +27,7 @@ #include "gstrtpmp4vpay.h" -GST_DEBUG_CATEGORY (rtpmp4vpay_debug); +GST_DEBUG_CATEGORY_STATIC (rtpmp4vpay_debug); #define GST_CAT_DEFAULT (rtpmp4vpay_debug) /* elementfactory information */ diff --git a/gst/rtsp/gstrtpdec.c b/gst/rtsp/gstrtpdec.c index 399174239..24054d83b 100644 --- a/gst/rtsp/gstrtpdec.c +++ b/gst/rtsp/gstrtpdec.c @@ -33,7 +33,7 @@ #include "gstrtpdec.h" -GST_DEBUG_CATEGORY (rtpdec_debug); +GST_DEBUG_CATEGORY_STATIC (rtpdec_debug); #define GST_CAT_DEFAULT (rtpdec_debug) /* elementfactory information */ diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index c909415f8..347e1e519 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -70,7 +70,7 @@ #include "gstrtspsrc.h" #include "sdp.h" -GST_DEBUG_CATEGORY (rtspsrc_debug); +GST_DEBUG_CATEGORY_STATIC (rtspsrc_debug); #define GST_CAT_DEFAULT (rtspsrc_debug) /* elementfactory information */ diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c index 661f55a21..20eab163d 100644 --- a/gst/udp/gstdynudpsink.c +++ b/gst/udp/gstdynudpsink.c @@ -25,7 +25,7 @@ #include "gstdynudpsink.h" #include <gst/netbuffer/gstnetbuffer.h> -GST_DEBUG_CATEGORY (dynudpsink_debug); +GST_DEBUG_CATEGORY_STATIC (dynudpsink_debug); #define GST_CAT_DEFAULT (dynudpsink_debug) static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index 0a6266147..a770f1a6f 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -36,7 +36,7 @@ #include "gstudp-marshal.h" #include "gstmultiudpsink.h" -GST_DEBUG_CATEGORY (multiudpsink_debug); +GST_DEBUG_CATEGORY_STATIC (multiudpsink_debug); #define GST_CAT_DEFAULT (multiudpsink_debug) static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c index 395f1785f..d0f09c3bd 100644 --- a/gst/udp/gstudpsrc.c +++ b/gst/udp/gstudpsrc.c @@ -86,7 +86,7 @@ #include <sys/filio.h> #endif -GST_DEBUG_CATEGORY (udpsrc_debug); +GST_DEBUG_CATEGORY_STATIC (udpsrc_debug); #define GST_CAT_DEFAULT (udpsrc_debug) /* the select call is also performed on the control sockets, that way diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c index 602d47460..f3cb715fe 100644 --- a/gst/videobox/gstvideobox.c +++ b/gst/videobox/gstvideobox.c @@ -27,7 +27,7 @@ #include <liboil/liboil.h> #include <string.h> -GST_DEBUG_CATEGORY (videobox_debug); +GST_DEBUG_CATEGORY_STATIC (videobox_debug); #define GST_CAT_DEFAULT videobox_debug #define GST_TYPE_VIDEO_BOX \ diff --git a/gst/videofilter/gstvideoflip.c b/gst/videofilter/gstvideoflip.c index f9312e64b..043f02757 100644 --- a/gst/videofilter/gstvideoflip.c +++ b/gst/videofilter/gstvideoflip.c @@ -60,7 +60,7 @@ enum /* FILL ME */ }; -GST_DEBUG_CATEGORY (video_flip_debug); +GST_DEBUG_CATEGORY_STATIC (video_flip_debug); #define GST_CAT_DEFAULT video_flip_debug static const GstElementDetails video_flip_details = |