From: Benjamin Otte Date: Thu, 18 Mar 2010 13:31:35 +0000 (+0100) Subject: gst_element_class_set_details => gst_element_class_set_details_simple X-Git-Tag: 1.19.3~509^2~8939 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cccfeaa59c3447be82eea26e4ce66d95ae8c22db;p=platform%2Fupstream%2Fgstreamer.git gst_element_class_set_details => gst_element_class_set_details_simple --- diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c index 8e07568..ea27a67 100644 --- a/ext/aalib/gstaasink.c +++ b/ext/aalib/gstaasink.c @@ -43,13 +43,6 @@ #include "gstaasink.h" #include -/* elementfactory information */ -static const GstElementDetails gst_aasink_details = -GST_ELEMENT_DETAILS ("ASCII art video sink", - "Sink/Video", - "An ASCII art videosink", - "Wim Taymans "); - /* aasink signals and args */ enum { @@ -199,7 +192,9 @@ gst_aasink_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &gst_aasink_details); + gst_element_class_set_details_simple (element_class, "ASCII art video sink", + "Sink/Video", + "An ASCII art videosink", "Wim Taymans "); } static void diff --git a/ext/annodex/gstcmmldec.c b/ext/annodex/gstcmmldec.c index ecc4493..8fd6e6e 100644 --- a/ext/annodex/gstcmmldec.c +++ b/ext/annodex/gstcmmldec.c @@ -68,12 +68,6 @@ enum LAST_SIGNAL }; -static const GstElementDetails gst_cmml_dec_details = -GST_ELEMENT_DETAILS ("CMML stream decoder", - "Codec/Decoder", - "Decodes CMML streams", - "Alessandro Decina "); - static GstStaticPadTemplate gst_cmml_dec_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -131,7 +125,9 @@ gst_cmml_dec_base_init (gpointer g_class) gst_static_pad_template_get (&gst_cmml_dec_sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_cmml_dec_src_factory)); - gst_element_class_set_details (element_class, &gst_cmml_dec_details); + gst_element_class_set_details_simple (element_class, "CMML stream decoder", + "Codec/Decoder", + "Decodes CMML streams", "Alessandro Decina "); } static void diff --git a/ext/annodex/gstcmmlenc.c b/ext/annodex/gstcmmlenc.c index 05247f9..d708a68 100644 --- a/ext/annodex/gstcmmlenc.c +++ b/ext/annodex/gstcmmlenc.c @@ -65,12 +65,6 @@ enum LAST_SIGNAL }; -static const GstElementDetails gst_cmml_enc_details = -GST_ELEMENT_DETAILS ("CMML streams encoder", - "Codec/Encoder", - "Encodes CMML streams", - "Alessandro Decina "); - static GstStaticPadTemplate gst_cmml_enc_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -118,7 +112,9 @@ gst_cmml_enc_base_init (gpointer g_class) gst_static_pad_template_get (&gst_cmml_enc_sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_cmml_enc_src_factory)); - gst_element_class_set_details (element_class, &gst_cmml_enc_details); + gst_element_class_set_details_simple (element_class, "CMML streams encoder", + "Codec/Encoder", + "Encodes CMML streams", "Alessandro Decina "); } static void diff --git a/ext/cairo/gsttextoverlay.c b/ext/cairo/gsttextoverlay.c index bceb5fe..0db4444 100644 --- a/ext/cairo/gsttextoverlay.c +++ b/ext/cairo/gsttextoverlay.c @@ -54,12 +54,6 @@ GST_DEBUG_CATEGORY_EXTERN (cairo_debug); #define GST_CAT_DEFAULT cairo_debug -static const GstElementDetails cairo_text_overlay_details = -GST_ELEMENT_DETAILS ("Text overlay", - "Filter/Editor/Video", - "Adds text strings on top of a video buffer", - "David Schleef "); - enum { ARG_0, @@ -141,7 +135,10 @@ gst_text_overlay_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&text_sink_template_factory)); - gst_element_class_set_details (element_class, &cairo_text_overlay_details); + gst_element_class_set_details_simple (element_class, "Text overlay", + "Filter/Editor/Video", + "Adds text strings on top of a video buffer", + "David Schleef "); } static void diff --git a/ext/cairo/gsttimeoverlay.c b/ext/cairo/gsttimeoverlay.c index b69934c..18f18f8 100644 --- a/ext/cairo/gsttimeoverlay.c +++ b/ext/cairo/gsttimeoverlay.c @@ -49,12 +49,6 @@ #define rint(x) ((double) floor((x)+(((x) < 0)? -0.5 : 0.5))) #endif -static const GstElementDetails cairo_time_overlay_details = -GST_ELEMENT_DETAILS ("Time overlay", - "Filter/Editor/Video", - "Overlays the time on a video stream", - "David Schleef "); - static GstStaticPadTemplate gst_cairo_time_overlay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -270,7 +264,9 @@ gst_cairo_time_overlay_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &cairo_time_overlay_details); + gst_element_class_set_details_simple (element_class, "Time overlay", + "Filter/Editor/Video", + "Overlays the time on a video stream", "David Schleef "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_cairo_time_overlay_sink_template)); diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index 725dc1f..a92ff97 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -47,13 +47,6 @@ #include "gstdvdec.h" - -static const GstElementDetails dvdec_details = -GST_ELEMENT_DETAILS ("DV video decoder", - "Codec/Decoder/Video", - "Uses libdv to decode DV video (smpte314) (libdv.sourceforge.net)", - "Erik Walthinsen ," "Wim Taymans "); - /* sizes of one input buffer */ #define NTSC_HEIGHT 480 #define NTSC_BUFFER 120000 @@ -178,7 +171,10 @@ gst_dvdec_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_temp)); - gst_element_class_set_details (element_class, &dvdec_details); + gst_element_class_set_details_simple (element_class, "DV video decoder", + "Codec/Decoder/Video", + "Uses libdv to decode DV video (smpte314) (libdv.sourceforge.net)", + "Erik Walthinsen ," "Wim Taymans "); GST_DEBUG_CATEGORY_INIT (dvdec_debug, "dvdec", 0, "DV decoding element"); } diff --git a/ext/dv/gstdvdemux.c b/ext/dv/gstdvdemux.c index 85a960f..3b8b314 100644 --- a/ext/dv/gstdvdemux.c +++ b/ext/dv/gstdvdemux.c @@ -106,12 +106,6 @@ GST_DEBUG_CATEGORY_STATIC (dvdemux_debug); #define GST_CAT_DEFAULT dvdemux_debug -static const GstElementDetails dvdemux_details = -GST_ELEMENT_DETAILS ("DV system stream demuxer", - "Codec/Demuxer", - "Uses libdv to separate DV audio from DV video (libdv.sourceforge.net)", - "Erik Walthinsen , Wim Taymans "); - static GstStaticPadTemplate sink_temp = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -186,7 +180,10 @@ gst_dvdemux_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&audio_src_temp)); - gst_element_class_set_details (element_class, &dvdemux_details); + gst_element_class_set_details_simple (element_class, + "DV system stream demuxer", "Codec/Demuxer", + "Uses libdv to separate DV audio from DV video (libdv.sourceforge.net)", + "Erik Walthinsen , Wim Taymans "); GST_DEBUG_CATEGORY_INIT (dvdemux_debug, "dvdemux", 0, "DV demuxer element"); } diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c index 25b1201..700bf06 100644 --- a/ext/esd/esdmon.c +++ b/ext/esd/esdmon.c @@ -47,14 +47,6 @@ #include #include - -/* elementfactory information */ -static const GstElementDetails esdmon_details = -GST_ELEMENT_DETAILS ("Esound audio monitor", - "Source/Audio", - "Monitors audio from an esound server", - "Richard Boulton "); - /* Signals and args */ enum { @@ -178,7 +170,10 @@ gst_esdmon_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_factory)); - gst_element_class_set_details (element_class, &esdmon_details); + gst_element_class_set_details_simple (element_class, "Esound audio monitor", + "Source/Audio", + "Monitors audio from an esound server", + "Richard Boulton "); } static void diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c index 9ae95c0..caabd92 100644 --- a/ext/esd/esdsink.c +++ b/ext/esd/esdsink.c @@ -62,13 +62,6 @@ GST_DEBUG_CATEGORY_EXTERN (esd_debug); #define GST_CAT_DEFAULT esd_debug -/* elementfactory information */ -static const GstElementDetails esdsink_details = -GST_ELEMENT_DETAILS ("Esound audio sink", - "Sink/Audio", - "Plays audio to an esound server", - "Arwed von Merkatz "); - enum { PROP_0, @@ -120,7 +113,10 @@ gst_esdsink_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &esdsink_details); + gst_element_class_set_details_simple (element_class, "Esound audio sink", + "Sink/Audio", + "Plays audio to an esound server", + "Arwed von Merkatz "); } static void diff --git a/ext/gconf/gstgconfaudiosink.c b/ext/gconf/gstgconfaudiosink.c index e8ab513..802861e 100644 --- a/ext/gconf/gstgconfaudiosink.c +++ b/ext/gconf/gstgconfaudiosink.c @@ -68,12 +68,11 @@ static void gst_gconf_audio_sink_base_init (gpointer klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - static const GstElementDetails gst_gconf_audio_sink_details = - GST_ELEMENT_DETAILS ("GConf audio sink", + + gst_element_class_set_details_simple (eklass, "GConf audio sink", "Sink/Audio", "Audio sink embedding the GConf-settings for audio output", "Jan Schmidt "); - gst_element_class_set_details (eklass, &gst_gconf_audio_sink_details); } #define GST_TYPE_GCONF_PROFILE (gst_gconf_profile_get_type()) diff --git a/ext/gconf/gstgconfaudiosrc.c b/ext/gconf/gstgconfaudiosrc.c index f5c3492..e790002 100644 --- a/ext/gconf/gstgconfaudiosrc.c +++ b/ext/gconf/gstgconfaudiosrc.c @@ -55,11 +55,7 @@ static void gst_gconf_audio_src_base_init (gpointer klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - static const GstElementDetails gst_gconf_audio_src_details = - GST_ELEMENT_DETAILS ("GConf audio source", - "Source/Audio", - "Audio source embedding the GConf-settings for audio input", - "GStreamer maintainers "); + static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -67,7 +63,10 @@ gst_gconf_audio_src_base_init (gpointer klass) gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (eklass, &gst_gconf_audio_src_details); + gst_element_class_set_details_simple (eklass, "GConf audio source", + "Source/Audio", + "Audio source embedding the GConf-settings for audio input", + "GStreamer maintainers "); } static void diff --git a/ext/gconf/gstgconfvideosink.c b/ext/gconf/gstgconfvideosink.c index 533eed3..2c6f2ec 100644 --- a/ext/gconf/gstgconfvideosink.c +++ b/ext/gconf/gstgconfvideosink.c @@ -53,11 +53,7 @@ static void gst_gconf_video_sink_base_init (gpointer klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - static const GstElementDetails gst_gconf_video_sink_details = - GST_ELEMENT_DETAILS ("GConf video sink", - "Sink/Video", - "Video sink embedding the GConf-settings for video output", - "GStreamer maintainers "); + static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -65,7 +61,10 @@ gst_gconf_video_sink_base_init (gpointer klass) gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (eklass, &gst_gconf_video_sink_details); + gst_element_class_set_details_simple (eklass, "GConf video sink", + "Sink/Video", + "Video sink embedding the GConf-settings for video output", + "GStreamer maintainers "); } static void diff --git a/ext/gconf/gstgconfvideosrc.c b/ext/gconf/gstgconfvideosrc.c index ea31b2c..95fc197 100644 --- a/ext/gconf/gstgconfvideosrc.c +++ b/ext/gconf/gstgconfvideosrc.c @@ -55,11 +55,7 @@ static void gst_gconf_video_src_base_init (gpointer klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - static const GstElementDetails gst_gconf_video_src_details = - GST_ELEMENT_DETAILS ("GConf video source", - "Source/Video", - "Video source embedding the GConf-settings for video input", - "GStreamer maintainers "); + static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -67,7 +63,10 @@ gst_gconf_video_src_base_init (gpointer klass) gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (eklass, &gst_gconf_video_src_details); + gst_element_class_set_details_simple (eklass, "GConf video source", + "Source/Video", + "Video source embedding the GConf-settings for video input", + "GStreamer maintainers "); } static void diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c index c6833a5..d194558 100644 --- a/ext/gdk_pixbuf/gstgdkpixbuf.c +++ b/ext/gdk_pixbuf/gstgdkpixbuf.c @@ -33,12 +33,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_gdk_pixbuf_debug); #define GST_CAT_DEFAULT gst_gdk_pixbuf_debug -static const GstElementDetails plugin_details = -GST_ELEMENT_DETAILS ("GdkPixbuf image decoder", - "Codec/Decoder/Image", - "Decodes images in a video stream using GdkPixbuf", - "David A. Schleef , Renato Filho "); - enum { ARG_0, @@ -165,7 +159,10 @@ gst_gdk_pixbuf_base_init (gpointer g_class) gst_static_pad_template_get (&gst_gdk_pixbuf_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_gdk_pixbuf_sink_template)); - gst_element_class_set_details (element_class, &plugin_details); + gst_element_class_set_details_simple (element_class, + "GdkPixbuf image decoder", "Codec/Decoder/Image", + "Decodes images in a video stream using GdkPixbuf", + "David A. Schleef , Renato Filho "); } /* initialize the plugin's class */ diff --git a/ext/gdk_pixbuf/pixbufscale.c b/ext/gdk_pixbuf/pixbufscale.c index 564cebf..d8d9808 100644 --- a/ext/gdk_pixbuf/pixbufscale.c +++ b/ext/gdk_pixbuf/pixbufscale.c @@ -39,15 +39,6 @@ GST_DEBUG_CATEGORY_STATIC (pixbufscale_debug); #define GST_CAT_DEFAULT pixbufscale_debug -/* elementfactory information */ -static const GstElementDetails pixbufscale_details = -GST_ELEMENT_DETAILS ("GdkPixbuf image scaler", - "Filter/Effect/Video", - "Resizes video", - "Jan Schmidt \n" - "Wim Taymans \n" - "Renato Filho "); - /* GstPixbufScale signals and args */ enum { @@ -125,7 +116,11 @@ gst_pixbufscale_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &pixbufscale_details); + gst_element_class_set_details_simple (element_class, "GdkPixbuf image scaler", + "Filter/Effect/Video", "Resizes video", + "Jan Schmidt , " + "Wim Taymans , " + "Renato Filho "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_pixbufscale_src_template)); diff --git a/ext/hal/gsthalaudiosink.c b/ext/hal/gsthalaudiosink.c index e010ea4..a009037 100644 --- a/ext/hal/gsthalaudiosink.c +++ b/ext/hal/gsthalaudiosink.c @@ -68,11 +68,7 @@ static void gst_hal_audio_sink_base_init (gpointer klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - static const GstElementDetails gst_hal_audio_sink_details = - GST_ELEMENT_DETAILS ("HAL audio sink", - "Sink/Audio", - "Audio sink for sound device access via HAL", - "Jürg Billeter "); + static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -80,7 +76,10 @@ gst_hal_audio_sink_base_init (gpointer klass) gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (eklass, &gst_hal_audio_sink_details); + gst_element_class_set_details_simple (eklass, "HAL audio sink", + "Sink/Audio", + "Audio sink for sound device access via HAL", + "Jürg Billeter "); } static void diff --git a/ext/hal/gsthalaudiosrc.c b/ext/hal/gsthalaudiosrc.c index bd0a70b..5108f7d 100644 --- a/ext/hal/gsthalaudiosrc.c +++ b/ext/hal/gsthalaudiosrc.c @@ -70,11 +70,7 @@ static void gst_hal_audio_src_base_init (gpointer klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - static const GstElementDetails gst_hal_audio_src_details = - GST_ELEMENT_DETAILS ("HAL audio source", - "Source/Audio", - "Audio source for sound device access via HAL", - "Jürg Billeter "); + static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -82,7 +78,10 @@ gst_hal_audio_src_base_init (gpointer klass) gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (eklass, &gst_hal_audio_src_details); + gst_element_class_set_details_simple (eklass, "HAL audio source", + "Source/Audio", + "Audio source for sound device access via HAL", + "Jürg Billeter "); } static void diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c index 48b7661..4936ffb 100644 --- a/ext/jpeg/gstjpegdec.c +++ b/ext/jpeg/gstjpegdec.c @@ -43,12 +43,6 @@ #include "gst/gst-i18n-plugin.h" #include -static const GstElementDetails gst_jpeg_dec_details = -GST_ELEMENT_DETAILS ("JPEG image decoder", - "Codec/Decoder/Image", - "Decode images from JPEG format", - "Wim Taymans "); - #define MIN_WIDTH 16 #define MAX_WIDTH 65535 #define MIN_HEIGHT 8 @@ -164,7 +158,9 @@ gst_jpeg_dec_base_init (gpointer g_class) gst_static_pad_template_get (&gst_jpeg_dec_src_pad_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_jpeg_dec_sink_pad_template)); - gst_element_class_set_details (element_class, &gst_jpeg_dec_details); + gst_element_class_set_details_simple (element_class, "JPEG image decoder", + "Codec/Decoder/Image", + "Decode images from JPEG format", "Wim Taymans "); } static void diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index 38e2398..3e8b795 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -43,14 +43,6 @@ /* setting smoothig seems to have no effect in libjepeg #define ENABLE_SMOOTHING 1 */ -/*#define ENABLE_COLORSPACE_RGB 1 */ - -/* elementfactory information */ -static const GstElementDetails gst_jpegenc_details = -GST_ELEMENT_DETAILS ("JPEG image encoder", - "Codec/Encoder/Image", - "Encode images in JPEG format", - "Wim Taymans "); GST_DEBUG_CATEGORY_STATIC (jpegenc_debug); #define GST_CAT_DEFAULT jpegenc_debug @@ -160,7 +152,9 @@ gst_jpegenc_base_init (gpointer g_class) gst_static_pad_template_get (&gst_jpegenc_sink_pad_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_jpegenc_src_pad_template)); - gst_element_class_set_details (element_class, &gst_jpegenc_details); + gst_element_class_set_details_simple (element_class, "JPEG image encoder", + "Codec/Encoder/Image", + "Encode images in JPEG format", "Wim Taymans "); } static void diff --git a/ext/jpeg/gstsmokedec.c b/ext/jpeg/gstsmokedec.c index b66a230..f2cfc0a 100644 --- a/ext/jpeg/gstsmokedec.c +++ b/ext/jpeg/gstsmokedec.c @@ -32,13 +32,6 @@ #include "gstsmokedec.h" #include -/* elementfactory information */ -static const GstElementDetails gst_smokedec_details = -GST_ELEMENT_DETAILS ("Smoke video decoder", - "Codec/Decoder/Video", - "Decode video from Smoke format", - "Wim Taymans "); - GST_DEBUG_CATEGORY_STATIC (smokedec_debug); #define GST_CAT_DEFAULT smokedec_debug @@ -117,7 +110,9 @@ gst_smokedec_base_init (gpointer g_class) gst_static_pad_template_get (&gst_smokedec_src_pad_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_smokedec_sink_pad_template)); - gst_element_class_set_details (element_class, &gst_smokedec_details); + gst_element_class_set_details_simple (element_class, "Smoke video decoder", + "Codec/Decoder/Video", + "Decode video from Smoke format", "Wim Taymans "); } static void diff --git a/ext/jpeg/gstsmokeenc.c b/ext/jpeg/gstsmokeenc.c index 31f7ed2..0df2be9 100644 --- a/ext/jpeg/gstsmokeenc.c +++ b/ext/jpeg/gstsmokeenc.c @@ -30,13 +30,6 @@ #include "gstsmokeenc.h" #include -/* elementfactory information */ -static const GstElementDetails gst_smokeenc_details = -GST_ELEMENT_DETAILS ("Smoke video encoder", - "Codec/Encoder/Video", - "Encode images into the Smoke format", - "Wim Taymans "); - GST_DEBUG_CATEGORY_STATIC (smokeenc_debug); #define GST_CAT_DEFAULT smokeenc_debug @@ -134,7 +127,9 @@ gst_smokeenc_base_init (gpointer g_class) gst_static_pad_template_get (&gst_smokeenc_sink_pad_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_smokeenc_src_pad_template)); - gst_element_class_set_details (element_class, &gst_smokeenc_details); + gst_element_class_set_details_simple (element_class, "Smoke video encoder", + "Codec/Encoder/Video", + "Encode images into the Smoke format", "Wim Taymans "); } static void diff --git a/ext/libcaca/gstcacasink.c b/ext/libcaca/gstcacasink.c index 8102fff..829059d 100644 --- a/ext/libcaca/gstcacasink.c +++ b/ext/libcaca/gstcacasink.c @@ -54,13 +54,6 @@ //#define GST_CACA_DEFAULT_GREEN_MASK G_MASK_32_REVERSE_INT //#define GST_CACA_DEFAULT_BLUE_MASK B_MASK_32_REVERSE_INT -/* elementfactory information */ -static const GstElementDetails gst_cacasink_details = -GST_ELEMENT_DETAILS ("A colored ASCII art video sink", - "Sink/Video", - "A colored ASCII art videosink", - "Zeeshan Ali "); - /* cacasink signals and args */ enum { @@ -155,7 +148,9 @@ gst_cacasink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_cacasink_details); + gst_element_class_set_details_simple (element_class, + "A colored ASCII art video sink", "Sink/Video", + "A colored ASCII art videosink", "Zeeshan Ali "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); } diff --git a/ext/libmng/gstmng.h b/ext/libmng/gstmng.h index b0dcc19..3aa2a80 100644 --- a/ext/libmng/gstmng.h +++ b/ext/libmng/gstmng.h @@ -16,7 +16,6 @@ #include GType gst_mngenc_get_type (void); -extern GstElementDetails gst_mngenc_details; extern GstPadTemplate *gst_mng_sink_factory (); extern GstPadTemplate *gst_mng_src_factory (); diff --git a/ext/libmng/gstmngdec.c b/ext/libmng/gstmngdec.c index d42febb..1976729 100644 --- a/ext/libmng/gstmngdec.c +++ b/ext/libmng/gstmngdec.c @@ -21,12 +21,6 @@ #include "gstmngdec.h" #include -static const GstElementDetails gst_mng_dec_details = -GST_ELEMENT_DETAILS ("MNG video decoder", - "Codec/Decoder/Video", - "Decode a mng video to raw images", - "Wim Taymans "); - /* Filter signals and args */ enum { @@ -76,7 +70,9 @@ gst_mng_dec_base_init (gpointer g_class) gst_static_pad_template_get (&gst_mng_dec_src_pad_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_mng_dec_sink_pad_template)); - gst_element_class_set_details (element_class, &gst_mng_dec_details); + gst_element_class_set_details_simple (element_class, "MNG video decoder", + "Codec/Decoder/Video", + "Decode a mng video to raw images", "Wim Taymans "); } static void diff --git a/ext/libmng/gstmngenc.c b/ext/libmng/gstmngenc.c index 1d60d79..5dc01eb 100644 --- a/ext/libmng/gstmngenc.c +++ b/ext/libmng/gstmngenc.c @@ -26,13 +26,6 @@ #define MAX_HEIGHT 4096 -static const GstElementDetails gst_mng_enc_details = -GST_ELEMENT_DETAILS ("MNG video encoder", - "Codec/Encoder/Video", - "Encode a video frame to an .mng video", - "Wim Taymans "); - - /* Filter signals and args */ enum { @@ -91,7 +84,9 @@ gst_mng_enc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, mngenc_sink_template); gst_element_class_add_pad_template (element_class, mngenc_src_template); - gst_element_class_set_details (element_class, &gst_mng_enc_details); + gst_element_class_set_details_simple (element_class, "MNG video encoder", + "Codec/Encoder/Video", + "Encode a video frame to an .mng video", "Wim Taymans "); } static void diff --git a/ext/libpng/gstpng.h b/ext/libpng/gstpng.h index c3ced9e..8c498d3 100644 --- a/ext/libpng/gstpng.h +++ b/ext/libpng/gstpng.h @@ -20,7 +20,6 @@ #include GType gst_pngenc_get_type (void); -extern GstElementDetails gst_pngenc_details; extern GstPadTemplate *gst_png_sink_factory (); extern GstPadTemplate *gst_png_src_factory (); diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c index 147dc71..7cd8c56 100644 --- a/ext/libpng/gstpngdec.c +++ b/ext/libpng/gstpngdec.c @@ -30,12 +30,6 @@ #include #include -static const GstElementDetails gst_pngdec_details = -GST_ELEMENT_DETAILS ("PNG image decoder", - "Codec/Decoder/Image", - "Decode a png video frame to a raw image", - "Wim Taymans "); - GST_DEBUG_CATEGORY_STATIC (pngdec_debug); #define GST_CAT_DEFAULT pngdec_debug @@ -111,7 +105,10 @@ gst_pngdec_base_init (gpointer g_class) gst_static_pad_template_get (&gst_pngdec_src_pad_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_pngdec_sink_pad_template)); - gst_element_class_set_details (element_class, &gst_pngdec_details); + gst_element_class_set_details_simple (element_class, "PNG image decoder", + "Codec/Decoder/Image", + "Decode a png video frame to a raw image", + "Wim Taymans "); } static void diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c index 7724ec6..655cadb 100644 --- a/ext/libpng/gstpngenc.c +++ b/ext/libpng/gstpngenc.c @@ -32,13 +32,6 @@ #define MAX_HEIGHT 4096 - -static const GstElementDetails gst_pngenc_details = -GST_ELEMENT_DETAILS ("PNG image encoder", - "Codec/Encoder/Image", - "Encode a video frame to a .png image", - "Jeremy SIMON "); - GST_DEBUG_CATEGORY_STATIC (pngenc_debug); #define GST_CAT_DEFAULT pngenc_debug @@ -109,7 +102,10 @@ gst_pngenc_base_init (gpointer g_class) (element_class, gst_static_pad_template_get (&pngenc_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&pngenc_src_template)); - gst_element_class_set_details (element_class, &gst_pngenc_details); + gst_element_class_set_details_simple (element_class, "PNG image encoder", + "Codec/Encoder/Image", + "Encode a video frame to a .png image", + "Jeremy SIMON "); } static void diff --git a/ext/mikmod/gstmikmod.c b/ext/mikmod/gstmikmod.c index 83dd315..fa6bc78 100644 --- a/ext/mikmod/gstmikmod.c +++ b/ext/mikmod/gstmikmod.c @@ -24,14 +24,6 @@ #include -/* elementfactory information */ -static const GstElementDetails mikmod_details = -GST_ELEMENT_DETAILS ("MikMod audio decoder", - "Codec/Decoder/Audio", - "Module decoder based on libmikmod", - "Jeremy SIMON "); - - /* Filter signals and args */ enum { @@ -140,7 +132,9 @@ gst_mikmod_base_init (gpointer g_class) gst_static_pad_template_get (&mikmod_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&mikmod_sink_factory)); - gst_element_class_set_details (element_class, &mikmod_details); + gst_element_class_set_details_simple (element_class, "MikMod audio decoder", + "Codec/Decoder/Audio", + "Module decoder based on libmikmod", "Jeremy SIMON "); } static void diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c index 6e3b4c1..34a3c82 100644 --- a/ext/raw1394/gstdv1394src.c +++ b/ext/raw1394/gstdv1394src.c @@ -113,14 +113,6 @@ enum PROP_DEVICE_NAME }; -static const GstElementDetails gst_dv1394src_details = -GST_ELEMENT_DETAILS ("Firewire (1394) DV video source", - "Source/Video", - "Source for DV video data from firewire port", - "Erik Walthinsen \n" - "Daniel Fischer \n" "Wim Taymans \n" - "Zaheer Abbas Merali "); - static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -179,7 +171,12 @@ gst_dv1394src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_factory)); - gst_element_class_set_details (element_class, &gst_dv1394src_details); + gst_element_class_set_details_simple (element_class, + "Firewire (1394) DV video source", "Source/Video", + "Source for DV video data from firewire port", + "Erik Walthinsen , " + "Daniel Fischer , " "Wim Taymans , " + "Zaheer Abbas Merali "); } static void diff --git a/ext/raw1394/gsthdv1394src.c b/ext/raw1394/gsthdv1394src.c index 14fdb76..4957346 100644 --- a/ext/raw1394/gsthdv1394src.c +++ b/ext/raw1394/gsthdv1394src.c @@ -90,12 +90,6 @@ enum PROP_DEVICE_NAME }; -static const GstElementDetails gst_hdv1394src_details = -GST_ELEMENT_DETAILS ("Firewire (1394) HDV video source", - "Source/Video", - "Source for MPEG-TS video data from firewire port", - "Edward Hervey "); - static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -149,7 +143,10 @@ gst_hdv1394src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_factory)); - gst_element_class_set_details (element_class, &gst_hdv1394src_details); + gst_element_class_set_details_simple (element_class, + "Firewire (1394) HDV video source", "Source/Video", + "Source for MPEG-TS video data from firewire port", + "Edward Hervey "); } static void diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c index b20278d..ec238ae 100644 --- a/ext/shout2/gstshout2.c +++ b/ext/shout2/gstshout2.c @@ -31,14 +31,6 @@ GST_DEBUG_CATEGORY_STATIC (shout2_debug); #define GST_CAT_DEFAULT shout2_debug -static const GstElementDetails shout2send_details = -GST_ELEMENT_DETAILS ("Icecast network sink", - "Sink/Network", - "Sends data to an icecast server", - "Wim Taymans \n" - "Pedro Corte-Real \n" - "Zaheer Abbas Merali "); - enum { @@ -170,7 +162,11 @@ gst_shout2send_base_init (GstShout2sendClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &shout2send_details); + gst_element_class_set_details_simple (element_class, "Icecast network sink", + "Sink/Network", "Sends data to an icecast server", + "Wim Taymans , " + "Pedro Corte-Real , " + "Zaheer Abbas Merali "); GST_DEBUG_CATEGORY_INIT (shout2_debug, "shout2", 0, "shout2send element"); } diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c index 6e5c32b..1824852 100644 --- a/ext/soup/gstsouphttpsrc.c +++ b/ext/soup/gstsouphttpsrc.c @@ -89,12 +89,6 @@ GST_DEBUG_CATEGORY_STATIC (souphttpsrc_debug); #define GST_CAT_DEFAULT souphttpsrc_debug -static const GstElementDetails gst_soup_http_src_details = -GST_ELEMENT_DETAILS ("HTTP client source", - "Source/Network", - "Receive data as a client over the network via HTTP using SOUP", - "Wouter Cloetens "); - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -201,7 +195,10 @@ gst_soup_http_src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&srctemplate)); - gst_element_class_set_details (element_class, &gst_soup_http_src_details); + gst_element_class_set_details_simple (element_class, "HTTP client source", + "Source/Network", + "Receive data as a client over the network via HTTP using SOUP", + "Wouter Cloetens "); } static void diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c index 12b8cc4..e4ce803 100644 --- a/ext/speex/gstspeexdec.c +++ b/ext/speex/gstspeexdec.c @@ -50,12 +50,6 @@ GST_DEBUG_CATEGORY_STATIC (speexdec_debug); #define GST_CAT_DEFAULT speexdec_debug -static const GstElementDetails speex_dec_details = -GST_ELEMENT_DETAILS ("Speex audio decoder", - "Codec/Decoder/Audio", - "decode speex streams to audio", - "Wim Taymans "); - #define DEFAULT_ENH TRUE enum @@ -115,7 +109,9 @@ gst_speex_dec_base_init (gpointer g_class) gst_static_pad_template_get (&speex_dec_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&speex_dec_sink_factory)); - gst_element_class_set_details (element_class, &speex_dec_details); + gst_element_class_set_details_simple (element_class, "Speex audio decoder", + "Codec/Decoder/Audio", + "decode speex streams to audio", "Wim Taymans "); } static void diff --git a/ext/speex/gstspeexenc.c b/ext/speex/gstspeexenc.c index 768775f..f0b257e 100644 --- a/ext/speex/gstspeexenc.c +++ b/ext/speex/gstspeexenc.c @@ -69,12 +69,6 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", "rate = (int) [ 6000, 48000 ], " "channels = (int) [ 1, 2]") ); -static const GstElementDetails speexenc_details = -GST_ELEMENT_DETAILS ("Speex audio encoder", - "Codec/Encoder/Audio", - "Encodes audio in Speex format", - "Wim Taymans "); - #define DEFAULT_QUALITY 8.0 #define DEFAULT_BITRATE 0 #define DEFAULT_MODE GST_SPEEX_ENC_MODE_AUTO @@ -184,7 +178,9 @@ gst_speex_enc_base_init (gpointer g_class) gst_static_pad_template_get (&src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &speexenc_details); + gst_element_class_set_details_simple (element_class, "Speex audio encoder", + "Codec/Encoder/Audio", + "Encodes audio in Speex format", "Wim Taymans "); } static void diff --git a/gst/apetag/gstapedemux.c b/gst/apetag/gstapedemux.c index eb448e8..0860f25 100644 --- a/gst/apetag/gstapedemux.c +++ b/gst/apetag/gstapedemux.c @@ -60,12 +60,6 @@ GST_DEBUG_CATEGORY_STATIC (apedemux_debug); #define GST_CAT_DEFAULT (apedemux_debug) -static const GstElementDetails gst_ape_demux_details = -GST_ELEMENT_DETAILS ("APE tag demuxer", - "Codec/Demuxer/Metadata", - "Read and output APE tags while demuxing the contents", - "Tim-Philipp Müller "); - static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -88,7 +82,10 @@ gst_ape_demux_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &gst_ape_demux_details); + gst_element_class_set_details_simple (element_class, "APE tag demuxer", + "Codec/Demuxer/Metadata", + "Read and output APE tags while demuxing the contents", + "Tim-Philipp Müller "); GST_DEBUG_CATEGORY_INIT (apedemux_debug, "apedemux", 0, "GStreamer APE tag demuxer"); diff --git a/gst/audiofx/audioamplify.c b/gst/audiofx/audioamplify.c index fa1cc2e..4fe213d 100644 --- a/gst/audiofx/audioamplify.c +++ b/gst/audiofx/audioamplify.c @@ -49,12 +49,6 @@ #define GST_CAT_DEFAULT gst_audio_amplify_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -static const GstElementDetails element_details = -GST_ELEMENT_DETAILS ("Audio amplifier", - "Filter/Effect/Audio", - "Amplifies an audio stream by a given factor", - "Sebastian Dröge "); - /* Filter signals and args */ enum { @@ -289,7 +283,10 @@ gst_audio_amplify_base_init (gpointer klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstCaps *caps; - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "Audio amplifier", + "Filter/Effect/Audio", + "Amplifies an audio stream by a given factor", + "Sebastian Dröge "); caps = gst_caps_from_string (ALLOWED_CAPS); gst_audio_filter_class_add_pad_templates (GST_AUDIO_FILTER_CLASS (klass), diff --git a/gst/audiofx/audiodynamic.c b/gst/audiofx/audiodynamic.c index dc096d4..6ae1070 100644 --- a/gst/audiofx/audiodynamic.c +++ b/gst/audiofx/audiodynamic.c @@ -53,12 +53,6 @@ #define GST_CAT_DEFAULT gst_audio_dynamic_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -static const GstElementDetails element_details = -GST_ELEMENT_DETAILS ("Dynamic range controller", - "Filter/Effect/Audio", - "Compressor and Expander", - "Sebastian Dröge "); - /* Filter signals and args */ enum { @@ -224,7 +218,9 @@ gst_audio_dynamic_base_init (gpointer klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstCaps *caps; - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, + "Dynamic range controller", "Filter/Effect/Audio", + "Compressor and Expander", "Sebastian Dröge "); caps = gst_caps_from_string (ALLOWED_CAPS); gst_audio_filter_class_add_pad_templates (GST_AUDIO_FILTER_CLASS (klass), diff --git a/gst/audiofx/audioinvert.c b/gst/audiofx/audioinvert.c index df43a09..95d425c 100644 --- a/gst/audiofx/audioinvert.c +++ b/gst/audiofx/audioinvert.c @@ -51,12 +51,6 @@ #define GST_CAT_DEFAULT gst_audio_invert_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -static const GstElementDetails element_details = -GST_ELEMENT_DETAILS ("Audio inversion", - "Filter/Effect/Audio", - "Swaps upper and lower half of audio samples", - "Sebastian Dröge "); - /* Filter signals and args */ enum { @@ -113,7 +107,10 @@ gst_audio_invert_base_init (gpointer klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstCaps *caps; - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "Audio inversion", + "Filter/Effect/Audio", + "Swaps upper and lower half of audio samples", + "Sebastian Dröge "); caps = gst_caps_from_string (ALLOWED_CAPS); gst_audio_filter_class_add_pad_templates (GST_AUDIO_FILTER_CLASS (klass), diff --git a/gst/audiofx/audiokaraoke.c b/gst/audiofx/audiokaraoke.c index c39a79b..ac0696e 100644 --- a/gst/audiofx/audiokaraoke.c +++ b/gst/audiofx/audiokaraoke.c @@ -49,12 +49,6 @@ #define GST_CAT_DEFAULT gst_audio_karaoke_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -static const GstElementDetails element_details = -GST_ELEMENT_DETAILS ("AudioKaraoke", - "Filter/Effect/Audio", - "Removes voice from sound", - "Wim Taymans "); - /* Filter signals and args */ enum { @@ -120,7 +114,9 @@ gst_audio_karaoke_base_init (gpointer klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstCaps *caps; - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "AudioKaraoke", + "Filter/Effect/Audio", + "Removes voice from sound", "Wim Taymans "); caps = gst_caps_from_string (ALLOWED_CAPS); gst_audio_filter_class_add_pad_templates (GST_AUDIO_FILTER_CLASS (klass), diff --git a/gst/audiofx/audiopanorama.c b/gst/audiofx/audiopanorama.c index e869d87..e28246b 100644 --- a/gst/audiofx/audiopanorama.c +++ b/gst/audiofx/audiopanorama.c @@ -49,12 +49,6 @@ #define GST_CAT_DEFAULT gst_audio_panorama_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -static const GstElementDetails element_details = -GST_ELEMENT_DETAILS ("Stereo positioning", - "Filter/Effect/Audio", - "Positions audio streams in the stereo panorama", - "Stefan Kost "); - /* Filter signals and args */ enum { @@ -194,7 +188,10 @@ gst_audio_panorama_base_init (gpointer klass) gst_static_pad_template_get (&src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "Stereo positioning", + "Filter/Effect/Audio", + "Positions audio streams in the stereo panorama", + "Stefan Kost "); } static void diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c index 184a731..715acb2 100644 --- a/gst/auparse/gstauparse.c +++ b/gst/auparse/gstauparse.c @@ -37,12 +37,6 @@ GST_DEBUG_CATEGORY_STATIC (auparse_debug); #define GST_CAT_DEFAULT (auparse_debug) -static const GstElementDetails gst_au_parse_details = -GST_ELEMENT_DETAILS ("AU audio demuxer", - "Codec/Demuxer/Audio", - "Parse an .au file into raw audio", - "Erik Walthinsen "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -96,7 +90,10 @@ gst_au_parse_base_init (gpointer g_class) gst_static_pad_template_get (&sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_au_parse_details); + gst_element_class_set_details_simple (element_class, "AU audio demuxer", + "Codec/Demuxer/Audio", + "Parse an .au file into raw audio", + "Erik Walthinsen "); GST_DEBUG_CATEGORY_INIT (auparse_debug, "auparse", 0, ".au parser"); } diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c index 7ba76fc..7d7975c 100644 --- a/gst/autodetect/gstautoaudiosink.c +++ b/gst/autodetect/gstautoaudiosink.c @@ -63,12 +63,6 @@ static void gst_auto_audio_sink_get_property (GObject * object, guint prop_id, GST_BOILERPLATE (GstAutoAudioSink, gst_auto_audio_sink, GstBin, GST_TYPE_BIN); -static const GstElementDetails gst_auto_audio_sink_details = -GST_ELEMENT_DETAILS ("Auto audio sink", - "Sink/Audio", - "Wrapper audio sink for automatically detected audio sink", - "Jan Schmidt "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -82,7 +76,10 @@ gst_auto_audio_sink_base_init (gpointer klass) gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (eklass, &gst_auto_audio_sink_details); + gst_element_class_set_details_simple (eklass, "Auto audio sink", + "Sink/Audio", + "Wrapper audio sink for automatically detected audio sink", + "Jan Schmidt "); } static void diff --git a/gst/autodetect/gstautoaudiosrc.c b/gst/autodetect/gstautoaudiosrc.c index 9d1f34f..076f6ff 100644 --- a/gst/autodetect/gstautoaudiosrc.c +++ b/gst/autodetect/gstautoaudiosrc.c @@ -64,13 +64,6 @@ static void gst_auto_audio_src_get_property (GObject * object, guint prop_id, GST_BOILERPLATE (GstAutoAudioSrc, gst_auto_audio_src, GstBin, GST_TYPE_BIN); -static const GstElementDetails gst_auto_audio_src_details = -GST_ELEMENT_DETAILS ("Auto audio source", - "Source/Audio", - "Wrapper audio source for automatically detected audio source", - "Jan Schmidt \n" - "Stefan Kost "); - static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -84,7 +77,11 @@ gst_auto_audio_src_base_init (gpointer klass) gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (eklass, &gst_auto_audio_src_details); + gst_element_class_set_details_simple (eklass, "Auto audio source", + "Source/Audio", + "Wrapper audio source for automatically detected audio source", + "Jan Schmidt , " + "Stefan Kost "); } static void diff --git a/gst/autodetect/gstautovideosink.c b/gst/autodetect/gstautovideosink.c index e43997c..d0292fd 100644 --- a/gst/autodetect/gstautovideosink.c +++ b/gst/autodetect/gstautovideosink.c @@ -64,12 +64,6 @@ static void gst_auto_video_sink_get_property (GObject * object, guint prop_id, GST_BOILERPLATE (GstAutoVideoSink, gst_auto_video_sink, GstBin, GST_TYPE_BIN); -static const GstElementDetails gst_auto_video_sink_details = -GST_ELEMENT_DETAILS ("Auto video sink", - "Sink/Video", - "Wrapper video sink for automatically detected video sink", - "Jan Schmidt "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -82,7 +76,10 @@ gst_auto_video_sink_base_init (gpointer klass) gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (eklass, &gst_auto_video_sink_details); + gst_element_class_set_details_simple (eklass, "Auto video sink", + "Sink/Video", + "Wrapper video sink for automatically detected video sink", + "Jan Schmidt "); } static void diff --git a/gst/autodetect/gstautovideosrc.c b/gst/autodetect/gstautovideosrc.c index f9fda68..3fa19c6 100644 --- a/gst/autodetect/gstautovideosrc.c +++ b/gst/autodetect/gstautovideosrc.c @@ -65,13 +65,6 @@ static void gst_auto_video_src_get_property (GObject * object, guint prop_id, GST_BOILERPLATE (GstAutoVideoSrc, gst_auto_video_src, GstBin, GST_TYPE_BIN); -static const GstElementDetails gst_auto_video_src_details = -GST_ELEMENT_DETAILS ("Auto video source", - "Source/Video", - "Wrapper video source for automatically detected video source", - "Jan Schmidt \n" - "Stefan Kost "); - static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -84,7 +77,11 @@ gst_auto_video_src_base_init (gpointer klass) gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (eklass, &gst_auto_video_src_details); + gst_element_class_set_details_simple (eklass, "Auto video source", + "Source/Video", + "Wrapper video source for automatically detected video source", + "Jan Schmidt , " + "Stefan Kost "); } static void diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 4474f3c..d0fb95b 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -145,13 +145,6 @@ gst_avi_demux_get_type (void) static void gst_avi_demux_base_init (GstAviDemuxClass * klass) { - static const GstElementDetails gst_avi_demux_details = - GST_ELEMENT_DETAILS ("Avi demuxer", - "Codec/Demuxer", - "Demultiplex an avi file into audio and video", - "Erik Walthinsen \n" - "Wim Taymans \n" - "Thijs Vermeir "); GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstPadTemplate *videosrctempl, *audiosrctempl, *subsrctempl; GstCaps *audcaps, *vidcaps, *subcaps; @@ -175,7 +168,12 @@ gst_avi_demux_base_init (GstAviDemuxClass * klass) gst_element_class_add_pad_template (element_class, subsrctempl); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_templ)); - gst_element_class_set_details (element_class, &gst_avi_demux_details); + gst_element_class_set_details_simple (element_class, "Avi demuxer", + "Codec/Demuxer", + "Demultiplex an avi file into audio and video", + "Erik Walthinsen , " + "Wim Taymans , " + "Thijs Vermeir "); } static void diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 1bbbb7d..c69fac1 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -79,12 +79,6 @@ enum #define DEFAULT_BIGFILE TRUE -static const GstElementDetails gst_avi_mux_details = -GST_ELEMENT_DETAILS ("Avi muxer", - "Codec/Muxer", - "Muxes audio and video into an avi stream", - "GStreamer maintainers "); - static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -254,7 +248,10 @@ gst_avi_mux_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&video_sink_factory)); - gst_element_class_set_details (element_class, &gst_avi_mux_details); + gst_element_class_set_details_simple (element_class, "Avi muxer", + "Codec/Muxer", + "Muxes audio and video into an avi stream", + "GStreamer maintainers "); GST_DEBUG_CATEGORY_INIT (avimux_debug, "avimux", 0, "Muxer for AVI streams"); } diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c index c9d25a5..d9ff9fa 100644 --- a/gst/cutter/gstcutter.c +++ b/gst/cutter/gstcutter.c @@ -65,12 +65,6 @@ GST_DEBUG_CATEGORY_STATIC (cutter_debug); #define CUTTER_DEFAULT_THRESHOLD_LENGTH (500 * GST_MSECOND) #define CUTTER_DEFAULT_PRE_LENGTH (200 * GST_MSECOND) -static const GstElementDetails cutter_details = -GST_ELEMENT_DETAILS ("Audio cutter", - "Filter/Editor/Audio", - "Audio Cutter to split audio into non-silent bits", - "Thomas Vander Stichele "); - static GstStaticPadTemplate cutter_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -124,7 +118,10 @@ gst_cutter_base_init (gpointer g_class) gst_static_pad_template_get (&cutter_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&cutter_sink_factory)); - gst_element_class_set_details (element_class, &cutter_details); + gst_element_class_set_details_simple (element_class, "Audio cutter", + "Filter/Editor/Audio", + "Audio Cutter to split audio into non-silent bits", + "Thomas Vander Stichele "); } static void diff --git a/gst/debugutils/breakmydata.c b/gst/debugutils/breakmydata.c index 0345379..2cba3ce 100644 --- a/gst/debugutils/breakmydata.c +++ b/gst/debugutils/breakmydata.c @@ -85,11 +85,6 @@ static GstFlowReturn gst_break_my_data_transform_ip (GstBaseTransform * trans, static gboolean gst_break_my_data_stop (GstBaseTransform * trans); static gboolean gst_break_my_data_start (GstBaseTransform * trans); -static const GstElementDetails details = GST_ELEMENT_DETAILS ("Break my data", - "Testing", - "randomly change data in the stream", - "Benjamin Otte "); - GstStaticPadTemplate bmd_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -120,7 +115,9 @@ gst_break_my_data_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&bmd_src_template)); - gst_element_class_set_details (gstelement_class, &details); + gst_element_class_set_details_simple (gstelement_class, "Break my data", + "Testing", + "randomly change data in the stream", "Benjamin Otte "); } static void diff --git a/gst/debugutils/efence.c b/gst/debugutils/efence.c index 05702ff..d046a93 100644 --- a/gst/debugutils/efence.c +++ b/gst/debugutils/efence.c @@ -42,16 +42,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_efence_debug); #define GST_CAT_DEFAULT gst_efence_debug -static const GstElementDetails plugin_details = -GST_ELEMENT_DETAILS ("Electric Fence", - "Testing", - "This element converts a stream of normal GStreamer buffers into a " - "stream of buffers that are allocated in such a way that out-of-bounds " - "access to data in the buffer is more likely to cause segmentation " - "faults. This allocation method is very similar to the debugging tool " - "\"Electric Fence\".", - "David A. Schleef "); - /* Filter signals and args */ enum { @@ -148,7 +138,13 @@ gst_efence_base_init (gpointer g_class) gst_static_pad_template_get (&gst_efence_sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_efence_src_factory)); - gst_element_class_set_details (element_class, &plugin_details); + gst_element_class_set_details_simple (element_class, "Electric Fence", + "Testing", + "This element converts a stream of normal GStreamer buffers into a " + "stream of buffers that are allocated in such a way that out-of-bounds " + "access to data in the buffer is more likely to cause segmentation " + "faults. This allocation method is very similar to the debugging tool " + "\"Electric Fence\".", "David A. Schleef "); } /* initialize the plugin's class */ diff --git a/gst/debugutils/gstnavigationtest.c b/gst/debugutils/gstnavigationtest.c index 2f23c51..dfa00c6 100644 --- a/gst/debugutils/gstnavigationtest.c +++ b/gst/debugutils/gstnavigationtest.c @@ -35,12 +35,6 @@ GST_DEBUG_CATEGORY_STATIC (navigationtest_debug); #define GST_CAT_DEFAULT navigationtest_debug -static const GstElementDetails navigationtest_details = -GST_ELEMENT_DETAILS ("Video navigation test", - "Filter/Effect/Video", - "Handle navigation events showing a black square following mouse pointer", - "David Schleef "); - static GstStaticPadTemplate gst_navigationtest_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -272,7 +266,10 @@ gst_navigationtest_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &navigationtest_details); + gst_element_class_set_details_simple (element_class, "Video navigation test", + "Filter/Effect/Video", + "Handle navigation events showing a black square following mouse pointer", + "David Schleef "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_navigationtest_sink_template)); diff --git a/gst/debugutils/gstnavseek.c b/gst/debugutils/gstnavseek.c index ee74226..9fe26c1 100644 --- a/gst/debugutils/gstnavseek.c +++ b/gst/debugutils/gstnavseek.c @@ -47,12 +47,6 @@ GstStaticPadTemplate navseek_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); -static const GstElementDetails navseek_details = -GST_ELEMENT_DETAILS ("Seek based on left-right arrows", - "Filter/Video", - "Seek based on navigation keys left-right", - "Jan Schmidt "); - static gboolean gst_navseek_event (GstBaseTransform * trans, GstEvent * event); static GstFlowReturn gst_navseek_transform_ip (GstBaseTransform * basetrans, GstBuffer * buf); @@ -79,7 +73,10 @@ gst_navseek_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&navseek_src_template)); - gst_element_class_set_details (element_class, &navseek_details); + gst_element_class_set_details_simple (element_class, + "Seek based on left-right arrows", "Filter/Video", + "Seek based on navigation keys left-right", + "Jan Schmidt "); } static void diff --git a/gst/debugutils/gstpushfilesrc.c b/gst/debugutils/gstpushfilesrc.c index 47daa83..185fffc 100644 --- a/gst/debugutils/gstpushfilesrc.c +++ b/gst/debugutils/gstpushfilesrc.c @@ -48,12 +48,6 @@ GST_DEBUG_CATEGORY_STATIC (pushfilesrc_debug); #define GST_CAT_DEFAULT pushfilesrc_debug -static const GstElementDetails pushfilesrc_details = -GST_ELEMENT_DETAILS ("Push File Source", - "Testing", - "Implements pushfile:// URI-handler for push-based file access", - "Tim-Philipp Müller "); - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -88,7 +82,10 @@ gst_push_file_src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&srctemplate)); - gst_element_class_set_details (element_class, &pushfilesrc_details); + gst_element_class_set_details_simple (element_class, "Push File Source", + "Testing", + "Implements pushfile:// URI-handler for push-based file access", + "Tim-Philipp Müller "); } static void diff --git a/gst/debugutils/negotiation.c b/gst/debugutils/negotiation.c index 1208227..ffd2dc8 100644 --- a/gst/debugutils/negotiation.c +++ b/gst/debugutils/negotiation.c @@ -59,14 +59,6 @@ struct _GstNegotiationClass GType gst_gst_negotiation_get_type (void); - -static const GstElementDetails plugin_details = -GST_ELEMENT_DETAILS ("Negotiation", - "Testing", - "This element acts like identity, except that one can control how " - "negotiation works", - "David A. Schleef "); - /* Filter signals and args */ enum { @@ -143,7 +135,10 @@ gst_negotiation_base_init (gpointer g_class) gst_static_pad_template_get (&gst_negotiation_sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_negotiation_src_factory)); - gst_element_class_set_details (element_class, &plugin_details); + gst_element_class_set_details_simple (element_class, "Negotiation", + "Testing", + "This element acts like identity, except that one can control how " + "negotiation works", "David A. Schleef "); } static void diff --git a/gst/debugutils/progressreport.c b/gst/debugutils/progressreport.c index 8f2547b..017f78d 100644 --- a/gst/debugutils/progressreport.c +++ b/gst/debugutils/progressreport.c @@ -96,12 +96,6 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); -static const GstElementDetails progress_report_details = -GST_ELEMENT_DETAILS ("Progress report", - "Testing", - "Periodically query and report on processing progress", - "Jan Schmidt "); - #define DEFAULT_UPDATE_FREQ 5 #define DEFAULT_SILENT FALSE #define DEFAULT_FORMAT "auto" @@ -132,7 +126,10 @@ gst_progress_report_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&progress_report_src_template)); - gst_element_class_set_details (element_class, &progress_report_details); + gst_element_class_set_details_simple (element_class, "Progress report", + "Testing", + "Periodically query and report on processing progress", + "Jan Schmidt "); } static void diff --git a/gst/debugutils/testplugin.c b/gst/debugutils/testplugin.c index f814e46..dc4e38b 100644 --- a/gst/debugutils/testplugin.c +++ b/gst/debugutils/testplugin.c @@ -80,12 +80,6 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); - -static const GstElementDetails details = GST_ELEMENT_DETAILS ("Test plugin", - "Testing", - "perform a number of tests", - "Benjamin Otte "); - #define DEBUG_INIT(bla) \ GST_DEBUG_CATEGORY_INIT (gst_test_debug, "testsink", 0, \ "debugging category for testsink element"); @@ -103,7 +97,8 @@ gst_test_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (gstelement_class, &details); + gst_element_class_set_details_simple (gstelement_class, "Test plugin", + "Testing", "perform a number of tests", "Benjamin Otte "); } static void diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c index 003d6d1..627aad1 100644 --- a/gst/flx/gstflxdec.c +++ b/gst/flx/gstflxdec.c @@ -40,13 +40,6 @@ GST_DEBUG_CATEGORY_STATIC (flxdec_debug); #define GST_CAT_DEFAULT flxdec_debug -/* flx element information */ -static const GstElementDetails flxdec_details = -GST_ELEMENT_DETAILS ("FLX video decoder", - "Codec/Decoder/Video", - "FLC/FLI/FLX video decoder", - "Sepp Wijnands , Zeeshan Ali "); - /* input */ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -114,7 +107,10 @@ gst_flxdec_base_init (GstFlxDecClass * klass) { GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (gstelement_class, &flxdec_details); + gst_element_class_set_details_simple (gstelement_class, "FLX video decoder", + "Codec/Decoder/Video", + "FLC/FLI/FLX video decoder", + "Sepp Wijnands , Zeeshan Ali "); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&sink_factory)); gst_element_class_add_pad_template (gstelement_class, diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index 4c40c1b..91c21c6 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -48,13 +48,6 @@ GST_DEBUG_CATEGORY (goom_debug); #define GST_CAT_DEFAULT goom_debug -/* elementfactory information */ -static const GstElementDetails gst_goom_details = -GST_ELEMENT_DETAILS ("GOOM: what a GOOM!", - "Visualization", - "Takes frames of data and outputs video frames using the GOOM filter", - "Wim Taymans "); - /* signals and args */ enum { @@ -131,7 +124,10 @@ gst_goom_base_init (GstGoomClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &gst_goom_details); + gst_element_class_set_details_simple (element_class, "GOOM: what a GOOM!", + "Visualization", + "Takes frames of data and outputs video frames using the GOOM filter", + "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); gst_element_class_add_pad_template (element_class, diff --git a/gst/goom2k1/gstgoom.c b/gst/goom2k1/gstgoom.c index d01a886..09ecc53 100644 --- a/gst/goom2k1/gstgoom.c +++ b/gst/goom2k1/gstgoom.c @@ -47,13 +47,6 @@ GST_DEBUG_CATEGORY_STATIC (goom_debug); #define GST_CAT_DEFAULT goom_debug -/* elementfactory information */ -static const GstElementDetails gst_goom_details = -GST_ELEMENT_DETAILS ("GOOM: what a GOOM! 2k1 edition", - "Visualization", - "Takes frames of data and outputs video frames using the GOOM 2k1 filter", - "Wim Taymans "); - /* signals and args */ enum { @@ -130,7 +123,10 @@ gst_goom_base_init (GstGoomClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &gst_goom_details); + gst_element_class_set_details_simple (element_class, + "GOOM: what a GOOM! 2k1 edition", "Visualization", + "Takes frames of data and outputs video frames using the GOOM 2k1 filter", + "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); gst_element_class_add_pad_template (element_class, diff --git a/gst/icydemux/gsticydemux.c b/gst/icydemux/gsticydemux.c index d857e2c..2700359 100644 --- a/gst/icydemux/gsticydemux.c +++ b/gst/icydemux/gsticydemux.c @@ -49,13 +49,6 @@ #include -static const GstElementDetails gst_icydemux_details = -GST_ELEMENT_DETAILS ("ICY tag demuxer", - "Codec/Demuxer/Metadata", - "Read and output ICY tags while demuxing the contents", - "Jan Schmidt \n" - "Michael Smith "); - #define ICY_TYPE_FIND_MAX_SIZE (40*1024) GST_DEBUG_CATEGORY_STATIC (icydemux_debug); @@ -126,7 +119,11 @@ gst_icydemux_base_init (GstICYDemuxClass * klass) gst_static_pad_template_get (&src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &gst_icydemux_details); + gst_element_class_set_details_simple (element_class, "ICY tag demuxer", + "Codec/Demuxer/Metadata", + "Read and output ICY tags while demuxing the contents", + "Jan Schmidt , " + "Michael Smith "); } static void diff --git a/gst/id3demux/gstid3demux.c b/gst/id3demux/gstid3demux.c index 1b0210b..f59c6c0 100644 --- a/gst/id3demux/gstid3demux.c +++ b/gst/id3demux/gstid3demux.c @@ -57,12 +57,6 @@ #include "gstid3demux.h" #include "id3tags.h" -static const GstElementDetails gst_id3demux_details = -GST_ELEMENT_DETAILS ("ID3 tag demuxer", - "Codec/Demuxer/Metadata", - "Read and output ID3v1 and ID3v2 tags while demuxing the contents", - "Jan Schmidt "); - enum { ARG_0, @@ -103,7 +97,10 @@ gst_id3demux_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &gst_id3demux_details); + gst_element_class_set_details_simple (element_class, "ID3 tag demuxer", + "Codec/Demuxer/Metadata", + "Read and output ID3v1 and ID3v2 tags while demuxing the contents", + "Jan Schmidt "); } static void diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c index 6d09c16..79c385b 100644 --- a/gst/law/mulaw-decode.c +++ b/gst/law/mulaw-decode.c @@ -178,17 +178,15 @@ static void gst_mulawdec_base_init (GstMuLawDecClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - const GstElementDetails mulawdec_details = - GST_ELEMENT_DETAILS ("Mu Law audio decoder", - "Codec/Decoder/Audio", - "Convert 8bit mu law to 16bit PCM", - "Zaheer Abbas Merali "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&mulaw_dec_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&mulaw_dec_sink_factory)); - gst_element_class_set_details (element_class, &mulawdec_details); + gst_element_class_set_details_simple (element_class, "Mu Law audio decoder", + "Codec/Decoder/Audio", + "Convert 8bit mu law to 16bit PCM", + "Zaheer Abbas Merali "); } static void diff --git a/gst/law/mulaw-encode.c b/gst/law/mulaw-encode.c index fde922b..9ee320b 100644 --- a/gst/law/mulaw-encode.c +++ b/gst/law/mulaw-encode.c @@ -178,17 +178,15 @@ static void gst_mulawenc_base_init (GstMuLawEncClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - const GstElementDetails mulawenc_details = - GST_ELEMENT_DETAILS ("Mu Law audio encoder", - "Codec/Encoder/Audio", - "Convert 16bit PCM to 8bit mu law", - "Zaheer Abbas Merali "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&mulaw_enc_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&mulaw_enc_sink_factory)); - gst_element_class_set_details (element_class, &mulawenc_details); + gst_element_class_set_details_simple (element_class, "Mu Law audio encoder", + "Codec/Encoder/Audio", + "Convert 16bit PCM to 8bit mu law", + "Zaheer Abbas Merali "); } static void diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index 1994a8c..c0bfa39 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -115,11 +115,6 @@ GST_DEBUG_CATEGORY_STATIC (level_debug); #define GST_CAT_DEFAULT level_debug -static const GstElementDetails level_details = GST_ELEMENT_DETAILS ("Level", - "Filter/Analyzer/Audio", - "RMS/Peak/Decaying Peak Level messager for audio/raw", - "Thomas Vander Stichele "); - static GstStaticPadTemplate sink_template_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -188,7 +183,10 @@ gst_level_base_init (gpointer g_class) gst_static_pad_template_get (&sink_template_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template_factory)); - gst_element_class_set_details (element_class, &level_details); + gst_element_class_set_details_simple (element_class, "Level", + "Filter/Analyzer/Audio", + "RMS/Peak/Decaying Peak Level messager for audio/raw", + "Thomas Vander Stichele "); } static void diff --git a/gst/median/gstmedian.c b/gst/median/gstmedian.c index 2da75fe..f829f22 100644 --- a/gst/median/gstmedian.c +++ b/gst/median/gstmedian.c @@ -24,13 +24,6 @@ #include "gstmedian.h" #include -/* elementfactory information */ -static const GstElementDetails median_details = -GST_ELEMENT_DETAILS ("Median effect", - "Filter/Effect/Video", - "Apply a median filter to an image", - "Wim Taymans "); - static GstStaticPadTemplate median_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -113,7 +106,10 @@ gst_median_base_init (GstMedianClass * klass) gst_static_pad_template_get (&median_sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&median_src_factory)); - gst_element_class_set_details (element_class, &median_details); + gst_element_class_set_details_simple (element_class, "Median effect", + "Filter/Effect/Video", + "Apply a median filter to an image", + "Wim Taymans "); } static void diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index 9cefea8..f29eb01 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -47,13 +47,6 @@ GST_DEBUG_CATEGORY_STATIC (monoscope_debug); #define GST_CAT_DEFAULT monoscope_debug -/* elementfactory information */ -static const GstElementDetails gst_monoscope_details = -GST_ELEMENT_DETAILS ("Monoscope", - "Visualization", - "Displays a highly stabilised waveform of audio input", - "Richard Boulton "); - #if G_BYTE_ORDER == G_BIG_ENDIAN static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -112,7 +105,10 @@ gst_monoscope_base_init (gpointer klass) gst_static_pad_template_get (&src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &gst_monoscope_details); + gst_element_class_set_details_simple (element_class, "Monoscope", + "Visualization", + "Displays a highly stabilised waveform of audio input", + "Richard Boulton "); } static void diff --git a/gst/multifile/gstmultifilesink.c b/gst/multifile/gstmultifilesink.c index be30128..1855530 100644 --- a/gst/multifile/gstmultifilesink.c +++ b/gst/multifile/gstmultifilesink.c @@ -121,12 +121,6 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_DEBUG_CATEGORY_STATIC (gst_multi_file_sink_debug); #define GST_CAT_DEFAULT gst_multi_file_sink_debug -static const GstElementDetails gst_multi_file_sink_details = -GST_ELEMENT_DETAILS ("Multi-File Sink", - "Sink/File", - "Write buffers to a sequentially named set of files", - "David Schleef "); - #define DEFAULT_LOCATION "%05d" #define DEFAULT_INDEX 0 #define DEFAULT_POST_MESSAGES FALSE @@ -188,8 +182,10 @@ gst_multi_file_sink_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (gstelement_class, - &gst_multi_file_sink_details); + gst_element_class_set_details_simple (gstelement_class, "Multi-File Sink", + "Sink/File", + "Write buffers to a sequentially named set of files", + "David Schleef "); } static void diff --git a/gst/multifile/gstmultifilesrc.c b/gst/multifile/gstmultifilesrc.c index 81945e5..60f503f 100644 --- a/gst/multifile/gstmultifilesrc.c +++ b/gst/multifile/gstmultifilesrc.c @@ -69,12 +69,6 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_DEBUG_CATEGORY_STATIC (gst_multi_file_src_debug); #define GST_CAT_DEFAULT gst_multi_file_src_debug -static const GstElementDetails gst_multi_file_src_details = -GST_ELEMENT_DETAILS ("Multi-File Source", - "Source/File", - "Read a sequentially named set of files into buffers", - "David Schleef "); - enum { ARG_0, @@ -100,7 +94,10 @@ gst_multi_file_src_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&gst_multi_file_src_pad_template)); - gst_element_class_set_details (gstelement_class, &gst_multi_file_src_details); + gst_element_class_set_details_simple (gstelement_class, "Multi-File Source", + "Source/File", + "Read a sequentially named set of files into buffers", + "David Schleef "); } static void diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c index 707c262..f711ce7 100644 --- a/gst/multipart/multipartdemux.c +++ b/gst/multipart/multipartdemux.c @@ -55,14 +55,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_multipart_demux_debug); #define GST_CAT_DEFAULT gst_multipart_demux_debug -/* elementfactory information */ -static const GstElementDetails gst_multipart_demux_details = -GST_ELEMENT_DETAILS ("Multipart demuxer", - "Codec/Demuxer", - "demux multipart streams", - "Wim Taymans , Sjoerd Simons "); - - /* signals and args */ enum { @@ -144,7 +136,10 @@ gst_multipart_demux_base_init (gpointer g_class) gst_static_pad_template_get (&multipart_demux_sink_template_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&multipart_demux_src_template_factory)); - gst_element_class_set_details (element_class, &gst_multipart_demux_details); + gst_element_class_set_details_simple (element_class, "Multipart demuxer", + "Codec/Demuxer", + "demux multipart streams", + "Wim Taymans , Sjoerd Simons "); } static void diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c index a71872e..94551af 100644 --- a/gst/multipart/multipartmux.c +++ b/gst/multipart/multipartmux.c @@ -42,13 +42,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_multipart_mux_debug); #define GST_CAT_DEFAULT gst_multipart_mux_debug -/* elementfactory information */ -static const GstElementDetails gst_multipart_mux_details = -GST_ELEMENT_DETAILS ("Multipart muxer", - "Codec/Muxer", - "mux multipart streams", - "Wim Taymans "); - #define DEFAULT_BOUNDARY "ThisRandomString" enum @@ -140,7 +133,8 @@ gst_multipart_mux_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &gst_multipart_mux_details); + gst_element_class_set_details_simple (element_class, "Multipart muxer", + "Codec/Muxer", "mux multipart streams", "Wim Taymans "); } static void diff --git a/gst/qtdemux/gstrtpxqtdepay.c b/gst/qtdemux/gstrtpxqtdepay.c index a300dbb..4d3a68d 100644 --- a/gst/qtdemux/gstrtpxqtdepay.c +++ b/gst/qtdemux/gstrtpxqtdepay.c @@ -63,13 +63,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpxqtdepay_debug); #define GST_CAT_DEFAULT (rtpxqtdepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_xqtdepay_details = -GST_ELEMENT_DETAILS ("RTP packet depayloader", - "Codec/Depayloader/Network", - "Extracts Quicktime audio/video from RTP packets", - "Wim Taymans "); - /* RtpXQTDepay signals and args */ enum { @@ -121,7 +114,10 @@ gst_rtp_xqt_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_xqt_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_xqtdepay_details); + gst_element_class_set_details_simple (element_class, "RTP packet depayloader", + "Codec/Depayloader/Network", + "Extracts Quicktime audio/video from RTP packets", + "Wim Taymans "); } static void diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 9990404..65fa278 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -337,12 +337,6 @@ static GNode *qtdemux_tree_get_child_by_type_full (GNode * node, guint32 fourcc, GstByteReader * parser); static GNode *qtdemux_tree_get_sibling_by_type (GNode * node, guint32 fourcc); -static const GstElementDetails gst_qtdemux_details = -GST_ELEMENT_DETAILS ("QuickTime demuxer", - "Codec/Demuxer", - "Demultiplex a QuickTime file into audio and video streams", - "David Schleef , Wim Taymans "); - static GstStaticPadTemplate gst_qtdemux_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -442,7 +436,10 @@ gst_qtdemux_base_init (GstQTDemuxClass * klass) gst_static_pad_template_get (&gst_qtdemux_audiosrc_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_qtdemux_subsrc_template)); - gst_element_class_set_details (element_class, &gst_qtdemux_details); + gst_element_class_set_details_simple (element_class, "QuickTime demuxer", + "Codec/Demuxer", + "Demultiplex a QuickTime file into audio and video streams", + "David Schleef , Wim Taymans "); GST_DEBUG_CATEGORY_INIT (qtdemux_debug, "qtdemux", 0, "qtdemux plugin"); } diff --git a/gst/replaygain/gstrganalysis.c b/gst/replaygain/gstrganalysis.c index dbae1cd..a462c34 100644 --- a/gst/replaygain/gstrganalysis.c +++ b/gst/replaygain/gstrganalysis.c @@ -86,13 +86,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_rg_analysis_debug); #define GST_CAT_DEFAULT gst_rg_analysis_debug -static const GstElementDetails rganalysis_details = { - "ReplayGain analysis", - "Filter/Analyzer/Audio", - "Perform the ReplayGain analysis", - "Ren\xc3\xa9 Stadler " -}; - /* Default property value. */ #define FORCED_DEFAULT TRUE #define DEFAULT_MESSAGE FALSE @@ -166,7 +159,10 @@ gst_rg_analysis_base_init (gpointer g_class) gst_static_pad_template_get (&src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &rganalysis_details); + gst_element_class_set_details_simple (element_class, "ReplayGain analysis", + "Filter/Analyzer/Audio", + "Perform the ReplayGain analysis", + "Ren\xc3\xa9 Stadler "); GST_DEBUG_CATEGORY_INIT (gst_rg_analysis_debug, "rganalysis", 0, "ReplayGain analysis element"); diff --git a/gst/replaygain/gstrglimiter.c b/gst/replaygain/gstrglimiter.c index 7f29ed7..97b1523 100644 --- a/gst/replaygain/gstrglimiter.c +++ b/gst/replaygain/gstrglimiter.c @@ -78,13 +78,6 @@ static void gst_rg_limiter_get_property (GObject * object, guint prop_id, static GstFlowReturn gst_rg_limiter_transform_ip (GstBaseTransform * base, GstBuffer * buf); -static const GstElementDetails element_details = { - "ReplayGain limiter", - "Filter/Effect/Audio", - "Apply signal compression to raw audio data", - "Ren\xc3\xa9 Stadler " -}; - static void gst_rg_limiter_base_init (gpointer g_class) { @@ -94,7 +87,10 @@ gst_rg_limiter_base_init (gpointer g_class) gst_static_pad_template_get (&src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "ReplayGain limiter", + "Filter/Effect/Audio", + "Apply signal compression to raw audio data", + "Ren\xc3\xa9 Stadler "); GST_DEBUG_CATEGORY_INIT (gst_rg_limiter_debug, "rglimiter", 0, "ReplayGain limiter element"); diff --git a/gst/replaygain/gstrgvolume.c b/gst/replaygain/gstrgvolume.c index 06359de..72d9ae7 100644 --- a/gst/replaygain/gstrgvolume.c +++ b/gst/replaygain/gstrgvolume.c @@ -143,18 +143,14 @@ gst_rg_volume_base_init (gpointer g_class) { GstElementClass *element_class = g_class; - static const GstElementDetails element_details = { - "ReplayGain volume", - "Filter/Effect/Audio", - "Apply ReplayGain volume adjustment", - "Ren\xc3\xa9 Stadler " - }; - gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "ReplayGain volume", + "Filter/Effect/Audio", + "Apply ReplayGain volume adjustment", + "Ren\xc3\xa9 Stadler "); GST_DEBUG_CATEGORY_INIT (gst_rg_volume_debug, "rgvolume", 0, "ReplayGain volume element"); diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c index d98c556..a1ad4de 100644 --- a/gst/rtp/gstasteriskh263.c +++ b/gst/rtp/gstasteriskh263.c @@ -47,13 +47,6 @@ typedef struct _GstAsteriskH263Header #define GST_ASTERISKH263_HEADER_TIMESTAMP(buf) (((GstAsteriskH263Header *)(GST_BUFFER_DATA (buf)))->timestamp) #define GST_ASTERISKH263_HEADER_LENGTH(buf) (((GstAsteriskH263Header *)(GST_BUFFER_DATA (buf)))->length) -/* elementfactory information */ -static const GstElementDetails gst_rtp_h263p_depaydetails = -GST_ELEMENT_DETAILS ("RTP Asterisk H263 depayloader", - "Codec/Depayloader/Network", - "Extracts H263 video from RTP and encodes in Asterisk H263 format", - "Neil Stratford "); - static GstStaticPadTemplate gst_asteriskh263_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -91,7 +84,10 @@ gst_asteriskh263_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_asteriskh263_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_h263p_depaydetails); + gst_element_class_set_details_simple (element_class, + "RTP Asterisk H263 depayloader", "Codec/Depayloader/Network", + "Extracts H263 video from RTP and encodes in Asterisk H263 format", + "Neil Stratford "); } static void diff --git a/gst/rtp/gstrtpL16depay.c b/gst/rtp/gstrtpL16depay.c index ceb966d..619f3ef 100644 --- a/gst/rtp/gstrtpL16depay.c +++ b/gst/rtp/gstrtpL16depay.c @@ -33,13 +33,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpL16depay_debug); #define GST_CAT_DEFAULT (rtpL16depay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_L16_depay_details = -GST_ELEMENT_DETAILS ("RTP audio depayloader", - "Codec/Depayloader/Network", - "Extracts raw audio from RTP packets", - "Zeeshan Ali ," "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_L16_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -92,7 +85,10 @@ gst_rtp_L16_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_L16_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_L16_depay_details); + gst_element_class_set_details_simple (element_class, "RTP audio depayloader", + "Codec/Depayloader/Network", + "Extracts raw audio from RTP packets", + "Zeeshan Ali ," "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpL16pay.c b/gst/rtp/gstrtpL16pay.c index 1af2337..6d5ab35 100644 --- a/gst/rtp/gstrtpL16pay.c +++ b/gst/rtp/gstrtpL16pay.c @@ -33,13 +33,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpL16pay_debug); #define GST_CAT_DEFAULT (rtpL16pay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_L16_pay_details = -GST_ELEMENT_DETAILS ("RTP audio payloader", - "Codec/Payloader/Network", - "Payload-encode Raw audio into RTP packets (RFC 3551)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_L16_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -92,7 +85,10 @@ gst_rtp_L16_pay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_L16_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_L16_pay_details); + gst_element_class_set_details_simple (element_class, "RTP audio payloader", + "Codec/Payloader/Network", + "Payload-encode Raw audio into RTP packets (RFC 3551)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpac3depay.c b/gst/rtp/gstrtpac3depay.c index 2e1a58d..c1136c1 100644 --- a/gst/rtp/gstrtpac3depay.c +++ b/gst/rtp/gstrtpac3depay.c @@ -29,13 +29,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpac3depay_debug); #define GST_CAT_DEFAULT (rtpac3depay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_ac3depay_details = -GST_ELEMENT_DETAILS ("RTP AC3 depayloader", - "Codec/Depayloader/Network", - "Extracts AC3 audio from RTP packets (RFC 4184)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_ac3_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -72,7 +65,10 @@ gst_rtp_ac3_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_ac3_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_ac3depay_details); + gst_element_class_set_details_simple (element_class, "RTP AC3 depayloader", + "Codec/Depayloader/Network", + "Extracts AC3 audio from RTP packets (RFC 4184)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c index ab217d9..23a186b 100644 --- a/gst/rtp/gstrtpamrdepay.c +++ b/gst/rtp/gstrtpamrdepay.c @@ -37,13 +37,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpamrdepay_debug); * Wideband (AMR-WB) Audio Codecs. */ -/* elementfactory information */ -static const GstElementDetails gst_rtp_amrdepay_details = -GST_ELEMENT_DETAILS ("RTP AMR depayloader", - "Codec/Depayloader/Network", - "Extracts AMR or AMR-WB audio from RTP packets (RFC 3267)", - "Wim Taymans "); - /* RtpAMRDepay signals and args */ enum { @@ -131,7 +124,10 @@ gst_rtp_amr_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_amr_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_amrdepay_details); + gst_element_class_set_details_simple (element_class, "RTP AMR depayloader", + "Codec/Depayloader/Network", + "Extracts AMR or AMR-WB audio from RTP packets (RFC 3267)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpamrpay.c b/gst/rtp/gstrtpamrpay.c index 80c3077..5c6bf23 100644 --- a/gst/rtp/gstrtpamrpay.c +++ b/gst/rtp/gstrtpamrpay.c @@ -43,13 +43,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpamrpay_debug); * (3GPP TS 26.201 version 6.0.0 Release 6) */ -/* elementfactory information */ -static const GstElementDetails gst_rtp_amrpay_details = -GST_ELEMENT_DETAILS ("RTP AMR payloader", - "Codec/Payloader/Network", - "Payload-encode AMR or AMR-WB audio into RTP packets (RFC 3267)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_amr_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -110,7 +103,10 @@ gst_rtp_amr_pay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_amr_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_amrpay_details); + gst_element_class_set_details_simple (element_class, "RTP AMR payloader", + "Codec/Payloader/Network", + "Payload-encode AMR or AMR-WB audio into RTP packets (RFC 3267)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpbvdepay.c b/gst/rtp/gstrtpbvdepay.c index f605569..f398394 100644 --- a/gst/rtp/gstrtpbvdepay.c +++ b/gst/rtp/gstrtpbvdepay.c @@ -27,13 +27,6 @@ #include #include "gstrtpbvdepay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_bv_depay_details = -GST_ELEMENT_DETAILS ("RTP BroadcomVoice depayloader", - "Codec/Depayloader/Network", - "Extracts BroadcomVoice audio from RTP packets (RFC 4298)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_bv_depay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -73,7 +66,10 @@ gst_rtp_bv_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_bv_depay_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_bv_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_bv_depay_details); + gst_element_class_set_details_simple (element_class, + "RTP BroadcomVoice depayloader", "Codec/Depayloader/Network", + "Extracts BroadcomVoice audio from RTP packets (RFC 4298)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpbvpay.c b/gst/rtp/gstrtpbvpay.c index 3242cbe..1ea343a 100644 --- a/gst/rtp/gstrtpbvpay.c +++ b/gst/rtp/gstrtpbvpay.c @@ -27,14 +27,6 @@ #include #include "gstrtpbvpay.h" -/* elementfactory information */ -static GstElementDetails gst_rtp_bv_pay_details = { - "RTP BV Payloader", - "Codec/Payloader/Network", - "Packetize BroadcomVoice audio streams into RTP packets (RFC 4298)", - "Wim Taymans " -}; - GST_DEBUG_CATEGORY_STATIC (rtpbvpay_debug); #define GST_CAT_DEFAULT (rtpbvpay_debug) @@ -78,7 +70,10 @@ gst_rtp_bv_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_bv_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_bv_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_bv_pay_details); + gst_element_class_set_details_simple (element_class, "RTP BV Payloader", + "Codec/Payloader/Network", + "Packetize BroadcomVoice audio streams into RTP packets (RFC 4298)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpceltdepay.c b/gst/rtp/gstrtpceltdepay.c index cdd97bb..0bf387b 100644 --- a/gst/rtp/gstrtpceltdepay.c +++ b/gst/rtp/gstrtpceltdepay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpceltdepay_debug); #define GST_CAT_DEFAULT (rtpceltdepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_celtdepay_details = -GST_ELEMENT_DETAILS ("RTP CELT depayloader", - "Codec/Depayloader/Network", - "Extracts CELT audio from RTP packets", - "Wim Taymans "); - /* RtpCELTDepay signals and args */ #define DEFAULT_FRAMESIZE 480 @@ -89,7 +82,10 @@ gst_rtp_celt_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_celt_depay_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_celt_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_celtdepay_details); + gst_element_class_set_details_simple (element_class, "RTP CELT depayloader", + "Codec/Depayloader/Network", + "Extracts CELT audio from RTP packets", + "Wim Taymans "); GST_DEBUG_CATEGORY_INIT (rtpceltdepay_debug, "rtpceltdepay", 0, "CELT RTP Depayloader"); diff --git a/gst/rtp/gstrtpceltpay.c b/gst/rtp/gstrtpceltpay.c index f333369..2f1d155 100644 --- a/gst/rtp/gstrtpceltpay.c +++ b/gst/rtp/gstrtpceltpay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpceltpay_debug); #define GST_CAT_DEFAULT (rtpceltpay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_celt_pay_details = -GST_ELEMENT_DETAILS ("RTP CELT payloader", - "Codec/Payloader/Network", - "Payload-encodes CELT audio into a RTP packet", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_celt_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -81,7 +74,10 @@ gst_rtp_celt_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_celt_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_celt_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_celt_pay_details); + gst_element_class_set_details_simple (element_class, "RTP CELT payloader", + "Codec/Payloader/Network", + "Payload-encodes CELT audio into a RTP packet", + "Wim Taymans "); GST_DEBUG_CATEGORY_INIT (rtpceltpay_debug, "rtpceltpay", 0, "CELT RTP Payloader"); diff --git a/gst/rtp/gstrtpdepay.c b/gst/rtp/gstrtpdepay.c index 22e94fb..b037efd 100644 --- a/gst/rtp/gstrtpdepay.c +++ b/gst/rtp/gstrtpdepay.c @@ -23,13 +23,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpdepay_debug); #define GST_CAT_DEFAULT (rtpdepay_debug) -/* elementfactory information */ -static const GstElementDetails rtpdepay_details = -GST_ELEMENT_DETAILS ("Dummy RTP session manager", - "Codec/Depayloader/Network", - "Accepts raw RTP and RTCP packets and sends them forward", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_depay_src_rtp_template = GST_STATIC_PAD_TEMPLATE ("srcrtp", GST_PAD_SRC, @@ -78,7 +71,10 @@ gst_rtp_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_depay_sink_rtp_template)); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&gst_rtp_depay_sink_rtcp_template)); - gst_element_class_set_details (gstelement_class, &rtpdepay_details); + gst_element_class_set_details_simple (gstelement_class, + "Dummy RTP session manager", "Codec/Depayloader/Network", + "Accepts raw RTP and RTCP packets and sends them forward", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpdvdepay.c b/gst/rtp/gstrtpdvdepay.c index 50b1a41..ca190fa 100644 --- a/gst/rtp/gstrtpdvdepay.c +++ b/gst/rtp/gstrtpdvdepay.c @@ -85,12 +85,6 @@ GST_BOILERPLATE (GstRTPDVDepay, gst_rtp_dv_depay, GstBaseRTPDepayload, static void gst_rtp_dv_depay_base_init (gpointer g_class) { - static GstElementDetails plugin_details = { - "RTP DV Depayloader", - "Codec/Depayloader/Network", - "Depayloads DV from RTP packets (RFC 3189)", - "Marcel Moreaux , Wim Taymans " - }; GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -98,7 +92,10 @@ GST_BOILERPLATE (GstRTPDVDepay, gst_rtp_dv_depay, GstBaseRTPDepayload, gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &plugin_details); + gst_element_class_set_details_simple (element_class, "RTP DV Depayloader", + "Codec/Depayloader/Network", + "Depayloads DV from RTP packets (RFC 3189)", + "Marcel Moreaux , Wim Taymans "); } /* initialize the plugin's class */ diff --git a/gst/rtp/gstrtpdvpay.c b/gst/rtp/gstrtpdvpay.c index 166240c..08f78eb 100644 --- a/gst/rtp/gstrtpdvpay.c +++ b/gst/rtp/gstrtpdvpay.c @@ -31,14 +31,6 @@ GST_DEBUG_CATEGORY (rtpdvpay_debug); #define GST_CAT_DEFAULT (rtpdvpay_debug) -/* Elementfactory information */ -static GstElementDetails gst_rtp_dv_pay_details = { - "RTP DV Payloader", - "Codec/Payloader/Network", - "Payloads DV into RTP packets (RFC 3189)", - "Marcel Moreaux , Wim Taymans " -}; - #define DEFAULT_MODE GST_DV_PAY_MODE_VIDEO enum { @@ -113,7 +105,10 @@ GST_BOILERPLATE (GstRTPDVPay, gst_rtp_dv_pay, GstBaseRTPPayload, gst_static_pad_template_get (&gst_rtp_dv_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_dv_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_dv_pay_details); + gst_element_class_set_details_simple (element_class, "RTP DV Payloader", + "Codec/Payloader/Network", + "Payloads DV into RTP packets (RFC 3189)", + "Marcel Moreaux , Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpg723depay.c b/gst/rtp/gstrtpg723depay.c index a7e81c7..38215d4 100644 --- a/gst/rtp/gstrtpg723depay.c +++ b/gst/rtp/gstrtpg723depay.c @@ -37,13 +37,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpg723depay_debug); * RFC 3551 (4.5.3) */ -/* elementfactory information */ -static const GstElementDetails gst_rtp_g723depay_details = -GST_ELEMENT_DETAILS ("RTP G.723 depayloader", - "Codec/Depayloader/Network", - "Extracts G.723 audio from RTP packets (RFC 3551)", - "Wim Taymans "); - enum { /* FILL ME */ @@ -98,7 +91,10 @@ gst_rtp_g723_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_g723_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_g723depay_details); + gst_element_class_set_details_simple (element_class, "RTP G.723 depayloader", + "Codec/Depayloader/Network", + "Extracts G.723 audio from RTP packets (RFC 3551)", + "Wim Taymans "); GST_DEBUG_CATEGORY_INIT (rtpg723depay_debug, "rtpg723depay", 0, "G.723 RTP Depayloader"); diff --git a/gst/rtp/gstrtpg723pay.c b/gst/rtp/gstrtpg723pay.c index 00599ba..948a8fa 100644 --- a/gst/rtp/gstrtpg723pay.c +++ b/gst/rtp/gstrtpg723pay.c @@ -39,12 +39,6 @@ static gboolean gst_rtp_g723_pay_set_caps (GstBaseRTPPayload * payload, static GstFlowReturn gst_rtp_g723_pay_handle_buffer (GstBaseRTPPayload * payload, GstBuffer * buf); -static const GstElementDetails gst_rtp_g723_pay_details = -GST_ELEMENT_DETAILS ("RTP G.723 payloader", - "Codec/Payloader/Network", - "Packetize G.723 audio into RTP packets", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_g723_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -85,7 +79,10 @@ gst_rtp_g723_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_g723_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_g723_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_g723_pay_details); + gst_element_class_set_details_simple (element_class, "RTP G.723 payloader", + "Codec/Payloader/Network", + "Packetize G.723 audio into RTP packets", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpg726depay.c b/gst/rtp/gstrtpg726depay.c index 495292c..5f70bc3 100644 --- a/gst/rtp/gstrtpg726depay.c +++ b/gst/rtp/gstrtpg726depay.c @@ -38,13 +38,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpg726depay_debug); #define SAMPLE_RATE 8000 #define LAYOUT_G726 "g726" -/* elementfactory information */ -static const GstElementDetails gst_rtp_g726depay_details = -GST_ELEMENT_DETAILS ("RTP G.726 depayloader", - "Codec/Depayloader/Network", - "Extracts G.726 audio from RTP packets", - "Axis Communications "); - /* RtpG726Depay signals and args */ enum { @@ -106,7 +99,10 @@ gst_rtp_g726_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_g726_depay_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_g726_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_g726depay_details); + gst_element_class_set_details_simple (element_class, "RTP G.726 depayloader", + "Codec/Depayloader/Network", + "Extracts G.726 audio from RTP packets", + "Axis Communications "); } static void diff --git a/gst/rtp/gstrtpg726pay.c b/gst/rtp/gstrtpg726pay.c index 724618f..bd1cb99 100644 --- a/gst/rtp/gstrtpg726pay.c +++ b/gst/rtp/gstrtpg726pay.c @@ -42,12 +42,6 @@ enum PROP_LAST }; -static const GstElementDetails gst_rtp_g726_pay_details = -GST_ELEMENT_DETAILS ("RTP G.726 payloader", - "Codec/Payloader/Network", - "Payload-encodes G.726 audio into a RTP packet", - "Axis Communications "); - static GstStaticPadTemplate gst_rtp_g726_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -93,7 +87,10 @@ gst_rtp_g726_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_g726_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_g726_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_g726_pay_details); + gst_element_class_set_details_simple (element_class, "RTP G.726 payloader", + "Codec/Payloader/Network", + "Payload-encodes G.726 audio into a RTP packet", + "Axis Communications "); } static void diff --git a/gst/rtp/gstrtpg729depay.c b/gst/rtp/gstrtpg729depay.c index 85eb792..6b76a6b 100644 --- a/gst/rtp/gstrtpg729depay.c +++ b/gst/rtp/gstrtpg729depay.c @@ -35,13 +35,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpg729depay_debug); * RFC 3551 (4.5.6) */ -/* elementfactory information */ -static const GstElementDetails gst_rtp_g729depay_details = -GST_ELEMENT_DETAILS ("RTP G.729 depayloader", - "Codec/Depayloader/Network", - "Extracts G.729 audio from RTP packets (RFC 3551)", - "Laurent Glayal "); - enum { /* FILL ME */ @@ -96,7 +89,10 @@ gst_rtp_g729_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_g729_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_g729depay_details); + gst_element_class_set_details_simple (element_class, "RTP G.729 depayloader", + "Codec/Depayloader/Network", + "Extracts G.729 audio from RTP packets (RFC 3551)", + "Laurent Glayal "); GST_DEBUG_CATEGORY_INIT (rtpg729depay_debug, "rtpg729depay", 0, "G.729 RTP Depayloader"); diff --git a/gst/rtp/gstrtpg729pay.c b/gst/rtp/gstrtpg729pay.c index 0e84f1d..db4d171 100644 --- a/gst/rtp/gstrtpg729pay.c +++ b/gst/rtp/gstrtpg729pay.c @@ -48,13 +48,6 @@ gst_rtp_g729_pay_set_caps (GstBaseRTPPayload * payload, GstCaps * caps); static GstFlowReturn gst_rtp_g729_pay_handle_buffer (GstBaseRTPPayload * payload, GstBuffer * buf); - -static const GstElementDetails gst_rtp_g729_pay_details = -GST_ELEMENT_DETAILS ("RTP G.729 payloader", - "Codec/Payloader/Network", - "Packetize G.729 audio into RTP packets", - "Olivier Crete "); - static GstStaticPadTemplate gst_rtp_g729_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -90,7 +83,10 @@ gst_rtp_g729_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_g729_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_g729_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_g729_pay_details); + gst_element_class_set_details_simple (element_class, "RTP G.729 payloader", + "Codec/Payloader/Network", + "Packetize G.729 audio into RTP packets", + "Olivier Crete "); GST_DEBUG_CATEGORY_INIT (rtpg729pay_debug, "rtpg729pay", 0, "G.729 RTP Payloader"); diff --git a/gst/rtp/gstrtpgsmdepay.c b/gst/rtp/gstrtpgsmdepay.c index f598316..261bc0d 100644 --- a/gst/rtp/gstrtpgsmdepay.c +++ b/gst/rtp/gstrtpgsmdepay.c @@ -29,14 +29,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpgsmdepay_debug); #define GST_CAT_DEFAULT (rtpgsmdepay_debug) -/* elementfactory information */ -static GstElementDetails gst_rtp_gsmdepay_details = { - "RTP GSM depayloader", - "Codec/Depayloader/Network", - "Extracts GSM audio from RTP packets", - "Zeeshan Ali " -}; - /* RTPGSMDepay signals and args */ enum { @@ -82,7 +74,9 @@ gst_rtp_gsm_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_gsm_depay_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_gsm_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_gsmdepay_details); + gst_element_class_set_details_simple (element_class, "RTP GSM depayloader", + "Codec/Depayloader/Network", + "Extracts GSM audio from RTP packets", "Zeeshan Ali "); } static void diff --git a/gst/rtp/gstrtpgsmpay.c b/gst/rtp/gstrtpgsmpay.c index 21242bf..a7dd805 100644 --- a/gst/rtp/gstrtpgsmpay.c +++ b/gst/rtp/gstrtpgsmpay.c @@ -31,13 +31,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpgsmpay_debug); #define GST_CAT_DEFAULT (rtpgsmpay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_gsm_pay_details = -GST_ELEMENT_DETAILS ("RTP GSM payloader", - "Codec/Payloader/Network", - "Payload-encodes GSM audio into a RTP packet", - "Zeeshan Ali "); - static GstStaticPadTemplate gst_rtp_gsm_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -76,7 +69,10 @@ gst_rtp_gsm_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_gsm_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_gsm_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_gsm_pay_details); + gst_element_class_set_details_simple (element_class, "RTP GSM payloader", + "Codec/Payloader/Network", + "Payload-encodes GSM audio into a RTP packet", + "Zeeshan Ali "); } static void diff --git a/gst/rtp/gstrtph263depay.c b/gst/rtp/gstrtph263depay.c index 489a5d0..b6a7deb 100644 --- a/gst/rtp/gstrtph263depay.c +++ b/gst/rtp/gstrtph263depay.c @@ -35,14 +35,6 @@ GST_DEBUG_CATEGORY_STATIC (rtph263depay_debug); #define GST_CAT_DEFAULT (rtph263depay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_h263depay_details = -GST_ELEMENT_DETAILS ("RTP H263 depayloader", - "Codec/Depayloader/Network", - "Extracts H263 video from RTP packets (RFC 2190)", - "Philippe Kalaf , " - "Edward Hervey "); - #define GST_RFC2190A_HEADER_LEN 4 #define GST_RFC2190B_HEADER_LEN 8 #define GST_RFC2190C_HEADER_LEN 12 @@ -92,7 +84,11 @@ gst_rtp_h263_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_h263_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_h263depay_details); + gst_element_class_set_details_simple (element_class, "RTP H263 depayloader", + "Codec/Depayloader/Network", + "Extracts H263 video from RTP packets (RFC 2190)", + "Philippe Kalaf , " + "Edward Hervey "); } static void diff --git a/gst/rtp/gstrtph263pay.c b/gst/rtp/gstrtph263pay.c index 998800f..fd10d98 100644 --- a/gst/rtp/gstrtph263pay.c +++ b/gst/rtp/gstrtph263pay.c @@ -345,14 +345,6 @@ enum PROP_MODE_A_ONLY }; -/* elementfactory information */ -static const GstElementDetails gst_rtp_h263pay_details = -GST_ELEMENT_DETAILS ("RTP H263 packet payloader", - "Codec/Payloader/Network", - "Payload-encodes H263 video in RTP packets (RFC 2190)", - "Neil Stratford " - "Dejan Sakelsak "); - static GstStaticPadTemplate gst_rtp_h263_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -415,7 +407,11 @@ GST_BOILERPLATE (GstRtpH263Pay, gst_rtp_h263_pay, GstBaseRTPPayload, gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_h263_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_h263pay_details); + gst_element_class_set_details_simple (element_class, + "RTP H263 packet payloader", "Codec/Payloader/Network", + "Payload-encodes H263 video in RTP packets (RFC 2190)", + "Neil Stratford " + "Dejan Sakelsak "); } static void @@ -894,8 +890,9 @@ gst_rtp_h263_pay_move_window_right (GstRtpH263PayContext * context, guint n, } else { if (n > rest_bits) { context->window = - (context->window << rest_bits) | (*context-> - win_end & (((guint) pow (2.0, (double) rest_bits)) - 1)); + (context-> + window << rest_bits) | (*context->win_end & (((guint) pow (2.0, + (double) rest_bits)) - 1)); n -= rest_bits; rest_bits = 0; } else { @@ -1656,8 +1653,8 @@ gst_rtp_h263_pay_flush (GstRtpH263Pay * rtph263pay) gst_rtp_h263_pay_boundry_init (&bound, NULL, rtph263pay->data - 1, 0, 0); context->gobs = - (GstRtpH263PayGob **) g_malloc0 (format_props[context->piclayer-> - ptype_srcformat][0] * sizeof (GstRtpH263PayGob *)); + (GstRtpH263PayGob **) g_malloc0 (format_props[context-> + piclayer->ptype_srcformat][0] * sizeof (GstRtpH263PayGob *)); for (i = 0; i < format_props[context->piclayer->ptype_srcformat][0]; i++) { diff --git a/gst/rtp/gstrtph263pdepay.c b/gst/rtp/gstrtph263pdepay.c index e6652007..6017622 100644 --- a/gst/rtp/gstrtph263pdepay.c +++ b/gst/rtp/gstrtph263pdepay.c @@ -26,13 +26,6 @@ #include #include "gstrtph263pdepay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_h263pdepay_details = -GST_ELEMENT_DETAILS ("RTP H263 depayloader", - "Codec/Depayloader/Network", - "Extracts H263/+/++ video from RTP packets (RFC 4629)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_h263p_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -107,7 +100,10 @@ gst_rtp_h263p_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_h263p_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_h263pdepay_details); + gst_element_class_set_details_simple (element_class, "RTP H263 depayloader", + "Codec/Depayloader/Network", + "Extracts H263/+/++ video from RTP packets (RFC 4629)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtph263ppay.c b/gst/rtp/gstrtph263ppay.c index 6049cb3..76bf923 100644 --- a/gst/rtp/gstrtph263ppay.c +++ b/gst/rtp/gstrtph263ppay.c @@ -57,13 +57,6 @@ gst_fragmentation_mode_get_type (void) GST_DEBUG_CATEGORY_STATIC (rtph263ppay_debug); #define GST_CAT_DEFAULT rtph263ppay_debug -/* elementfactory information */ -static const GstElementDetails gst_rtp_h263ppay_details = -GST_ELEMENT_DETAILS ("RTP H263 payloader", - "Codec/Payloader/Network", - "Payload-encodes H263/+/++ video in RTP packets (RFC 4629)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_h263p_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -110,7 +103,10 @@ gst_rtp_h263p_pay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_h263p_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_h263ppay_details); + gst_element_class_set_details_simple (element_class, "RTP H263 payloader", + "Codec/Payloader/Network", + "Payload-encodes H263/+/++ video in RTP packets (RFC 4629)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtph264depay.c b/gst/rtp/gstrtph264depay.c index 2ff281f..be88f29 100644 --- a/gst/rtp/gstrtph264depay.c +++ b/gst/rtp/gstrtph264depay.c @@ -45,13 +45,6 @@ enum /* 3 zero bytes syncword */ static const guint8 sync_bytes[] = { 0, 0, 0, 1 }; -/* elementfactory information */ -static const GstElementDetails gst_rtp_h264depay_details = -GST_ELEMENT_DETAILS ("RTP H264 depayloader", - "Codec/Depayloader/Network", - "Extracts H264 video from RTP packets (RFC 3984)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_h264_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -113,7 +106,10 @@ gst_rtp_h264_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_h264_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_h264depay_details); + gst_element_class_set_details_simple (element_class, "RTP H264 depayloader", + "Codec/Depayloader/Network", + "Extracts H264 video from RTP packets (RFC 3984)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtph264pay.c b/gst/rtp/gstrtph264pay.c index fbb7132..5ea9c98 100644 --- a/gst/rtp/gstrtph264pay.c +++ b/gst/rtp/gstrtph264pay.c @@ -42,13 +42,6 @@ GST_DEBUG_CATEGORY_STATIC (rtph264pay_debug); * RFC 3984 */ -/* elementfactory information */ -static const GstElementDetails gst_rtp_h264pay_details = -GST_ELEMENT_DETAILS ("RTP H264 payloader", - "Codec/Payloader/Network", - "Payload-encode H264 video into RTP packets (RFC 3984)", - "Laurent Glayal "); - static GstStaticPadTemplate gst_rtp_h264_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -133,7 +126,10 @@ gst_rtp_h264_pay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_h264_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_h264pay_details); + gst_element_class_set_details_simple (element_class, "RTP H264 payloader", + "Codec/Payloader/Network", + "Payload-encode H264 video into RTP packets (RFC 3984)", + "Laurent Glayal "); } static void diff --git a/gst/rtp/gstrtpilbcdepay.c b/gst/rtp/gstrtpilbcdepay.c index 3f1d716..624464c 100644 --- a/gst/rtp/gstrtpilbcdepay.c +++ b/gst/rtp/gstrtpilbcdepay.c @@ -26,13 +26,6 @@ #include #include "gstrtpilbcdepay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_ilbc_depay_details = -GST_ELEMENT_DETAILS ("RTP iLBC depayloader", - "Codec/Depayloader/Network", - "Extracts iLBC audio from RTP packets (RFC 3952)", - "Philippe Kalaf "); - /* RtpiLBCDepay signals and args */ enum { @@ -107,7 +100,10 @@ gst_rtp_ilbc_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_ilbc_depay_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_ilbc_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_ilbc_depay_details); + gst_element_class_set_details_simple (element_class, "RTP iLBC depayloader", + "Codec/Depayloader/Network", + "Extracts iLBC audio from RTP packets (RFC 3952)", + "Philippe Kalaf "); } static void diff --git a/gst/rtp/gstrtpilbcpay.c b/gst/rtp/gstrtpilbcpay.c index 004a82c..c9381a4 100644 --- a/gst/rtp/gstrtpilbcpay.c +++ b/gst/rtp/gstrtpilbcpay.c @@ -25,14 +25,6 @@ #include #include "gstrtpilbcpay.h" -/* elementfactory information */ -static GstElementDetails gst_rtp_ilbc_pay_details = { - "RTP iLBC Payloader", - "Codec/Payloader/Network", - "Packetize iLBC audio streams into RTP packets", - "Philippe Kalaf " -}; - GST_DEBUG_CATEGORY_STATIC (rtpilbcpay_debug); #define GST_CAT_DEFAULT (rtpilbcpay_debug) @@ -73,7 +65,10 @@ gst_rtp_ilbc_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_ilbc_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_ilbc_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_ilbc_pay_details); + gst_element_class_set_details_simple (element_class, "RTP iLBC Payloader", + "Codec/Payloader/Network", + "Packetize iLBC audio streams into RTP packets", + "Philippe Kalaf "); } static void diff --git a/gst/rtp/gstrtpj2kdepay.c b/gst/rtp/gstrtpj2kdepay.c index 59904a5..83ccd9c 100644 --- a/gst/rtp/gstrtpj2kdepay.c +++ b/gst/rtp/gstrtpj2kdepay.c @@ -29,13 +29,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpj2kdepay_debug); #define GST_CAT_DEFAULT (rtpj2kdepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_j2kdepay_details = -GST_ELEMENT_DETAILS ("RTP JPEG 2000 depayloader", - "Codec/Depayloader/Network", - "Extracts JPEG 2000 video from RTP packets (RFC 5371)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_j2k_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -77,7 +70,10 @@ gst_rtp_j2k_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_j2k_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_j2kdepay_details); + gst_element_class_set_details_simple (element_class, + "RTP JPEG 2000 depayloader", "Codec/Depayloader/Network", + "Extracts JPEG 2000 video from RTP packets (RFC 5371)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpj2kpay.c b/gst/rtp/gstrtpj2kpay.c index 882ebef..095b2ee 100644 --- a/gst/rtp/gstrtpj2kpay.c +++ b/gst/rtp/gstrtpj2kpay.c @@ -37,13 +37,6 @@ #include "gstrtpj2kpay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_j2k_pay_details = -GST_ELEMENT_DETAILS ("RTP JPEG 2000 payloader", - "Codec/Payloader/Network", - "Payload-encodes JPEG 2000 pictures into RTP packets (RFC 5371)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_j2k_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -147,7 +140,10 @@ gst_rtp_j2k_pay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_j2k_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_j2k_pay_details); + gst_element_class_set_details_simple (element_class, + "RTP JPEG 2000 payloader", "Codec/Payloader/Network", + "Payload-encodes JPEG 2000 pictures into RTP packets (RFC 5371)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpjpegdepay.c b/gst/rtp/gstrtpjpegdepay.c index 87c7158..8c45a16 100644 --- a/gst/rtp/gstrtpjpegdepay.c +++ b/gst/rtp/gstrtpjpegdepay.c @@ -32,13 +32,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpjpegdepay_debug); #define GST_CAT_DEFAULT (rtpjpegdepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_jpegdepay_details = -GST_ELEMENT_DETAILS ("RTP JPEG depayloader", - "Codec/Depayloader/Network", - "Extracts JPEG video from RTP packets (RFC 2435)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_jpeg_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -93,7 +86,10 @@ gst_rtp_jpeg_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_jpeg_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_jpegdepay_details); + gst_element_class_set_details_simple (element_class, "RTP JPEG depayloader", + "Codec/Depayloader/Network", + "Extracts JPEG video from RTP packets (RFC 2435)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpjpegpay.c b/gst/rtp/gstrtpjpegpay.c index f6d0eba..b313f3f 100644 --- a/gst/rtp/gstrtpjpegpay.c +++ b/gst/rtp/gstrtpjpegpay.c @@ -41,13 +41,6 @@ #include "gstrtpjpegpay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_jpeg_pay_details = -GST_ELEMENT_DETAILS ("RTP JPEG payloader", - "Codec/Payloader/Network", - "Payload-encodes JPEG pictures into RTP packets (RFC 2435)", - "Axis Communications "); - static GstStaticPadTemplate gst_rtp_jpeg_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -223,7 +216,10 @@ gst_rtp_jpeg_pay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_jpeg_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_jpeg_pay_details); + gst_element_class_set_details_simple (element_class, "RTP JPEG payloader", + "Codec/Payloader/Network", + "Payload-encodes JPEG pictures into RTP packets (RFC 2435)", + "Axis Communications "); } static void diff --git a/gst/rtp/gstrtpmp1sdepay.c b/gst/rtp/gstrtpmp1sdepay.c index e5f52cb..190bfca 100644 --- a/gst/rtp/gstrtpmp1sdepay.c +++ b/gst/rtp/gstrtpmp1sdepay.c @@ -26,13 +26,6 @@ #include #include "gstrtpmp1sdepay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_mp1sdepay_details = -GST_ELEMENT_DETAILS ("RTP MPEG1 System Stream depayloader", - "Codec/Depayloader/Network", - "Extracts MPEG1 System Streams from RTP packets (RFC 3555)", - "Wim Taymans "); - /* RtpMP1SDepay signals and args */ enum { @@ -87,7 +80,10 @@ gst_rtp_mp1s_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mp1s_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mp1sdepay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG1 System Stream depayloader", "Codec/Depayloader/Network", + "Extracts MPEG1 System Streams from RTP packets (RFC 3555)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmp2tdepay.c b/gst/rtp/gstrtpmp2tdepay.c index 7fbb4b5..c122d94 100644 --- a/gst/rtp/gstrtpmp2tdepay.c +++ b/gst/rtp/gstrtpmp2tdepay.c @@ -26,14 +26,6 @@ #include #include "gstrtpmp2tdepay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_mp2tdepay_details = -GST_ELEMENT_DETAILS ("RTP MPEG Transport Stream depayloader", - "Codec/Depayloader/Network", - "Extracts MPEG2 TS from RTP packets (RFC 2250)", - "Wim Taymans \n" - "Thijs Vermeir "); - /* RtpMP2TDepay signals and args */ enum { @@ -99,7 +91,11 @@ gst_rtp_mp2t_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mp2t_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mp2tdepay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG Transport Stream depayloader", "Codec/Depayloader/Network", + "Extracts MPEG2 TS from RTP packets (RFC 2250)", + "Wim Taymans , " + "Thijs Vermeir "); } static void diff --git a/gst/rtp/gstrtpmp2tpay.c b/gst/rtp/gstrtpmp2tpay.c index 48ad005..41b450e 100644 --- a/gst/rtp/gstrtpmp2tpay.c +++ b/gst/rtp/gstrtpmp2tpay.c @@ -27,13 +27,6 @@ #include "gstrtpmp2tpay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_mp2t_pay_details = -GST_ELEMENT_DETAILS ("RTP MPEG2 Transport Stream payloader", - "Codec/Payloader/Network", - "Payload-encodes MPEG2 TS into RTP packets (RFC 2250)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_mp2t_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -71,7 +64,10 @@ gst_rtp_mp2t_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_mp2t_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mp2t_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_mp2t_pay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG2 Transport Stream payloader", "Codec/Payloader/Network", + "Payload-encodes MPEG2 TS into RTP packets (RFC 2250)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmp4adepay.c b/gst/rtp/gstrtpmp4adepay.c index 9713bdc..d85b15f 100644 --- a/gst/rtp/gstrtpmp4adepay.c +++ b/gst/rtp/gstrtpmp4adepay.c @@ -29,14 +29,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpmp4adepay_debug); #define GST_CAT_DEFAULT (rtpmp4adepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_mp4adepay_details = -GST_ELEMENT_DETAILS ("RTP MPEG4 audio depayloader", - "Codec/Depayloader/Network", - "Extracts MPEG4 audio from RTP packets (RFC 3016)", - "Nokia Corporation (contact ), " - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_mp4a_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -87,7 +79,11 @@ gst_rtp_mp4a_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mp4a_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mp4adepay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG4 audio depayloader", "Codec/Depayloader/Network", + "Extracts MPEG4 audio from RTP packets (RFC 3016)", + "Nokia Corporation (contact ), " + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmp4apay.c b/gst/rtp/gstrtpmp4apay.c index a401b2c..32360f0 100644 --- a/gst/rtp/gstrtpmp4apay.c +++ b/gst/rtp/gstrtpmp4apay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpmp4apay_debug); #define GST_CAT_DEFAULT (rtpmp4apay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_mp4apay_details = -GST_ELEMENT_DETAILS ("RTP MPEG4 audio payloader", - "Codec/Payloader/Network", - "Payload MPEG4 audio as RTP packets (RFC 3016)", - "Wim Taymans "); - /* FIXME: add framed=(boolean)true once our encoders have this field set * on their output caps */ static GstStaticPadTemplate gst_rtp_mp4a_pay_sink_template = @@ -83,7 +76,10 @@ GST_BOILERPLATE (GstRtpMP4APay, gst_rtp_mp4a_pay, GstBaseRTPPayload, gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mp4a_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mp4apay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG4 audio payloader", "Codec/Payloader/Network", + "Payload MPEG4 audio as RTP packets (RFC 3016)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmp4gdepay.c b/gst/rtp/gstrtpmp4gdepay.c index 8a3b548..4d8aee2 100644 --- a/gst/rtp/gstrtpmp4gdepay.c +++ b/gst/rtp/gstrtpmp4gdepay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpmp4gdepay_debug); #define GST_CAT_DEFAULT (rtpmp4gdepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_mp4gdepay_details = -GST_ELEMENT_DETAILS ("RTP MPEG4 ES depayloader", - "Codec/Depayloader/Network", - "Extracts MPEG4 elementary streams from RTP packets (RFC 3640)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_mp4g_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -157,7 +150,10 @@ gst_rtp_mp4g_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mp4g_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mp4gdepay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG4 ES depayloader", "Codec/Depayloader/Network", + "Extracts MPEG4 elementary streams from RTP packets (RFC 3640)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmp4gpay.c b/gst/rtp/gstrtpmp4gpay.c index 13c2d5a..437c0dc 100644 --- a/gst/rtp/gstrtpmp4gpay.c +++ b/gst/rtp/gstrtpmp4gpay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpmp4gpay_debug); #define GST_CAT_DEFAULT (rtpmp4gpay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_mp4gpay_details = -GST_ELEMENT_DETAILS ("RTP MPEG4 ES payloader", - "Codec/Payloader/Network", - "Payload MPEG4 elementary streams as RTP packets (RFC 3640)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_mp4g_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -98,7 +91,10 @@ GST_BOILERPLATE (GstRtpMP4GPay, gst_rtp_mp4g_pay, GstBaseRTPPayload, gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mp4g_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mp4gpay_details); + gst_element_class_set_details_simple (element_class, "RTP MPEG4 ES payloader", + "Codec/Payloader/Network", + "Payload MPEG4 elementary streams as RTP packets (RFC 3640)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmp4vdepay.c b/gst/rtp/gstrtpmp4vdepay.c index bf40433..04a1442 100644 --- a/gst/rtp/gstrtpmp4vdepay.c +++ b/gst/rtp/gstrtpmp4vdepay.c @@ -29,13 +29,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpmp4vdepay_debug); #define GST_CAT_DEFAULT (rtpmp4vdepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_mp4vdepay_details = -GST_ELEMENT_DETAILS ("RTP MPEG4 video depayloader", - "Codec/Depayloader/Network", - "Extracts MPEG4 video from RTP packets (RFC 3016)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_mp4v_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -84,7 +77,10 @@ gst_rtp_mp4v_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mp4v_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mp4vdepay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG4 video depayloader", "Codec/Depayloader/Network", + "Extracts MPEG4 video from RTP packets (RFC 3016)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c index af04d91..f11977a 100644 --- a/gst/rtp/gstrtpmp4vpay.c +++ b/gst/rtp/gstrtpmp4vpay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpmp4vpay_debug); #define GST_CAT_DEFAULT (rtpmp4vpay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_mp4vpay_details = -GST_ELEMENT_DETAILS ("RTP MPEG4 Video payloader", - "Codec/Payloader/Network", - "Payload MPEG-4 video as RTP packets (RFC 3016)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_mp4v_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -97,7 +90,10 @@ GST_BOILERPLATE (GstRtpMP4VPay, gst_rtp_mp4v_pay, GstBaseRTPPayload, gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mp4v_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mp4vpay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG4 Video payloader", "Codec/Payloader/Network", + "Payload MPEG-4 video as RTP packets (RFC 3016)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmpadepay.c b/gst/rtp/gstrtpmpadepay.c index 7e8e942..49c97e8 100644 --- a/gst/rtp/gstrtpmpadepay.c +++ b/gst/rtp/gstrtpmpadepay.c @@ -29,13 +29,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpmpadepay_debug); #define GST_CAT_DEFAULT (rtpmpadepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_mpadepay_details = -GST_ELEMENT_DETAILS ("RTP MPEG audio depayloader", - "Codec/Depayloader/Network", - "Extracts MPEG audio from RTP packets (RFC 2038)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_mpa_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -75,7 +68,10 @@ gst_rtp_mpa_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mpa_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mpadepay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG audio depayloader", "Codec/Depayloader/Network", + "Extracts MPEG audio from RTP packets (RFC 2038)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmpapay.c b/gst/rtp/gstrtpmpapay.c index 781accc..f57d628 100644 --- a/gst/rtp/gstrtpmpapay.c +++ b/gst/rtp/gstrtpmpapay.c @@ -27,13 +27,6 @@ #include "gstrtpmpapay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_mpapay_details = -GST_ELEMENT_DETAILS ("RTP MPEG audio payloader", - "Codec/Payloader/Network", - "Payload MPEG audio as RTP packets (RFC 2038)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_mpa_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -74,7 +67,10 @@ GST_BOILERPLATE (GstRtpMPAPay, gst_rtp_mpa_pay, GstBaseRTPPayload, gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mpa_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mpapay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG audio payloader", "Codec/Payloader/Network", + "Payload MPEG audio as RTP packets (RFC 2038)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmpvdepay.c b/gst/rtp/gstrtpmpvdepay.c index 93a41b4..bb377ed 100644 --- a/gst/rtp/gstrtpmpvdepay.c +++ b/gst/rtp/gstrtpmpvdepay.c @@ -29,13 +29,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpmpvdepay_debug); #define GST_CAT_DEFAULT (rtpmpvdepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_mpvdepay_details = -GST_ELEMENT_DETAILS ("RTP MPEG video depayloader", - "Codec/Depayloader/Network", - "Extracts MPEG video from RTP packets (RFC 2250)", - "Wim Taymans "); - /* FIXME, we set the mpeg version to 2, we should ideally be looking at contents * of the stream to figure out the version */ static GstStaticPadTemplate gst_rtp_mpv_depay_src_template = @@ -78,7 +71,10 @@ gst_rtp_mpv_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mpv_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_mpvdepay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG video depayloader", "Codec/Depayloader/Network", + "Extracts MPEG video from RTP packets (RFC 2250)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpmpvpay.c b/gst/rtp/gstrtpmpvpay.c index 2bc9ff4..50bff27 100644 --- a/gst/rtp/gstrtpmpvpay.c +++ b/gst/rtp/gstrtpmpvpay.c @@ -27,12 +27,6 @@ #include "gstrtpmpvpay.h" -static const GstElementDetails gst_rtp_mpv_pay_details = -GST_ELEMENT_DETAILS ("RTP MPEG2 ES video payloader", - "Codec/Payloader/Network", - "Payload-encodes MPEG2 ES into RTP packets (RFC 2250)", - "Thijs Vermeir "); - static GstStaticPadTemplate gst_rtp_mpv_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -70,7 +64,10 @@ gst_rtp_mpv_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_mpv_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_mpv_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_mpv_pay_details); + gst_element_class_set_details_simple (element_class, + "RTP MPEG2 ES video payloader", "Codec/Payloader/Network", + "Payload-encodes MPEG2 ES into RTP packets (RFC 2250)", + "Thijs Vermeir "); } static void diff --git a/gst/rtp/gstrtppcmadepay.c b/gst/rtp/gstrtppcmadepay.c index b2dfcf9..acb5336 100644 --- a/gst/rtp/gstrtppcmadepay.c +++ b/gst/rtp/gstrtppcmadepay.c @@ -27,13 +27,6 @@ #include #include "gstrtppcmadepay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_pcmadepay_details = -GST_ELEMENT_DETAILS ("RTP PCMA depayloader", - "Codec/Depayloader/Network", - "Extracts PCMA audio from RTP packets", - "Edgard Lima , Zeeshan Ali "); - /* RtpPcmaDepay signals and args */ enum { @@ -84,7 +77,10 @@ gst_rtp_pcma_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_pcma_depay_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_pcma_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_pcmadepay_details); + gst_element_class_set_details_simple (element_class, "RTP PCMA depayloader", + "Codec/Depayloader/Network", + "Extracts PCMA audio from RTP packets", + "Edgard Lima , Zeeshan Ali "); } static void diff --git a/gst/rtp/gstrtppcmapay.c b/gst/rtp/gstrtppcmapay.c index 296f726..270f366 100644 --- a/gst/rtp/gstrtppcmapay.c +++ b/gst/rtp/gstrtppcmapay.c @@ -29,13 +29,6 @@ #include "gstrtppcmapay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_pcma_pay_details = -GST_ELEMENT_DETAILS ("RTP PCMA payloader", - "Codec/Payloader/Network", - "Payload-encodes PCMA audio into a RTP packet", - "Edgard Lima "); - static GstStaticPadTemplate gst_rtp_pcma_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -72,7 +65,10 @@ gst_rtp_pcma_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_pcma_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_pcma_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_pcma_pay_details); + gst_element_class_set_details_simple (element_class, "RTP PCMA payloader", + "Codec/Payloader/Network", + "Payload-encodes PCMA audio into a RTP packet", + "Edgard Lima "); } static void diff --git a/gst/rtp/gstrtppcmudepay.c b/gst/rtp/gstrtppcmudepay.c index 30c983b..9c47891 100644 --- a/gst/rtp/gstrtppcmudepay.c +++ b/gst/rtp/gstrtppcmudepay.c @@ -27,13 +27,6 @@ #include #include "gstrtppcmudepay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_pcmudepay_details = -GST_ELEMENT_DETAILS ("RTP PCMU depayloader", - "Codec/Depayloader/Network", - "Extracts PCMU audio from RTP packets", - "Edgard Lima , Zeeshan Ali "); - /* RtpPcmuDepay signals and args */ enum { @@ -84,7 +77,10 @@ gst_rtp_pcmu_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_pcmu_depay_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_pcmu_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_pcmudepay_details); + gst_element_class_set_details_simple (element_class, "RTP PCMU depayloader", + "Codec/Depayloader/Network", + "Extracts PCMU audio from RTP packets", + "Edgard Lima , Zeeshan Ali "); } static void diff --git a/gst/rtp/gstrtppcmupay.c b/gst/rtp/gstrtppcmupay.c index f0d1490..19074ad 100644 --- a/gst/rtp/gstrtppcmupay.c +++ b/gst/rtp/gstrtppcmupay.c @@ -29,13 +29,6 @@ #include "gstrtppcmupay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_pcmu_pay_details = -GST_ELEMENT_DETAILS ("RTP PCMU payloader", - "Codec/Payloader/Network", - "Payload-encodes PCMU audio into a RTP packet", - "Edgard Lima "); - static GstStaticPadTemplate gst_rtp_pcmu_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -72,7 +65,10 @@ gst_rtp_pcmu_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_pcmu_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_pcmu_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_pcmu_pay_details); + gst_element_class_set_details_simple (element_class, "RTP PCMU payloader", + "Codec/Payloader/Network", + "Payload-encodes PCMU audio into a RTP packet", + "Edgard Lima "); } static void diff --git a/gst/rtp/gstrtpqdmdepay.c b/gst/rtp/gstrtpqdmdepay.c index ff28bdc..1ab4d59 100644 --- a/gst/rtp/gstrtpqdmdepay.c +++ b/gst/rtp/gstrtpqdmdepay.c @@ -29,13 +29,6 @@ GST_DEBUG_CATEGORY (rtpqdm2depay_debug); #define GST_CAT_DEFAULT rtpqdm2depay_debug -/* elementfactory information */ -static const GstElementDetails gst_rtp_qdm2depay_details = -GST_ELEMENT_DETAILS ("RTP QDM2 depayloader", - "Codec/Depayloader/Network", - "Extracts QDM2 audio from RTP packets (no RFC)", - "Edward Hervey "); - static GstStaticPadTemplate gst_rtp_qdm2_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -83,7 +76,10 @@ gst_rtp_qdm2_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_qdm2_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_qdm2depay_details); + gst_element_class_set_details_simple (element_class, "RTP QDM2 depayloader", + "Codec/Depayloader/Network", + "Extracts QDM2 audio from RTP packets (no RFC)", + "Edward Hervey "); } static void diff --git a/gst/rtp/gstrtpsirendepay.c b/gst/rtp/gstrtpsirendepay.c index 6911d4d..736160f 100644 --- a/gst/rtp/gstrtpsirendepay.c +++ b/gst/rtp/gstrtpsirendepay.c @@ -28,14 +28,6 @@ #include #include "gstrtpsirendepay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_siren_depay_details = -GST_ELEMENT_DETAILS ("RTP Siren packet depayloader", - "Codec/Depayloader/Network", - "Extracts Siren audio from RTP packets", - "Philippe Kalaf "); - - static GstStaticPadTemplate gst_rtp_siren_depay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -71,7 +63,10 @@ gst_rtp_siren_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_siren_depay_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_siren_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_siren_depay_details); + gst_element_class_set_details_simple (element_class, + "RTP Siren packet depayloader", "Codec/Depayloader/Network", + "Extracts Siren audio from RTP packets", + "Philippe Kalaf "); } static void diff --git a/gst/rtp/gstrtpsirenpay.c b/gst/rtp/gstrtpsirenpay.c index cb7be70..dde01f4 100644 --- a/gst/rtp/gstrtpsirenpay.c +++ b/gst/rtp/gstrtpsirenpay.c @@ -26,14 +26,6 @@ #include "gstrtpsirenpay.h" #include -/* elementfactory information */ -static GstElementDetails gst_rtp_siren_pay_details = { - "RTP Payloader for Siren Audio", - "Codec/Payloader/Network", - "Packetize Siren audio streams into RTP packets", - "Youness Alaoui " -}; - GST_DEBUG_CATEGORY_STATIC (rtpsirenpay_debug); #define GST_CAT_DEFAULT (rtpsirenpay_debug) @@ -71,7 +63,10 @@ gst_rtp_siren_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_siren_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_siren_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_siren_pay_details); + gst_element_class_set_details_simple (element_class, + "RTP Payloader for Siren Audio", "Codec/Payloader/Network", + "Packetize Siren audio streams into RTP packets", + "Youness Alaoui "); } static void diff --git a/gst/rtp/gstrtpspeexdepay.c b/gst/rtp/gstrtpspeexdepay.c index d183bff..fe6d004 100644 --- a/gst/rtp/gstrtpspeexdepay.c +++ b/gst/rtp/gstrtpspeexdepay.c @@ -27,13 +27,6 @@ #include "gstrtpspeexdepay.h" -/* elementfactory information */ -static const GstElementDetails gst_rtp_speexdepay_details = -GST_ELEMENT_DETAILS ("RTP Speex depayloader", - "Codec/Depayloader/Network", - "Extracts Speex audio from RTP packets", - "Edgard Lima "); - /* RtpSPEEXDepay signals and args */ enum { @@ -82,7 +75,10 @@ gst_rtp_speex_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_speex_depay_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_speex_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_speexdepay_details); + gst_element_class_set_details_simple (element_class, "RTP Speex depayloader", + "Codec/Depayloader/Network", + "Extracts Speex audio from RTP packets", + "Edgard Lima "); } static void diff --git a/gst/rtp/gstrtpspeexpay.c b/gst/rtp/gstrtpspeexpay.c index 7b4728d..7dfc6a9 100644 --- a/gst/rtp/gstrtpspeexpay.c +++ b/gst/rtp/gstrtpspeexpay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpspeexpay_debug); #define GST_CAT_DEFAULT (rtpspeexpay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_speex_pay_details = -GST_ELEMENT_DETAILS ("RTP Speex payloader", - "Codec/Payloader/Network", - "Payload-encodes Speex audio into a RTP packet", - "Edgard Lima "); - static GstStaticPadTemplate gst_rtp_speex_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -79,7 +72,10 @@ gst_rtp_speex_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_speex_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_speex_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_speex_pay_details); + gst_element_class_set_details_simple (element_class, "RTP Speex payloader", + "Codec/Payloader/Network", + "Payload-encodes Speex audio into a RTP packet", + "Edgard Lima "); GST_DEBUG_CATEGORY_INIT (rtpspeexpay_debug, "rtpspeexpay", 0, "Speex RTP Payloader"); diff --git a/gst/rtp/gstrtpsv3vdepay.c b/gst/rtp/gstrtpsv3vdepay.c index 91dbef9..248ed45 100644 --- a/gst/rtp/gstrtpsv3vdepay.c +++ b/gst/rtp/gstrtpsv3vdepay.c @@ -29,13 +29,6 @@ GST_DEBUG_CATEGORY (rtpsv3vdepay_debug); #define GST_CAT_DEFAULT rtpsv3vdepay_debug -/* elementfactory information */ -static const GstElementDetails gst_rtp_sv3vdepay_details = -GST_ELEMENT_DETAILS ("RTP SVQ3 depayloader", - "Codec/Depayloader/Network", - "Extracts SVQ3 video from RTP packets (no RFC)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_sv3v_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -78,7 +71,10 @@ gst_rtp_sv3v_depay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_sv3v_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_sv3vdepay_details); + gst_element_class_set_details_simple (element_class, "RTP SVQ3 depayloader", + "Codec/Depayloader/Network", + "Extracts SVQ3 video from RTP packets (no RFC)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtptheoradepay.c b/gst/rtp/gstrtptheoradepay.c index 9af9668..336afaf 100644 --- a/gst/rtp/gstrtptheoradepay.c +++ b/gst/rtp/gstrtptheoradepay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtptheoradepay_debug); #define GST_CAT_DEFAULT (rtptheoradepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_theora_depay_details = -GST_ELEMENT_DETAILS ("RTP Theora depayloader", - "Codec/Depayloader/Network", - "Extracts Theora video from RTP packets (draft-01 of RFC XXXX)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_theora_depay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -90,7 +83,10 @@ gst_rtp_theora_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_theora_depay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_theora_depay_details); + gst_element_class_set_details_simple (element_class, "RTP Theora depayloader", + "Codec/Depayloader/Network", + "Extracts Theora video from RTP packets (draft-01 of RFC XXXX)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtptheorapay.c b/gst/rtp/gstrtptheorapay.c index ffdfdc1..a6806ae 100644 --- a/gst/rtp/gstrtptheorapay.c +++ b/gst/rtp/gstrtptheorapay.c @@ -37,13 +37,6 @@ GST_DEBUG_CATEGORY_STATIC (rtptheorapay_debug); * http://svn.xiph.org/trunk/theora/doc/draft-ietf-avt-rtp-theora-01.txt */ -/* elementfactory information */ -static const GstElementDetails gst_rtp_theorapay_details = -GST_ELEMENT_DETAILS ("RTP Theora payloader", - "Codec/Payloader/Network", - "Payload-encode Theora video into RTP packets (draft-01 RFC XXXX)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_theora_pay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -95,7 +88,10 @@ gst_rtp_theora_pay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_theora_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_theorapay_details); + gst_element_class_set_details_simple (element_class, "RTP Theora payloader", + "Codec/Payloader/Network", + "Payload-encode Theora video into RTP packets (draft-01 RFC XXXX)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpvorbisdepay.c b/gst/rtp/gstrtpvorbisdepay.c index bcaa197..acb7630 100644 --- a/gst/rtp/gstrtpvorbisdepay.c +++ b/gst/rtp/gstrtpvorbisdepay.c @@ -34,13 +34,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpvorbisdepay_debug); * http://www.rfc-editor.org/rfc/rfc5215.txt */ -/* elementfactory information */ -static const GstElementDetails gst_rtp_vorbis_depay_details = -GST_ELEMENT_DETAILS ("RTP Vorbis depayloader", - "Codec/Depayloader/Network", - "Extracts Vorbis Audio from RTP packets (RFC 5215)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_vorbis_depay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -88,7 +81,10 @@ gst_rtp_vorbis_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_vorbis_depay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_vorbis_depay_details); + gst_element_class_set_details_simple (element_class, "RTP Vorbis depayloader", + "Codec/Depayloader/Network", + "Extracts Vorbis Audio from RTP packets (RFC 5215)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpvorbispay.c b/gst/rtp/gstrtpvorbispay.c index c96b8bb..ae16253 100644 --- a/gst/rtp/gstrtpvorbispay.c +++ b/gst/rtp/gstrtpvorbispay.c @@ -35,13 +35,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpvorbispay_debug); * http://www.rfc-editor.org/rfc/rfc5215.txt */ -/* elementfactory information */ -static const GstElementDetails gst_rtp_vorbispay_details = -GST_ELEMENT_DETAILS ("RTP Vorbis depayloader", - "Codec/Payloader/Network", - "Payload-encode Vorbis audio into RTP packets (RFC 5215)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_vorbis_pay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -85,7 +78,10 @@ gst_rtp_vorbis_pay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_vorbis_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_vorbispay_details); + gst_element_class_set_details_simple (element_class, "RTP Vorbis depayloader", + "Codec/Payloader/Network", + "Payload-encode Vorbis audio into RTP packets (RFC 5215)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpvrawdepay.c b/gst/rtp/gstrtpvrawdepay.c index 85756bd..77ca797 100644 --- a/gst/rtp/gstrtpvrawdepay.c +++ b/gst/rtp/gstrtpvrawdepay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpvrawdepay_debug); #define GST_CAT_DEFAULT (rtpvrawdepay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_vrawdepay_details = -GST_ELEMENT_DETAILS ("RTP Raw Video depayloader", - "Codec/Depayloader/Network", - "Extracts raw video from RTP packets (RFC 4175)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_vraw_depay_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -75,7 +68,10 @@ gst_rtp_vraw_depay_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_vraw_depay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_vrawdepay_details); + gst_element_class_set_details_simple (element_class, + "RTP Raw Video depayloader", "Codec/Depayloader/Network", + "Extracts raw video from RTP packets (RFC 4175)", + "Wim Taymans "); } static void diff --git a/gst/rtp/gstrtpvrawpay.c b/gst/rtp/gstrtpvrawpay.c index 8f919df..aee077f 100644 --- a/gst/rtp/gstrtpvrawpay.c +++ b/gst/rtp/gstrtpvrawpay.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpvrawpay_debug); #define GST_CAT_DEFAULT (rtpvrawpay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_vrawpay_details = -GST_ELEMENT_DETAILS ("RTP Raw Video payloader", - "Codec/Payloader/Network", - "Payload raw video as RTP packets (RFC 4175)", - "Wim Taymans "); - static GstStaticPadTemplate gst_rtp_vraw_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -128,7 +121,10 @@ GST_BOILERPLATE (GstRtpVRawPay, gst_rtp_vraw_pay, GstBaseRTPPayload, gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_vraw_pay_sink_template)); - gst_element_class_set_details (element_class, &gst_rtp_vrawpay_details); + gst_element_class_set_details_simple (element_class, + "RTP Raw Video payloader", "Codec/Payloader/Network", + "Payload raw video as RTP packets (RFC 4175)", + "Wim Taymans "); } static void diff --git a/gst/rtpmanager/gstrtpbin.c b/gst/rtpmanager/gstrtpbin.c index f0b5a23..66590f9 100644 --- a/gst/rtpmanager/gstrtpbin.c +++ b/gst/rtpmanager/gstrtpbin.c @@ -127,12 +127,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtp_bin_debug); #define GST_CAT_DEFAULT gst_rtp_bin_debug -/* elementfactory information */ -static const GstElementDetails rtpbin_details = GST_ELEMENT_DETAILS ("RTP Bin", - "Filter/Network/RTP", - "Real-Time Transport Protocol bin", - "Wim Taymans "); - /* sink pads */ static GstStaticPadTemplate rtpbin_recv_rtp_sink_template = GST_STATIC_PAD_TEMPLATE ("recv_rtp_sink_%d", @@ -1286,7 +1280,10 @@ gst_rtp_bin_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&rtpbin_send_rtp_src_template)); - gst_element_class_set_details (element_class, &rtpbin_details); + gst_element_class_set_details_simple (element_class, "RTP Bin", + "Filter/Network/RTP", + "Real-Time Transport Protocol bin", + "Wim Taymans "); } static void diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index 6d29495..cbcbd78 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -70,14 +70,6 @@ GST_DEBUG_CATEGORY (rtpjitterbuffer_debug); #define GST_CAT_DEFAULT (rtpjitterbuffer_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_jitter_buffer_details = -GST_ELEMENT_DETAILS ("RTP packet jitter-buffer", - "Filter/Network/RTP", - "A buffer that deals with network jitter and other transmission faults", - "Philippe Kalaf , " - "Wim Taymans "); - /* RTPJitterBuffer signals and args */ enum { @@ -286,7 +278,11 @@ gst_rtp_jitter_buffer_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_jitter_buffer_sink_rtcp_template)); - gst_element_class_set_details (element_class, &gst_rtp_jitter_buffer_details); + gst_element_class_set_details_simple (element_class, + "RTP packet jitter-buffer", "Filter/Network/RTP", + "A buffer that deals with network jitter and other transmission faults", + "Philippe Kalaf , " + "Wim Taymans "); } static void diff --git a/gst/rtpmanager/gstrtpptdemux.c b/gst/rtpmanager/gstrtpptdemux.c index 3e231c8..b3b556a 100644 --- a/gst/rtpmanager/gstrtpptdemux.c +++ b/gst/rtpmanager/gstrtpptdemux.c @@ -134,13 +134,6 @@ static GstRtpPtDemuxPad *find_pad_for_pt (GstRtpPtDemux * rtpdemux, guint8 pt); static guint gst_rtp_pt_demux_signals[LAST_SIGNAL] = { 0 }; -static GstElementDetails gst_rtp_pt_demux_details = { - "RTP Demux", - "Demux/Network/RTP", - "Parses codec streams transmitted in the same RTP session", - "Kai Vehmanen " -}; - static void gst_rtp_pt_demux_base_init (gpointer g_class) { @@ -151,7 +144,10 @@ gst_rtp_pt_demux_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_klass, gst_static_pad_template_get (&rtp_pt_demux_src_template)); - gst_element_class_set_details (gstelement_klass, &gst_rtp_pt_demux_details); + gst_element_class_set_details_simple (gstelement_klass, "RTP Demux", + "Demux/Network/RTP", + "Parses codec streams transmitted in the same RTP session", + "Kai Vehmanen "); } static void diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c index 90ee95b..2d8becd 100644 --- a/gst/rtpmanager/gstrtpsession.c +++ b/gst/rtpmanager/gstrtpsession.c @@ -121,13 +121,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtp_session_debug); #define GST_CAT_DEFAULT gst_rtp_session_debug -/* elementfactory information */ -static const GstElementDetails rtpsession_details = -GST_ELEMENT_DETAILS ("RTP Session", - "Filter/Network/RTP", - "Implement an RTP session", - "Wim Taymans "); - /* sink pads */ static GstStaticPadTemplate rtpsession_recv_rtp_sink_template = GST_STATIC_PAD_TEMPLATE ("recv_rtp_sink", @@ -382,7 +375,9 @@ gst_rtp_session_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&rtpsession_send_rtcp_src_template)); - gst_element_class_set_details (element_class, &rtpsession_details); + gst_element_class_set_details_simple (element_class, "RTP Session", + "Filter/Network/RTP", + "Implement an RTP session", "Wim Taymans "); } static void diff --git a/gst/rtpmanager/gstrtpssrcdemux.c b/gst/rtpmanager/gstrtpssrcdemux.c index bbed79f..464c1e1 100644 --- a/gst/rtpmanager/gstrtpssrcdemux.c +++ b/gst/rtpmanager/gstrtpssrcdemux.c @@ -83,13 +83,6 @@ GST_STATIC_PAD_TEMPLATE ("rtcp_src_%d", GST_STATIC_CAPS ("application/x-rtcp") ); -static GstElementDetails gst_rtp_ssrc_demux_details = { - "RTP SSRC Demux", - "Demux/Network/RTP", - "Splits RTP streams based on the SSRC", - "Wim Taymans " -}; - #define GST_PAD_LOCK(obj) (g_mutex_lock ((obj)->padlock)) #define GST_PAD_UNLOCK(obj) (g_mutex_unlock ((obj)->padlock)) @@ -242,7 +235,10 @@ gst_rtp_ssrc_demux_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_klass, gst_static_pad_template_get (&rtp_ssrc_demux_rtcp_src_template)); - gst_element_class_set_details (gstelement_klass, &gst_rtp_ssrc_demux_details); + gst_element_class_set_details_simple (gstelement_klass, "RTP SSRC Demux", + "Demux/Network/RTP", + "Splits RTP streams based on the SSRC", + "Wim Taymans "); } static void diff --git a/gst/rtsp/gstrtpdec.c b/gst/rtsp/gstrtpdec.c index e7aab03..6896397 100644 --- a/gst/rtsp/gstrtpdec.c +++ b/gst/rtsp/gstrtpdec.c @@ -63,13 +63,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpdec_debug); #define GST_CAT_DEFAULT (rtpdec_debug) -/* elementfactory information */ -static const GstElementDetails rtpdec_details = -GST_ELEMENT_DETAILS ("RTP Decoder", - "Codec/Parser/Network", - "Accepts raw RTP and RTCP packets and sends them forward", - "Wim Taymans "); - /* GstRTPDec signals and args */ enum { @@ -218,7 +211,10 @@ gst_rtp_dec_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_dec_rtcp_src_template)); - gst_element_class_set_details (element_class, &rtpdec_details); + gst_element_class_set_details_simple (element_class, "RTP Decoder", + "Codec/Parser/Network", + "Accepts raw RTP and RTCP packets and sends them forward", + "Wim Taymans "); } /* BOXED:UINT,UINT */ diff --git a/gst/rtsp/gstrtspgoogle.c b/gst/rtsp/gstrtspgoogle.c index d20ea40..e162d90 100644 --- a/gst/rtsp/gstrtspgoogle.c +++ b/gst/rtsp/gstrtspgoogle.c @@ -35,13 +35,6 @@ GST_DEBUG_CATEGORY_STATIC (rtspgoogle_debug); #define GST_CAT_DEFAULT (rtspgoogle_debug) -/* elementfactory information */ -static const GstElementDetails rtspgoogle_details = -GST_ELEMENT_DETAILS ("Google RTSP Extension", - "Network/Extension/Protocol", - "Extends RTSP so that it can handle Google setup", - "Wim Taymans "); - #define SERVER_PREFIX "Google RTSP" static GstRTSPResult @@ -149,7 +142,10 @@ gst_rtsp_google_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &rtspgoogle_details); + gst_element_class_set_details_simple (element_class, "Google RTSP Extension", + "Network/Extension/Protocol", + "Extends RTSP so that it can handle Google setup", + "Wim Taymans "); } static void diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index 7573e9a..d0d924f 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -105,15 +105,6 @@ GST_DEBUG_CATEGORY_STATIC (rtspsrc_debug); #define GST_CAT_DEFAULT (rtspsrc_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtspsrc_details = -GST_ELEMENT_DETAILS ("RTSP packet receiver", - "Source/Network", - "Receive data over the network via RTSP (RFC 2326)", - "Wim Taymans \n" - "Thijs Vermeir \n" - "Lutz Mueller "); - static GstStaticPadTemplate rtptemplate = GST_STATIC_PAD_TEMPLATE ("stream%d", GST_PAD_SRC, GST_PAD_SOMETIMES, @@ -285,7 +276,12 @@ gst_rtspsrc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&rtptemplate)); - gst_element_class_set_details (element_class, &gst_rtspsrc_details); + gst_element_class_set_details_simple (element_class, "RTSP packet receiver", + "Source/Network", + "Receive data over the network via RTSP (RFC 2326)", + "Wim Taymans , " + "Thijs Vermeir , " + "Lutz Mueller "); } static void diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c index 5a1a087..8f1fcc5 100644 --- a/gst/smpte/gstsmpte.c +++ b/gst/smpte/gstsmpte.c @@ -50,13 +50,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_smpte_debug); #define GST_CAT_DEFAULT gst_smpte_debug -/* elementfactory information */ -static const GstElementDetails smpte_details = -GST_ELEMENT_DETAILS ("SMPTE transitions", - "Filter/Editor/Video", - "Apply the standard SMPTE transitions on video images", - "Wim Taymans "); - static GstStaticPadTemplate gst_smpte_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -207,7 +200,10 @@ gst_smpte_base_init (GstSMPTEClass * klass) gst_static_pad_template_get (&gst_smpte_sink2_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_smpte_src_template)); - gst_element_class_set_details (element_class, &smpte_details); + gst_element_class_set_details_simple (element_class, "SMPTE transitions", + "Filter/Editor/Video", + "Apply the standard SMPTE transitions on video images", + "Wim Taymans "); } static void diff --git a/gst/smpte/gstsmptealpha.c b/gst/smpte/gstsmptealpha.c index 61b4b0b..16c3d13 100644 --- a/gst/smpte/gstsmptealpha.c +++ b/gst/smpte/gstsmptealpha.c @@ -61,13 +61,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_smpte_alpha_debug); #define GST_CAT_DEFAULT gst_smpte_alpha_debug -/* elementfactory information */ -static const GstElementDetails smpte_details = -GST_ELEMENT_DETAILS ("SMPTE transitions", - "Filter/Editor/Video", - "Apply the standard SMPTE transitions as alpha on video images", - "Wim Taymans "); - static GstStaticPadTemplate gst_smpte_alpha_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -199,7 +192,10 @@ gst_smpte_alpha_base_init (GstSMPTEAlphaClass * klass) gst_static_pad_template_get (&gst_smpte_alpha_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_smpte_alpha_src_template)); - gst_element_class_set_details (element_class, &smpte_details); + gst_element_class_set_details_simple (element_class, "SMPTE transitions", + "Filter/Editor/Video", + "Apply the standard SMPTE transitions as alpha on video images", + "Wim Taymans "); } static void diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c index efac30e..d3980ea 100644 --- a/gst/udp/gstdynudpsink.c +++ b/gst/udp/gstdynudpsink.c @@ -46,13 +46,6 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); -/* elementfactory information */ -static const GstElementDetails gst_dynudpsink_details = -GST_ELEMENT_DETAILS ("UDP packet sender", - "Sink/Network", - "Send data over the network via UDP", - "Philippe Khalaf "); - /* DynUDPSink signals and args */ enum { @@ -139,7 +132,10 @@ gst_dynudpsink_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &gst_dynudpsink_details); + gst_element_class_set_details_simple (element_class, "UDP packet sender", + "Sink/Network", + "Send data over the network via UDP", + "Philippe Khalaf "); } static void diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index 8e05e6b..1b8ba65 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -49,13 +49,6 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); -/* elementfactory information */ -static const GstElementDetails gst_multiudpsink_details = -GST_ELEMENT_DETAILS ("UDP packet sender", - "Sink/Network", - "Send data over the network via UDP", - "Wim Taymans "); - /* MultiUDPSink signals and args */ enum { @@ -178,7 +171,10 @@ gst_multiudpsink_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &gst_multiudpsink_details); + gst_element_class_set_details_simple (element_class, "UDP packet sender", + "Sink/Network", + "Send data over the network via UDP", + "Wim Taymans "); } static void diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c index bad4300..1f55f7d 100644 --- a/gst/udp/gstudpsink.c +++ b/gst/udp/gstudpsink.c @@ -46,13 +46,6 @@ #define UDP_DEFAULT_HOST "localhost" #define UDP_DEFAULT_PORT 4951 -/* elementfactory information */ -static const GstElementDetails gst_udpsink_details = -GST_ELEMENT_DETAILS ("UDP packet sender", - "Sink/Network", - "Send data over the network via UDP", - "Wim Taymans "); - /* UDPSink signals and args */ enum { @@ -126,7 +119,9 @@ gst_udpsink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_udpsink_details); + gst_element_class_set_details_simple (element_class, "UDP packet sender", + "Sink/Network", + "Send data over the network via UDP", "Wim Taymans "); } static void diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c index 5e3cedd..0cbaee8 100644 --- a/gst/udp/gstudpsrc.c +++ b/gst/udp/gstudpsrc.c @@ -133,13 +133,6 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); -static const GstElementDetails gst_udpsrc_details = -GST_ELEMENT_DETAILS ("UDP packet receiver", - "Source/Network", - "Receive data over the network via UDP", - "Wim Taymans \n" - "Thijs Vermeir "); - #define UDP_DEFAULT_PORT 4951 #define UDP_DEFAULT_MULTICAST_GROUP "0.0.0.0" #define UDP_DEFAULT_MULTICAST_IFACE NULL @@ -229,7 +222,11 @@ gst_udpsrc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_udpsrc_details); + gst_element_class_set_details_simple (element_class, "UDP packet receiver", + "Source/Network", + "Receive data over the network via UDP", + "Wim Taymans , " + "Thijs Vermeir "); } static void diff --git a/gst/videocrop/gstaspectratiocrop.c b/gst/videocrop/gstaspectratiocrop.c index 7b91139..ac81154 100644 --- a/gst/videocrop/gstaspectratiocrop.c +++ b/gst/videocrop/gstaspectratiocrop.c @@ -46,12 +46,6 @@ GST_DEBUG_CATEGORY_STATIC (aspect_ratio_crop_debug); #define GST_CAT_DEFAULT aspect_ratio_crop_debug -static const GstElementDetails aspect_ratio_crop_details = -GST_ELEMENT_DETAILS ("aspectratiocrop", - "Filter/Effect/Video", - "Crops video into a user-defined aspect-ratio", - "Thijs Vermeir "); - enum { ARG_0, @@ -170,7 +164,10 @@ gst_aspect_ratio_crop_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &aspect_ratio_crop_details); + gst_element_class_set_details_simple (element_class, "aspectratiocrop", + "Filter/Effect/Video", + "Crops video into a user-defined aspect-ratio", + "Thijs Vermeir "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c index 51e480d..e240099 100644 --- a/gst/videocrop/gstvideocrop.c +++ b/gst/videocrop/gstvideocrop.c @@ -68,11 +68,6 @@ GST_DEBUG_CATEGORY_STATIC (videocrop_debug); #define GST_CAT_DEFAULT videocrop_debug -static const GstElementDetails video_crop_details = GST_ELEMENT_DETAILS ("Crop", - "Filter/Effect/Video", - "Crops video into a user-defined region", - "Tim-Philipp Müller "); - enum { ARG_0, @@ -147,7 +142,10 @@ gst_video_crop_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &video_crop_details); + gst_element_class_set_details_simple (element_class, "Crop", + "Filter/Effect/Video", + "Crops video into a user-defined region", + "Tim-Philipp Müller "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); @@ -642,8 +640,8 @@ gst_video_crop_set_caps (GstBaseTransform * trans, GstCaps * incaps, GST_LOG_OBJECT (crop, "incaps = %" GST_PTR_FORMAT ", outcaps = %" GST_PTR_FORMAT, incaps, outcaps); - if ((crop->crop_left | crop->crop_right | crop-> - crop_top | crop->crop_bottom) == 0) { + if ((crop->crop_left | crop->crop_right | crop->crop_top | crop-> + crop_bottom) == 0) { GST_LOG_OBJECT (crop, "we are using passthrough"); gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (crop), TRUE); } else { diff --git a/gst/videofilter/gstgamma.c b/gst/videofilter/gstgamma.c index a456881..9dab623 100644 --- a/gst/videofilter/gstgamma.c +++ b/gst/videofilter/gstgamma.c @@ -73,12 +73,6 @@ enum #define DEFAULT_PROP_GAMMA 1 -static const GstElementDetails gamma_details = -GST_ELEMENT_DETAILS ("Video gamma correction", - "Filter/Effect/Video", - "Adjusts gamma on a video stream", - "Arwed v. Merkatz "); - /* GstVideoBalance signals and args */ #define DEFAULT_PROP_CONTRAST 1.0 #define DEFAULT_PROP_BRIGHTNESS 0.0 @@ -304,7 +298,10 @@ gst_video_balance_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &video_balance_details); + gst_element_class_set_details_simple (element_class, "Video balance", + "Filter/Effect/Video", + "Adjusts brightness, contrast, hue, saturation on a video stream", + "David Schleef "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_video_balance_sink_template)); diff --git a/gst/videofilter/gstvideoflip.c b/gst/videofilter/gstvideoflip.c index d31758b..3f018e0 100644 --- a/gst/videofilter/gstvideoflip.c +++ b/gst/videofilter/gstvideoflip.c @@ -59,12 +59,6 @@ enum GST_DEBUG_CATEGORY_STATIC (video_flip_debug); #define GST_CAT_DEFAULT video_flip_debug -static const GstElementDetails video_flip_details = -GST_ELEMENT_DETAILS ("Video flipper", - "Filter/Effect/Video", - "Flips and rotates video", - "David Schleef "); - static GstStaticPadTemplate gst_video_flip_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -615,7 +609,9 @@ gst_video_flip_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &video_flip_details); + gst_element_class_set_details_simple (element_class, "Video flipper", + "Filter/Effect/Video", + "Flips and rotates video", "David Schleef "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_video_flip_sink_template)); diff --git a/gst/videofilter/gstvideotemplate.c b/gst/videofilter/gstvideotemplate.c index d164224..d4b6a5e 100644 --- a/gst/videofilter/gstvideotemplate.c +++ b/gst/videofilter/gstvideotemplate.c @@ -118,16 +118,14 @@ static GstVideofilterFormat gst_videotemplate_formats[] = { static void gst_videotemplate_base_init (gpointer g_class) { - static const GstElementDetails videotemplate_details = - GST_ELEMENT_DETAILS ("Video filter template", - "Filter/Effect/Video", - "Template for a video filter", - "David Schleef "); + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstVideofilterClass *videofilter_class = GST_VIDEOFILTER_CLASS (g_class); int i; - gst_element_class_set_details (element_class, &videotemplate_details); + gst_element_class_set_details_simple (element_class, "Video filter template", + "Filter/Effect/Video", + "Template for a video filter", "David Schleef "); for (i = 0; i < G_N_ELEMENTS (gst_videotemplate_formats); i++) { gst_videofilter_class_add_format (videofilter_class, diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c index e2745c6..8a64ac2 100644 --- a/gst/wavenc/gstwavenc.c +++ b/gst/wavenc/gstwavenc.c @@ -67,12 +67,6 @@ struct wave_header struct chunk_struct data; }; -static const GstElementDetails gst_wavenc_details = -GST_ELEMENT_DETAILS ("WAV audio muxer", - "Codec/Muxer/Audio", - "Encode raw audio into WAV", - "Iain Holmes "); - /* FIXME: mono doesn't produce correct files it seems, at least mplayer xruns */ /* Max. of two channels, more channels need WAVFORMATEX with * channel layout, which we do not support yet */ @@ -152,7 +146,9 @@ gst_wavenc_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_wavenc_details); + gst_element_class_set_details_simple (element_class, "WAV audio muxer", + "Codec/Muxer/Audio", + "Encode raw audio into WAV", "Iain Holmes "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_factory)); diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index eb7c4e3..b7f6937 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -81,12 +81,6 @@ static gboolean gst_wavparse_sink_event (GstPad * pad, GstEvent * event); static void gst_wavparse_loop (GstPad * pad); static gboolean gst_wavparse_srcpad_event (GstPad * pad, GstEvent * event); -static const GstElementDetails gst_wavparse_details = -GST_ELEMENT_DETAILS ("WAV audio demuxer", - "Codec/Demuxer/Audio", - "Parse a .wav file into raw audio", - "Erik Walthinsen "); - static GstStaticPadTemplate sink_template_factory = GST_STATIC_PAD_TEMPLATE ("wavparse_sink", GST_PAD_SINK, @@ -115,7 +109,10 @@ gst_wavparse_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, src_template); gst_object_unref (src_template); - gst_element_class_set_details (element_class, &gst_wavparse_details); + gst_element_class_set_details_simple (element_class, "WAV audio demuxer", + "Codec/Demuxer/Audio", + "Parse a .wav file into raw audio", + "Erik Walthinsen "); } static void diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c index 2bdf864..e8975ef 100644 --- a/gst/y4m/gsty4mencode.c +++ b/gst/y4m/gsty4mencode.c @@ -47,13 +47,6 @@ #include #include "gsty4mencode.h" -static const GstElementDetails y4mencode_details = -GST_ELEMENT_DETAILS ("YUV4MPEG video encoder", - "Codec/Encoder/Video", - "Encodes a YUV frame into the yuv4mpeg format (mjpegtools)", - "Wim Taymans "); - - /* Filter signals and args */ enum { @@ -105,7 +98,10 @@ gst_y4m_encode_base_init (gpointer g_class) gst_static_pad_template_get (&y4mencode_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&y4mencode_sink_factory)); - gst_element_class_set_details (element_class, &y4mencode_details); + gst_element_class_set_details_simple (element_class, "YUV4MPEG video encoder", + "Codec/Encoder/Video", + "Encodes a YUV frame into the yuv4mpeg format (mjpegtools)", + "Wim Taymans "); } static void diff --git a/sys/directsound/gstdirectsoundsink.c b/sys/directsound/gstdirectsoundsink.c index 134012a..ae31bab 100644 --- a/sys/directsound/gstdirectsoundsink.c +++ b/sys/directsound/gstdirectsoundsink.c @@ -57,13 +57,6 @@ GST_DEBUG_CATEGORY_STATIC (directsoundsink_debug); -/* elementfactory information */ -static const GstElementDetails gst_directsound_sink_details = -GST_ELEMENT_DETAILS ("Direct Sound Audio Sink", - "Sink/Audio", - "Output to a sound card via Direct Sound", - "Sebastien Moutte "); - static void gst_directsound_sink_base_init (gpointer g_class); static void gst_directsound_sink_class_init (GstDirectSoundSinkClass * klass); static void gst_directsound_sink_init (GstDirectSoundSink * dsoundsink, @@ -255,7 +248,10 @@ gst_directsound_sink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_directsound_sink_details); + gst_element_class_set_details_simple (element_class, + "Direct Sound Audio Sink", "Sink/Audio", + "Output to a sound card via Direct Sound", + "Sebastien Moutte "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&directsoundsink_sink_factory)); } diff --git a/sys/oss/gstossmixerelement.c b/sys/oss/gstossmixerelement.c index 0988e36..a32ec95 100644 --- a/sys/oss/gstossmixerelement.c +++ b/sys/oss/gstossmixerelement.c @@ -52,14 +52,6 @@ enum PROP_DEVICE_NAME }; - -static const GstElementDetails gst_oss_mixer_element_details = -GST_ELEMENT_DETAILS ("OSS Mixer", - "Generic/Audio", - "Control sound input and output levels with OSS", - "Andrew Vander Wingo "); - - GST_BOILERPLATE_WITH_INTERFACE (GstOssMixerElement, gst_oss_mixer_element, GstElement, GST_TYPE_ELEMENT, GstMixer, GST_TYPE_MIXER, gst_oss_mixer_element); @@ -78,8 +70,10 @@ static void gst_oss_mixer_element_finalize (GObject * object); static void gst_oss_mixer_element_base_init (gpointer klass) { - gst_element_class_set_details (GST_ELEMENT_CLASS (klass), - &gst_oss_mixer_element_details); + gst_element_class_set_details_simple (GST_ELEMENT_CLASS (klass), "OSS Mixer", + "Generic/Audio", + "Control sound input and output levels with OSS", + "Andrew Vander Wingo "); } static void diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index d673129..7dc7e32 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -73,14 +73,6 @@ GST_DEBUG_CATEGORY_EXTERN (oss_debug); #define GST_CAT_DEFAULT oss_debug -/* elementfactory information */ -static const GstElementDetails gst_oss_sink_details = -GST_ELEMENT_DETAILS ("Audio Sink (OSS)", - "Sink/Audio", - "Output to a sound card via OSS", - "Erik Walthinsen , " - "Wim Taymans "); - static void gst_oss_sink_base_init (gpointer g_class); static void gst_oss_sink_class_init (GstOssSinkClass * klass); static void gst_oss_sink_init (GstOssSink * osssink); @@ -183,7 +175,11 @@ gst_oss_sink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_oss_sink_details); + gst_element_class_set_details_simple (element_class, "Audio Sink (OSS)", + "Sink/Audio", + "Output to a sound card via OSS", + "Erik Walthinsen , " + "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&osssink_sink_factory)); diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index 2d7fd7b..5d04aa9 100644 --- a/sys/oss/gstosssrc.c +++ b/sys/oss/gstosssrc.c @@ -67,12 +67,6 @@ GST_DEBUG_CATEGORY_EXTERN (oss_debug); #define GST_CAT_DEFAULT oss_debug -static const GstElementDetails gst_oss_src_details = -GST_ELEMENT_DETAILS ("Audio Source (OSS)", - "Source/Audio", - "Capture from a sound card via OSS", - "Erik Walthinsen , " "Wim Taymans "); - #define DEFAULT_DEVICE "/dev/dsp" #define DEFAULT_DEVICE_NAME "" @@ -137,7 +131,10 @@ gst_oss_src_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_oss_src_details); + gst_element_class_set_details_simple (element_class, "Audio Source (OSS)", + "Source/Audio", + "Capture from a sound card via OSS", + "Erik Walthinsen , " "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&osssrc_src_factory)); diff --git a/sys/osxaudio/gstosxaudiosink.c b/sys/osxaudio/gstosxaudiosink.c index 9447e65..24c9120 100644 --- a/sys/osxaudio/gstosxaudiosink.c +++ b/sys/osxaudio/gstosxaudiosink.c @@ -74,12 +74,6 @@ GST_DEBUG_CATEGORY_STATIC (osx_audiosink_debug); #define GST_CAT_DEFAULT osx_audiosink_debug -static GstElementDetails gst_osx_audio_sink_details = -GST_ELEMENT_DETAILS ("Audio Sink (OSX)", - "Sink/Audio", - "Output to a sound card in OS X", - "Zaheer Abbas Merali "); - /* Filter signals and args */ enum { @@ -151,7 +145,10 @@ gst_osx_audio_sink_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details (element_class, &gst_osx_audio_sink_details); + gst_element_class_set_details_simple (element_class, "Audio Sink (OSX)", + "Sink/Audio", + "Output to a sound card in OS X", + "Zaheer Abbas Merali "); } static void diff --git a/sys/osxaudio/gstosxaudiosrc.c b/sys/osxaudio/gstosxaudiosrc.c index 9df46dc..b7c8c6d 100644 --- a/sys/osxaudio/gstosxaudiosrc.c +++ b/sys/osxaudio/gstosxaudiosrc.c @@ -68,12 +68,6 @@ GST_DEBUG_CATEGORY_STATIC (osx_audiosrc_debug); #define GST_CAT_DEFAULT osx_audiosrc_debug -static GstElementDetails gst_osx_audio_src_details = -GST_ELEMENT_DETAILS ("Audio Source (OSX)", - "Source/Audio", - "Input from a sound card in OS X", - "Zaheer Abbas Merali "); - /* Filter signals and args */ enum { @@ -142,7 +136,10 @@ gst_osx_audio_src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_factory)); - gst_element_class_set_details (element_class, &gst_osx_audio_src_details); + gst_element_class_set_details_simple (element_class, "Audio Source (OSX)", + "Source/Audio", + "Input from a sound card in OS X", + "Zaheer Abbas Merali "); } static void @@ -249,8 +246,7 @@ gst_osx_audio_src_get_caps (GstBaseSrc * src) if (min == max) { gst_caps_set_simple (caps, "channels", G_TYPE_INT, max, NULL); } else { - gst_caps_set_simple (caps, "channels", GST_TYPE_INT_RANGE, min, max, - NULL); + gst_caps_set_simple (caps, "channels", GST_TYPE_INT_RANGE, min, max, NULL); } return caps; diff --git a/sys/osxvideo/osxvideosink.m b/sys/osxvideo/osxvideosink.m index 6ef5483..e179876 100644 --- a/sys/osxvideo/osxvideosink.m +++ b/sys/osxvideo/osxvideosink.m @@ -45,12 +45,6 @@ GST_DEBUG_CATEGORY (gst_debug_osx_video_sink); #define GST_CAT_DEFAULT gst_debug_osx_video_sink -static const GstElementDetails gst_osx_video_sink_details = -GST_ELEMENT_DETAILS ("OSX Video sink", - "Sink/Video", - "OSX native videosink", - "Zaheer Abbas Merali "); - static GstStaticPadTemplate gst_osx_video_sink_sink_template_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -315,7 +309,9 @@ gst_osx_video_sink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_osx_video_sink_details); + gst_element_class_set_details_simple (element_class, "OSX Video sink", + "Sink/Video", "OSX native videosink", + "Zaheer Abbas Merali "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_osx_video_sink_sink_template_factory)); diff --git a/sys/sunaudio/gstsunaudiomixer.c b/sys/sunaudio/gstsunaudiomixer.c index f7dd0d9..7688450 100644 --- a/sys/sunaudio/gstsunaudiomixer.c +++ b/sys/sunaudio/gstsunaudiomixer.c @@ -32,12 +32,6 @@ #include "gstsunaudiomixer.h" -static const GstElementDetails gst_sunaudiomixer_details = -GST_ELEMENT_DETAILS ("Sun Audio Mixer", - "Generic/Audio", - "Control sound input and output levels with Sun Audio", - "Brian Cameron "); - GST_BOILERPLATE_WITH_INTERFACE (GstSunAudioMixer, gst_sunaudiomixer, GstElement, GST_TYPE_ELEMENT, GstMixer, GST_TYPE_MIXER, gst_sunaudiomixer); @@ -49,8 +43,10 @@ static GstStateChangeReturn gst_sunaudiomixer_change_state (GstElement * static void gst_sunaudiomixer_base_init (gpointer klass) { - gst_element_class_set_details (GST_ELEMENT_CLASS (klass), - &gst_sunaudiomixer_details); + gst_element_class_set_details_simple (GST_ELEMENT_CLASS (klass), + "Sun Audio Mixer", "Generic/Audio", + "Control sound input and output levels with Sun Audio", + "Brian Cameron "); } static void diff --git a/sys/sunaudio/gstsunaudiosink.c b/sys/sunaudio/gstsunaudiosink.c index 2dd56c2..145768a 100644 --- a/sys/sunaudio/gstsunaudiosink.c +++ b/sys/sunaudio/gstsunaudiosink.c @@ -50,14 +50,6 @@ GST_DEBUG_CATEGORY_EXTERN (sunaudio_debug); #define GST_CAT_DEFAULT sunaudio_debug -/* elementfactory information */ -static const GstElementDetails plugin_details = -GST_ELEMENT_DETAILS ("Sun Audio Sink", - "Sink/Audio", - "Audio sink for Sun Audio devices", - "David A. Schleef , " - "Brian Cameron "); - static void gst_sunaudiosink_base_init (gpointer g_class); static void gst_sunaudiosink_class_init (GstSunAudioSinkClass * klass); static void gst_sunaudiosink_init (GstSunAudioSink * filter); @@ -156,7 +148,11 @@ gst_sunaudiosink_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_sunaudiosink_factory)); - gst_element_class_set_details (element_class, &plugin_details); + gst_element_class_set_details_simple (element_class, "Sun Audio Sink", + "Sink/Audio", + "Audio sink for Sun Audio devices", + "David A. Schleef , " + "Brian Cameron "); } static void diff --git a/sys/sunaudio/gstsunaudiosrc.c b/sys/sunaudio/gstsunaudiosrc.c index 023b099..91d2929 100644 --- a/sys/sunaudio/gstsunaudiosrc.c +++ b/sys/sunaudio/gstsunaudiosrc.c @@ -50,12 +50,6 @@ GST_DEBUG_CATEGORY_EXTERN (sunaudio_debug); #define GST_CAT_DEFAULT sunaudio_debug -static GstElementDetails plugin_details = -GST_ELEMENT_DETAILS ("Sun Audio Source", - "Source/Audio", - "Audio source for Sun Audio devices", - "Brian Cameron "); - static void gst_sunaudiosrc_base_init (gpointer g_class); static void gst_sunaudiosrc_class_init (GstSunAudioSrcClass * klass); static void gst_sunaudiosrc_init (GstSunAudioSrc * sunaudiosrc, @@ -116,7 +110,10 @@ gst_sunaudiosrc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_sunaudiosrc_factory)); - gst_element_class_set_details (element_class, &plugin_details); + gst_element_class_set_details_simple (element_class, "Sun Audio Source", + "Source/Audio", + "Audio source for Sun Audio devices", + "Brian Cameron "); } static void diff --git a/sys/v4l2/gstv4l2sink.c b/sys/v4l2/gstv4l2sink.c index 26773be..966194b 100644 --- a/sys/v4l2/gstv4l2sink.c +++ b/sys/v4l2/gstv4l2sink.c @@ -53,13 +53,6 @@ #include - -static const GstElementDetails gst_v4l2sink_details = -GST_ELEMENT_DETAILS ("Video (video4linux2) Sink", - "Sink/Video", - "Displays frames on a video4linux2 device", - "Rob Clark ,"); - GST_DEBUG_CATEGORY (v4l2sink_debug); #define GST_CAT_DEFAULT v4l2sink_debug @@ -201,7 +194,9 @@ gst_v4l2sink_base_init (gpointer g_class) GST_DEBUG_CATEGORY_INIT (v4l2sink_debug, "v4l2sink", 0, "V4L2 sink element"); - gst_element_class_set_details (gstelement_class, &gst_v4l2sink_details); + gst_element_class_set_details_simple (gstelement_class, + "Video (video4linux2) Sink", "Sink/Video", + "Displays frames on a video4linux2 device", "Rob Clark ,"); gst_element_class_add_pad_template (gstelement_class, diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 81346d7..331fa75 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -58,13 +58,6 @@ #include "gst/gst-i18n-plugin.h" -static const GstElementDetails gst_v4l2src_details = -GST_ELEMENT_DETAILS ("Video (video4linux2) Source", - "Source/Video", - "Reads frames from a video4linux2 (BT8x8) device", - "Edgard Lima ," - " Stefan Kost "); - GST_DEBUG_CATEGORY (v4l2src_debug); #define GST_CAT_DEFAULT v4l2src_debug @@ -228,7 +221,11 @@ gst_v4l2src_base_init (gpointer g_class) GST_DEBUG_CATEGORY_INIT (v4l2src_debug, "v4l2src", 0, "V4L2 source element"); - gst_element_class_set_details (gstelement_class, &gst_v4l2src_details); + gst_element_class_set_details_simple (gstelement_class, + "Video (video4linux2) Source", "Source/Video", + "Reads frames from a video4linux2 (BT8x8) device", + "Edgard Lima ," + " Stefan Kost "); gst_element_class_add_pad_template (gstelement_class, diff --git a/sys/waveform/gstwaveformsink.c b/sys/waveform/gstwaveformsink.c index 35a1fbc..ea649f5 100644 --- a/sys/waveform/gstwaveformsink.c +++ b/sys/waveform/gstwaveformsink.c @@ -49,13 +49,6 @@ GST_DEBUG_CATEGORY_STATIC (waveformsink_debug); -/* elementfactory information */ -static const GstElementDetails gst_waveform_sink_details = -GST_ELEMENT_DETAILS ("WaveForm Audio Sink", - "Sink/Audio", - "Output to a sound card via WaveForm API", - "Sebastien Moutte "); - static void gst_waveform_sink_base_init (gpointer g_class); static void gst_waveform_sink_class_init (GstWaveFormSinkClass * klass); static void gst_waveform_sink_init (GstWaveFormSink * wfsink, @@ -113,7 +106,10 @@ gst_waveform_sink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_waveform_sink_details); + gst_element_class_set_details_simple (element_class, "WaveForm Audio Sink", + "Sink/Audio", + "Output to a sound card via WaveForm API", + "Sebastien Moutte "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&waveformsink_sink_factory)); } diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c index e6fbe2f..6db4c85 100644 --- a/sys/ximage/gstximagesrc.c +++ b/sys/ximage/gstximagesrc.c @@ -52,15 +52,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_debug_ximage_src); #define GST_CAT_DEFAULT gst_debug_ximage_src -/* elementfactory information */ -static const GstElementDetails ximagesrc_details = -GST_ELEMENT_DETAILS ("Ximage video source", - "Source/Video", - "Creates a screenshot video stream", - "Lutz Mueller , " - "Jan Schmidt , " - "Zaheer Merali "); - static GstStaticPadTemplate t = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-raw-rgb, " @@ -898,7 +889,12 @@ gst_ximage_src_base_init (gpointer g_class) { GstElementClass *ec = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (ec, &ximagesrc_details); + gst_element_class_set_details_simple (ec, "Ximage video source", + "Source/Video", + "Creates a screenshot video stream", + "Lutz Mueller , " + "Jan Schmidt , " + "Zaheer Merali "); gst_element_class_add_pad_template (ec, gst_static_pad_template_get (&t)); }