From 775c7584fdad53053ae5b22bb19074cc6022ee98 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 18 Mar 2010 17:30:26 +0100 Subject: [PATCH] gst_element_class_set_details => gst_element_class_set_details_simple --- ext/alsaspdif/alsaspdifsink.c | 15 +++---- ext/amrwbenc/gstamrwbenc.c | 9 ++--- ext/arts/gst_arts.c | 13 ++----- ext/artsd/gstartsdsink.c | 12 ++---- ext/audiofile/gstafparse.c | 13 ++----- ext/audiofile/gstafparse.h | 3 -- ext/audiofile/gstafsink.c | 13 ++----- ext/audiofile/gstafsink.h | 3 -- ext/audiofile/gstafsrc.c | 13 ++----- ext/audiofile/gstafsrc.h | 3 -- ext/audioresample/gstaudioresample.c | 11 ++---- ext/cdaudio/gstcdaudio.c | 11 ++---- ext/celt/gstceltenc.c | 6 --- ext/cog/gstcogcolorspace.c | 10 ++--- ext/cog/gstcogdownsample.c | 11 +++--- ext/cog/gstcogfilter.c | 10 ++--- ext/cog/gstcogmse.c | 8 +--- ext/cog/gstcogscale.c | 12 ++---- ext/cog/gstcolorconvert.c | 10 ++--- ext/cog/gstlogoinsert.c | 10 ++--- ext/dc1394/gstdc1394.c | 11 ++---- ext/dirac/gstdiracdec.cc | 23 +++++------ ext/dirac/gstdiracenc.cc | 10 ++--- ext/directfb/dfbvideosink.c | 15 +++---- ext/divx/gstdivxdec.c | 12 ++---- ext/divx/gstdivxenc.c | 12 ++---- ext/dts/gstdtsdec.c | 13 +++---- ext/faac/gstfaac.c | 11 ++---- ext/faad/gstfaad.c | 11 ++---- ext/flite/gstflitetestsrc.c | 11 ++---- ext/gsm/gstgsmdec.c | 11 ++---- ext/gsm/gstgsmenc.c | 11 ++---- ext/hermes/gsthermescolorspace.c | 16 +++----- ext/jack/gstjackaudiosink.c | 10 +---- ext/jack/gstjackaudiosrc.c | 11 ++---- ext/jp2k/gstjasperdec.c | 11 ++---- ext/jp2k/gstjasperenc.c | 11 ++---- ext/kate/gstkatedec.c | 11 +++--- ext/kate/gstkateenc.c | 11 +++--- ext/kate/gstkateparse.c | 11 ++---- ext/kate/gstkatetag.c | 11 ++---- ext/kate/gstkatetiger.c | 11 +++--- ext/ladspa/gstladspa.c | 41 +++++++++----------- ext/lcs/gstcolorspace.c | 13 ++----- ext/libfame/gstlibfame.c | 12 ++---- ext/libmms/gstmms.c | 11 ++---- ext/lv2/gstlv2.c | 26 ++++++------- ext/metadata/gstmetadatademux.c | 15 +++---- ext/metadata/gstmetadatamux.c | 13 +++---- ext/mimic/gstmimdec.c | 18 ++++----- ext/mimic/gstmimenc.c | 11 ++---- ext/musicbrainz/gsttrm.c | 11 ++---- ext/mythtv/gstmythtvsrc.c | 15 +++---- ext/nas/nassink.c | 13 +++---- ext/neon/gstneonhttpsrc.c | 15 +++---- ext/polyp/polypsink.c | 9 +---- ext/resindvd/gstmpegdemux.c | 12 ++---- ext/resindvd/resindvdbin.c | 11 ++---- ext/resindvd/resindvdsrc.c | 10 ++--- ext/resindvd/rsnaudiomunge.c | 10 ++--- ext/resindvd/rsnparsetter.c | 12 +++--- ext/resindvd/rsnstreamselector.c | 16 +++----- ext/schroedinger/gstschrodec.c | 10 ++--- ext/schroedinger/gstschroenc.c | 10 ++--- ext/schroedinger/gstschroparse.c | 10 ++--- ext/sdl/sdlaudiosink.c | 13 +++---- ext/sdl/sdlvideosink.c | 16 +++----- ext/shout/gstshout.c | 12 ++---- ext/snapshot/gstsnapshot.c | 11 ++---- ext/sndfile/gstsfsink.c | 12 ++---- ext/sndfile/gstsfsrc.c | 12 ++---- ext/spc/gstspc.c | 11 ++---- ext/swfdec/gstswfdec.c | 16 +++----- ext/tarkin/gsttarkindec.c | 12 ++---- ext/tarkin/gsttarkinenc.c | 12 ++---- ext/theora/theoradec.c | 13 +++---- ext/timidity/gsttimidity.c | 10 ++--- ext/timidity/gstwildmidi.c | 10 ++--- ext/xvid/gstxviddec.c | 12 ++---- ext/xvid/gstxvidenc.c | 12 ++---- ext/zbar/gstzbar.c | 11 ++---- gst-libs/gst/app/gstappsink.c | 11 ++---- gst-libs/gst/app/gstappsrc.c | 11 +++--- gst/adpcmdec/adpcmdec.c | 11 ++---- gst/adpcmenc/adpcmenc.c | 11 ++---- gst/asfmux/gstasfmux.c | 11 ++---- gst/asfmux/gstasfparse.c | 9 +---- gst/asfmux/gstrtpasfpay.c | 12 ++---- gst/audiobuffer/gstaudioringbuffer.c | 11 ++---- gst/audioparsers/gstaacparse.c | 8 ++-- gst/audioparsers/gstamrparse.c | 9 ++--- gst/bayer/gstbayer2rgb.c | 11 ++---- gst/camerabin/camerabinimage.c | 13 +++---- gst/camerabin/camerabinvideo.c | 13 +++---- gst/camerabin/gstcamerabin.c | 13 +++---- gst/cdxaparse/gstcdxaparse.c | 6 +-- gst/chart/gstchart.c | 13 ++----- gst/colorspace/gstcolorspace.c | 10 ++--- gst/dccp/gstdccpclientsink.c | 11 ++---- gst/dccp/gstdccpclientsrc.c | 11 ++---- gst/dccp/gstdccpserversink.c | 12 ++---- gst/dccp/gstdccpserversrc.c | 11 ++---- gst/debugutils/fpsdisplaysink.c | 12 ++---- gst/debugutils/gstcapssetter.c | 11 ++---- gst/dtmf/gstdtmfdetect.c | 13 ++----- gst/dtmf/gstdtmfsrc.c | 12 ++---- gst/dtmf/gstrtpdtmfdepay.c | 12 ++---- gst/dtmf/gstrtpdtmfsrc.c | 11 ++---- gst/dvdspu/gstdvdspu.c | 12 +++--- gst/festival/gstfestival.c | 12 ++---- gst/filter/gstiir.c | 15 +++---- gst/freeze/gstfreeze.c | 14 +++---- gst/games/gstpuzzle.c | 11 +++--- gst/h264parse/gsth264parse.c | 13 +++---- gst/hdvparse/gsthdvparse.c | 11 ++---- gst/invtelecine/gstinvtelecine.c | 9 ++--- gst/legacyresample/gstlegacyresample.c | 11 ++---- gst/librfb/gstrfbsrc.c | 15 +++---- gst/liveadder/liveadder.c | 13 ++----- gst/mixmatrix/mixmatrix.c | 13 +++---- gst/mpeg1sys/gstmpeg1systemencode.c | 13 ++----- gst/mpeg4videoparse/mpeg4videoparse.c | 12 ++---- gst/mpegdemux/gstmpegdemux.c | 12 ++---- gst/mpegdemux/gstmpegtsdemux.c | 19 ++++----- gst/mpegdemux/mpegtsparse.c | 13 +++---- gst/mpegpsmux/mpegpsmux.c | 12 +++--- gst/mpegtsmux/mpegtsmux.c | 12 +++--- gst/mpegvideoparse/mpegvideoparse.c | 15 +++---- gst/mve/gstmvedemux.c | 12 +++--- gst/mve/gstmvemux.c | 10 ++--- gst/nsf/gstnsf.c | 11 ++---- gst/nuvdemux/gstnuvdemux.c | 13 +++---- gst/overlay/gstoverlay.c | 11 ++---- gst/passthrough/gstpassthrough.c | 12 ++---- gst/pcapparse/gstpcapparse.c | 11 ++---- gst/playondemand/gstplayondemand.c | 13 ++----- gst/qtmux/gstqtmoovrecover.c | 9 ++--- gst/qtmux/gstqtmux.c | 18 ++++----- gst/real/gstrealaudiodec.c | 9 ++--- gst/real/gstrealvideodec.c | 9 ++--- gst/rtjpeg/gstrtjpegdec.c | 13 ++----- gst/rtjpeg/gstrtjpegenc.c | 11 ++---- gst/rtpmux/gstrtpdtmfmux.c | 12 ++---- gst/rtpmux/gstrtpmux.c | 11 ++---- gst/scaletempo/gstscaletempo.c | 12 +++--- gst/sdp/gstsdpdemux.c | 20 ++++------ gst/selector/gstinputselector.c | 14 +++---- gst/selector/gstoutputselector.c | 11 ++---- gst/siren/gstsirendec.c | 13 ++----- gst/siren/gstsirenenc.c | 13 ++----- gst/smooth/gstsmooth.c | 13 ++----- gst/smoothwave/gstsmoothwave.c | 12 ++---- gst/speed/gstspeed.c | 15 +++---- gst/stereo/gststereo.c | 14 ++----- gst/tta/gstttadec.c | 10 ++--- gst/tta/gstttaparse.c | 10 ++--- gst/valve/gstvalve.c | 13 ++----- gst/vbidec/gstvbidec.c | 13 +++---- gst/videodrop/gstvideodrop.c | 13 +++---- gst/videomeasure/gstvideomeasure_collector.c | 11 ++---- gst/videosignal/gstvideoanalyse.c | 10 ++--- gst/videosignal/gstvideodetect.c | 10 ++--- gst/videosignal/gstvideomark.c | 10 ++--- gst/vmnc/vmncdec.c | 11 ++---- sys/acmenc/acmenc.c | 18 ++++----- sys/acmmp3dec/acmmp3dec.c | 11 ++---- sys/cdrom/gstcdplayer.c | 15 +++---- sys/directdraw/gstdirectdrawsink.c | 18 ++++----- sys/directsound/gstdirectsoundsrc.c | 11 ++---- sys/dshowdecwrapper/gstdshowaudiodec.cpp | 20 ++++------ sys/dshowdecwrapper/gstdshowvideodec.cpp | 18 ++++----- sys/dshowsrcwrapper/gstdshowaudiosrc.cpp | 11 ++---- sys/dshowsrcwrapper/gstdshowvideosrc.cpp | 11 ++---- sys/dshowvideosink/dshowvideosink.cpp | 13 +++---- sys/dvb/dvbbasebin.c | 10 ++--- sys/dvb/gstdvbsrc.c | 15 +++---- sys/dxr3/dxr3audiosink.c | 15 ++----- sys/dxr3/dxr3spusink.c | 15 ++----- sys/dxr3/dxr3videosink.c | 15 ++----- sys/fbdev/gstfbdevsink.c | 11 ++---- sys/osxvideo/osxvideosrc.c | 13 +++---- sys/qcam/gstqcamsrc.c | 13 +++---- sys/qtwrapper/audiodecoders.c | 18 ++++----- sys/qtwrapper/videodecoders.c | 18 ++++----- sys/vcd/vcdsrc.c | 10 ++--- sys/wasapi/gstwasapisink.c | 11 ++---- sys/wasapi/gstwasapisrc.c | 11 ++---- sys/winks/gstksvideosrc.c | 13 +++---- sys/winscreencap/gstdx9screencapsrc.c | 18 ++++----- sys/winscreencap/gstgdiscreencapsrc.c | 11 ++---- 190 files changed, 828 insertions(+), 1504 deletions(-) diff --git a/ext/alsaspdif/alsaspdifsink.c b/ext/alsaspdif/alsaspdifsink.c index 63cee2ec78..1ef16025d9 100644 --- a/ext/alsaspdif/alsaspdifsink.c +++ b/ext/alsaspdif/alsaspdifsink.c @@ -70,15 +70,6 @@ GST_DEBUG_CATEGORY_STATIC (alsaspdifsink_debug); (((GstClockTime) AC3_RATE * (time)) / GST_SECOND) #endif -/* ElementFactory information. */ -static GstElementDetails alsaspdifsink_details = { - "S/PDIF ALSA audiosink", - "Sink/Audio", - "Feeds audio to S/PDIF interfaces through the ALSA sound driver", - "Martin Soto \n" - "Michael Smith " -}; - /* AlsaSPDIFSink signals and args */ enum { @@ -141,7 +132,11 @@ alsaspdifsink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &alsaspdifsink_details); + gst_element_class_set_details_simple (element_class, "S/PDIF ALSA audiosink", + "Sink/Audio", + "Feeds audio to S/PDIF interfaces through the ALSA sound driver", + "Martin Soto , " + "Michael Smith "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&alsaspdifsink_sink_factory)); } diff --git a/ext/amrwbenc/gstamrwbenc.c b/ext/amrwbenc/gstamrwbenc.c index f9587cc509..2f0190c5a2 100644 --- a/ext/amrwbenc/gstamrwbenc.c +++ b/ext/amrwbenc/gstamrwbenc.c @@ -178,17 +178,16 @@ static void gst_amrwbenc_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - GstElementDetails details = GST_ELEMENT_DETAILS ("AMR-WB audio encoder", - "Codec/Encoder/Audio", - "Adaptive Multi-Rate Wideband audio encoder", - "Renato Araujo "); gst_element_class_add_pad_template (element_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, &details); + gst_element_class_set_details_simple (element_class, "AMR-WB audio encoder", + "Codec/Encoder/Audio", + "Adaptive Multi-Rate Wideband audio encoder", + "Renato Araujo "); } static void diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c index aa6c186669..90742289db 100644 --- a/ext/arts/gst_arts.c +++ b/ext/arts/gst_arts.c @@ -42,14 +42,6 @@ #include "gst_arts.h" #include "gst_artsio_impl.h" -/* elementfactory information */ -static const GstElementDetails gst_arts_details = -GST_ELEMENT_DETAILS ("aRts plugin", - "Filter/Audio", - "aRts wrapper filter", - "Erik Walthinsen "); - static GstStaticPadTemplate sink_temp = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -123,7 +115,10 @@ gst_arts_base_init (gpointer g_class) gst_static_pad_template_get (&sink_temp)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_temp)); - gst_element_class_set_details (element_class, &gst_arts_details); + gst_element_class_set_details_simple (element_class, "aRts plugin", + "Filter/Audio", "aRts wrapper filter", + "Erik Walthinsen "); } static void diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c index 5cc2c8ad89..4ab92611dc 100644 --- a/ext/artsd/gstartsdsink.c +++ b/ext/artsd/gstartsdsink.c @@ -26,13 +26,6 @@ #include "gstartsdsink.h" #include -/* elementfactory information */ -static const GstElementDetails artsdsink_details = -GST_ELEMENT_DETAILS ("aRtsd audio sink", - "Sink/Audio", - "Plays audio to an aRts server", - "Richard Boulton ",); - /* Signals and args */ enum { @@ -106,7 +99,10 @@ gst_artsdsink_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, &artsdsink_details); + gst_element_class_set_details_simple (element_class, "aRtsd audio sink", + "Sink/Audio", + "Plays audio to an aRts server", + "Richard Boulton "); } static void diff --git a/ext/audiofile/gstafparse.c b/ext/audiofile/gstafparse.c index ca786a936a..27b5a6e8c8 100644 --- a/ext/audiofile/gstafparse.c +++ b/ext/audiofile/gstafparse.c @@ -29,14 +29,6 @@ #include #include "gstafparse.h" -/* elementfactory information */ -static const GstElementDetails afparse_details = -GST_ELEMENT_DETAILS ("Audiofile demuxer", - "Codec/Demuxer/Audio", - "Audiofile parser for audio/raw", - "Steve Baker "); - - /* AFParse signals and args */ enum { @@ -127,7 +119,10 @@ gst_afparse_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&afparse_sink_factory)); - gst_element_class_set_details (element_class, &afparse_details); + gst_element_class_set_details_simple (element_class, "Audiofile demuxer", + "Codec/Demuxer/Audio", + "Audiofile parser for audio/raw", + "Steve Baker "); } static void diff --git a/ext/audiofile/gstafparse.h b/ext/audiofile/gstafparse.h index bece512695..3d9f614484 100644 --- a/ext/audiofile/gstafparse.h +++ b/ext/audiofile/gstafparse.h @@ -36,9 +36,6 @@ extern "C" { #endif /* __cplusplus */ -/*GstElementDetails gst_afparse_details;*/ - - #define GST_TYPE_AFPARSE \ (gst_afparse_get_type()) #define GST_AFPARSE(obj) \ diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c index 68ee3bb594..8a24075e47 100644 --- a/ext/audiofile/gstafsink.c +++ b/ext/audiofile/gstafsink.c @@ -33,14 +33,6 @@ #include "gstafsink.h" -/* elementfactory information */ -static const GstElementDetails afsink_details = -GST_ELEMENT_DETAILS ("Audiofile sink", - "Sink/Audio", - "Write audio streams to disk using libaudiofile", - "Thomas Vander Stichele "); - - /* AFSink signals and args */ enum { @@ -148,7 +140,10 @@ gst_afsink_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&afsink_sink_factory)); - gst_element_class_set_details (element_class, &afsink_details); + gst_element_class_set_details_simple (element_class, "Audiofile sink", + "Sink/Audio", + "Write audio streams to disk using libaudiofile", + "Thomas Vander Stichele "); } static void diff --git a/ext/audiofile/gstafsink.h b/ext/audiofile/gstafsink.h index 150e81d15e..358d43ca3a 100644 --- a/ext/audiofile/gstafsink.h +++ b/ext/audiofile/gstafsink.h @@ -34,9 +34,6 @@ extern "C" { #endif /* __cplusplus */ -/*GstElementDetails gst_afsink_details;*/ - - #define GST_TYPE_AFSINK \ (gst_afsink_get_type()) #define GST_AFSINK(obj) \ diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c index 87558b77b3..2a750a3784 100644 --- a/ext/audiofile/gstafsrc.c +++ b/ext/audiofile/gstafsrc.c @@ -33,14 +33,6 @@ #include "gstafsrc.h" -/* elementfactory information */ -static const GstElementDetails afsrc_details = -GST_ELEMENT_DETAILS ("Audiofile source", - "Source/Audio", - "Read audio files from disk using libaudiofile", - "Thomas "); - - /* AFSrc signals and args */ enum { @@ -145,7 +137,10 @@ gst_afsrc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&afsrc_src_factory)); - gst_element_class_set_details (element_class, &afsrc_details); + gst_element_class_set_details_simple (element_class, "Audiofile source", + "Source/Audio", + "Read audio files from disk using libaudiofile", + "Thomas "); } static void diff --git a/ext/audiofile/gstafsrc.h b/ext/audiofile/gstafsrc.h index 785a0a6897..f8f5fd8c3f 100644 --- a/ext/audiofile/gstafsrc.h +++ b/ext/audiofile/gstafsrc.h @@ -34,9 +34,6 @@ extern "C" { #endif /* __cplusplus */ -/*GstElementDetails gst_afsrc_details;*/ - - #define GST_TYPE_AFSRC \ (gst_afsrc_get_type()) #define GST_AFSRC(obj) \ diff --git a/ext/audioresample/gstaudioresample.c b/ext/audioresample/gstaudioresample.c index 8971824ae3..bcf10f29c7 100644 --- a/ext/audioresample/gstaudioresample.c +++ b/ext/audioresample/gstaudioresample.c @@ -33,13 +33,6 @@ GST_DEBUG_CATEGORY_STATIC (audioresample_debug); #define GST_CAT_DEFAULT audioresample_debug -/* elementfactory information */ -static const GstElementDetails gst_audioresample_details = -GST_ELEMENT_DETAILS ("Audio scaler", - "Filter/Converter/Audio", - "Resample audio", - "David Schleef "); - /* Audioresample signals and args */ enum { @@ -127,7 +120,9 @@ static void gst_audioresample_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&gst_audioresample_sink_template)); - gst_element_class_set_details (gstelement_class, &gst_audioresample_details); + gst_element_class_set_details_simple (gstelement_class, "Audio scaler", + "Filter/Converter/Audio", + "Resample audio", "David Schleef "); } static void gst_audioresample_class_init (AudioresampleClass * klass) diff --git a/ext/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c index ec99467102..8d1a15371a 100644 --- a/ext/cdaudio/gstcdaudio.c +++ b/ext/cdaudio/gstcdaudio.c @@ -115,13 +115,6 @@ static GstFormat sector_format; static GstElementClass *parent_class; static guint gst_cdaudio_signals[LAST_SIGNAL] = { 0 }; -static const GstElementDetails gst_cdaudio_details = -GST_ELEMENT_DETAILS ("CD player", - "Generic/Bin", - "Play CD audio through the CD Drive", - "Wim Taymans "); - - static void _do_init (GType cdaudio_type) { @@ -143,7 +136,9 @@ gst_cdaudio_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_cdaudio_details); + gst_element_class_set_details_simple (element_class, "CD player", + "Generic/Bin", + "Play CD audio through the CD Drive", "Wim Taymans "); /* Register the track and sector format */ track_format = gst_format_register ("track", "CD track"); diff --git a/ext/celt/gstceltenc.c b/ext/celt/gstceltenc.c index d984d99391..6324f3c3a5 100644 --- a/ext/celt/gstceltenc.c +++ b/ext/celt/gstceltenc.c @@ -72,12 +72,6 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", "channels = (int) [ 1, 2 ], " "frame-size = (int) [ 64, 512 ]") ); -static const GstElementDetails celtenc_details = -GST_ELEMENT_DETAILS ("Celt audio encoder", - "Codec/Encoder/Audio", - "Encodes audio in Celt format", - "Sebastian Dröge "); - #define DEFAULT_BITRATE 64 #define DEFAULT_FRAMESIZE 480 #define DEFAULT_CBR TRUE diff --git a/ext/cog/gstcogcolorspace.c b/ext/cog/gstcogcolorspace.c index ede5d53846..8d83fd22c8 100644 --- a/ext/cog/gstcogcolorspace.c +++ b/ext/cog/gstcogcolorspace.c @@ -122,11 +122,7 @@ GST_BOILERPLATE (GstCogcolorspace, gst_cogcolorspace, GstBaseTransform, static void gst_cogcolorspace_base_init (gpointer g_class) { - static GstElementDetails compress_details = - GST_ELEMENT_DETAILS ("YCbCr/RGB format conversion", - "Filter/Effect/Video", - "YCbCr/RGB format conversion", - "David Schleef "); + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -134,7 +130,9 @@ gst_cogcolorspace_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_cogcolorspace_sink_template)); - gst_element_class_set_details (element_class, &compress_details); + gst_element_class_set_details_simple (element_class, + "YCbCr/RGB format conversion", "Filter/Effect/Video", + "YCbCr/RGB format conversion", "David Schleef "); } static void diff --git a/ext/cog/gstcogdownsample.c b/ext/cog/gstcogdownsample.c index 0c9d60543b..16a81fef4d 100644 --- a/ext/cog/gstcogdownsample.c +++ b/ext/cog/gstcogdownsample.c @@ -139,11 +139,7 @@ gst_cogdownsample_get_type (void) static void gst_cogdownsample_base_init (gpointer g_class) { - static GstElementDetails compress_details = - GST_ELEMENT_DETAILS ("Downsample video", - "Filter/Effect/Video", - "Decreases size of video by a factor of 2", - "David Schleef "); + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -151,7 +147,10 @@ gst_cogdownsample_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_cogdownsample_sink_template)); - gst_element_class_set_details (element_class, &compress_details); + gst_element_class_set_details_simple (element_class, "Downsample video", + "Filter/Effect/Video", + "Decreases size of video by a factor of 2", + "David Schleef "); } static void diff --git a/ext/cog/gstcogfilter.c b/ext/cog/gstcogfilter.c index 78b4cf7446..5df885d44d 100644 --- a/ext/cog/gstcogfilter.c +++ b/ext/cog/gstcogfilter.c @@ -144,11 +144,7 @@ gst_cog_filter_get_type (void) static void gst_cog_filter_base_init (gpointer g_class) { - static GstElementDetails compress_details = - GST_ELEMENT_DETAILS ("Cog Video Filter", - "Filter/Effect/Video", - "Applies a cog pre-filter to video", - "David Schleef "); + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -156,7 +152,9 @@ gst_cog_filter_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_cog_filter_sink_template)); - gst_element_class_set_details (element_class, &compress_details); + gst_element_class_set_details_simple (element_class, "Cog Video Filter", + "Filter/Effect/Video", + "Applies a cog pre-filter to video", "David Schleef "); } static void diff --git a/ext/cog/gstcogmse.c b/ext/cog/gstcogmse.c index a7d5c9a4b3..d14fb1b9ba 100644 --- a/ext/cog/gstcogmse.c +++ b/ext/cog/gstcogmse.c @@ -74,11 +74,6 @@ struct _GstMSEClass GstElementClass parent; }; -static const GstElementDetails element_details = GST_ELEMENT_DETAILS ("FIXME", - "Filter/Effect", - "FIXME example filter", - "FIXME "); - enum { PROP_0, @@ -142,7 +137,8 @@ gst_mse_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_framestore_sink_test_template)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "FIXME", + "Filter/Effect", "FIXME example filter", "FIXME "); } static void diff --git a/ext/cog/gstcogscale.c b/ext/cog/gstcogscale.c index d44a494a7d..63bebf10dc 100644 --- a/ext/cog/gstcogscale.c +++ b/ext/cog/gstcogscale.c @@ -116,14 +116,6 @@ struct _GstCogScaleClass GType gst_cog_scale_get_type (void); - -/* elementfactory information */ -static const GstElementDetails cog_scale_details = -GST_ELEMENT_DETAILS ("Video scaler", - "Filter/Effect/Video", - "Resizes video", - "Wim Taymans "); - #define DEFAULT_QUALITY 5 enum @@ -222,7 +214,9 @@ gst_cog_scale_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &cog_scale_details); + gst_element_class_set_details_simple (element_class, "Video scaler", + "Filter/Effect/Video", + "Resizes video", "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_cog_scale_src_template)); diff --git a/ext/cog/gstcolorconvert.c b/ext/cog/gstcolorconvert.c index 9309ceb330..5b79e8e608 100644 --- a/ext/cog/gstcolorconvert.c +++ b/ext/cog/gstcolorconvert.c @@ -137,11 +137,7 @@ gst_colorconvert_get_type (void) static void gst_colorconvert_base_init (gpointer g_class) { - static GstElementDetails compress_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); gst_element_class_add_pad_template (element_class, @@ -149,7 +145,9 @@ gst_colorconvert_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_colorconvert_sink_template)); - gst_element_class_set_details (element_class, &compress_details); + gst_element_class_set_details_simple (element_class, "Video Filter Template", + "Filter/Effect/Video", + "Template for a video filter", "David Schleef "); } static void diff --git a/ext/cog/gstlogoinsert.c b/ext/cog/gstlogoinsert.c index 1822dd482a..cbf50df600 100644 --- a/ext/cog/gstlogoinsert.c +++ b/ext/cog/gstlogoinsert.c @@ -146,11 +146,7 @@ gst_logoinsert_get_type (void) static void gst_logoinsert_base_init (gpointer g_class) { - static GstElementDetails compress_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); gst_element_class_add_pad_template (element_class, @@ -158,7 +154,9 @@ gst_logoinsert_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_logoinsert_sink_template)); - gst_element_class_set_details (element_class, &compress_details); + gst_element_class_set_details_simple (element_class, "Video Filter Template", + "Filter/Effect/Video", + "Template for a video filter", "David Schleef "); } static void diff --git a/ext/dc1394/gstdc1394.c b/ext/dc1394/gstdc1394.c index 035522d020..4848b65b7b 100644 --- a/ext/dc1394/gstdc1394.c +++ b/ext/dc1394/gstdc1394.c @@ -43,12 +43,6 @@ GST_DEBUG_CATEGORY (dc1394_debug); #define GST_CAT_DEFAULT dc1394_debug -static GstElementDetails dc1394_details = -GST_ELEMENT_DETAILS ("1394 IIDC Video Source", - "Source/Video", - "libdc1394 based source, supports 1394 IIDC cameras", - "Antoine Tremblay "); - enum { PROP_0, @@ -112,7 +106,10 @@ gst_dc1394_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &dc1394_details); + gst_element_class_set_details_simple (element_class, "1394 IIDC Video Source", + "Source/Video", + "libdc1394 based source, supports 1394 IIDC cameras", + "Antoine Tremblay "); gst_element_class_add_pad_template (element_class, gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, diff --git a/ext/dirac/gstdiracdec.cc b/ext/dirac/gstdiracdec.cc index c883fd5fb8..597735b659 100644 --- a/ext/dirac/gstdiracdec.cc +++ b/ext/dirac/gstdiracdec.cc @@ -29,15 +29,6 @@ #include "gstdiracdec.h" -/* elementfactory information */ -static GstElementDetails gst_diracdec_details = { - "Dirac stream decoder", - "Codec/Decoder/Video", - "Decode DIRAC streams", - "David Schleef \n" - "Ronald Bultje ", -}; - GST_DEBUG_CATEGORY (diracdec_debug); #define GST_CAT_DEFAULT diracdec_debug @@ -116,7 +107,10 @@ gst_diracdec_base_init (gpointer g_class) gst_static_pad_template_get (&gst_diracdec_src_pad_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_diracdec_sink_pad_template)); - gst_element_class_set_details (element_class, &gst_diracdec_details); + gst_element_class_set_details_simple (element_class, "Dirac stream decoder", + "Codec/Decoder/Video", "Decode DIRAC streams", + "David Schleef , " + "Ronald Bultje "); } static void @@ -264,15 +258,16 @@ gst_diracdec_chain (GstPad * pad, GstData * _data) diracdec->decoder->seq_params.width, diracdec->decoder->seq_params.height, (gdouble) fps_num / (gdouble) fps_denom, - gst_diracdec_chroma_to_fourcc (diracdec->decoder->seq_params. - chroma))) { + gst_diracdec_chroma_to_fourcc (diracdec->decoder-> + seq_params.chroma))) { GST_ELEMENT_ERROR (diracdec, CORE, NEGOTIATION, (NULL), ("Failed to set caps to %dx%d @ %d fps (format=" GST_FOURCC_FORMAT "/%d)", diracdec->decoder->seq_params.width, diracdec->decoder->seq_params.height, diracdec->decoder->seq_params.frame_rate, - gst_diracdec_chroma_to_fourcc (diracdec->decoder->seq_params. - chroma), diracdec->decoder->seq_params.chroma)); + gst_diracdec_chroma_to_fourcc (diracdec->decoder-> + seq_params.chroma), + diracdec->decoder->seq_params.chroma)); c = FALSE; break; } diff --git a/ext/dirac/gstdiracenc.cc b/ext/dirac/gstdiracenc.cc index e09b977615..c54e7ec45b 100644 --- a/ext/dirac/gstdiracenc.cc +++ b/ext/dirac/gstdiracenc.cc @@ -207,11 +207,6 @@ GST_BOILERPLATE_FULL (GstDiracEnc, gst_dirac_enc, GstBaseVideoEncoder, static void gst_dirac_enc_base_init (gpointer g_class) { - static GstElementDetails dirac_enc_details = - GST_ELEMENT_DETAILS ((gchar *) "Dirac Encoder", - (gchar *) "Codec/Encoder/Video", - (gchar *) "Encode raw YUV video into Dirac stream", - (gchar *) "David Schleef "); GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -219,7 +214,10 @@ gst_dirac_enc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_dirac_enc_sink_template)); - gst_element_class_set_details (element_class, &dirac_enc_details); + gst_element_class_set_details_simple (element_class, "Dirac Encoder", + "Codec/Encoder/Video", + "Encode raw YUV video into Dirac stream", + "David Schleef "); } static void diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c index 707e9b0c22..f6d2617d06 100644 --- a/ext/directfb/dfbvideosink.c +++ b/ext/directfb/dfbvideosink.c @@ -99,13 +99,6 @@ GST_DEBUG_CATEGORY_STATIC (dfbvideosink_debug); #define GST_CAT_DEFAULT dfbvideosink_debug -/* ElementFactory information */ -static const GstElementDetails gst_dfbvideosink_details = -GST_ELEMENT_DETAILS ("DirectFB video sink", - "Sink/Video", - "A DirectFB based videosink", - "Julien Moutte "); - /* Default template */ static GstStaticPadTemplate gst_dfbvideosink_sink_template_factory = GST_STATIC_PAD_TEMPLATE ("sink", @@ -346,8 +339,8 @@ gst_dfbvideosink_event_thread (GstDfbVideoSink * dfbvideosink) while (dfbvideosink->running) { /* Wait for an event with a 50 ms timeout */ - dfbvideosink->event_buffer->WaitForEventWithTimeout (dfbvideosink-> - event_buffer, 0, 50); + dfbvideosink->event_buffer-> + WaitForEventWithTimeout (dfbvideosink->event_buffer, 0, 50); /* Do we have an event ? */ ret = dfbvideosink->event_buffer->HasEvent (dfbvideosink->event_buffer); @@ -2275,7 +2268,9 @@ gst_dfbvideosink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_dfbvideosink_details); + gst_element_class_set_details_simple (element_class, "DirectFB video sink", + "Sink/Video", + "A DirectFB based videosink", "Julien Moutte "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_dfbvideosink_sink_template_factory)); diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c index 1e4460edf8..2e9543c41e 100644 --- a/ext/divx/gstdivxdec.c +++ b/ext/divx/gstdivxdec.c @@ -25,13 +25,6 @@ #include "gstdivxdec.h" #include -/* elementfactory information */ -static const GstElementDetails gst_divxdec_details = -GST_ELEMENT_DETAILS ("Divx4linux video decoder", - "Codec/Decoder/Video", - "Divx decoder based on divxdecore", - "Ronald Bultje "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -142,7 +135,10 @@ gst_divxdec_base_init (GstDivxDecClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_divxdec_details); + gst_element_class_set_details_simple (element_class, + "Divx4linux video decoder", "Codec/Decoder/Video", + "Divx decoder based on divxdecore", + "Ronald Bultje "); } diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c index ab970ba7dc..0fab155013 100644 --- a/ext/divx/gstdivxenc.c +++ b/ext/divx/gstdivxenc.c @@ -26,13 +26,6 @@ #include #include -/* elementfactory information */ -static const GstElementDetails gst_divxenc_details = -GST_ELEMENT_DETAILS ("Divx4linux video encoder", - "Codec/Encoder/Video", - "Divx encoder based on divxencore", - "Ronald Bultje "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -153,7 +146,10 @@ gst_divxenc_base_init (GstDivxEncClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_divxenc_details); + gst_element_class_set_details_simple (element_class, + "Divx4linux video encoder", "Codec/Encoder/Video", + "Divx encoder based on divxencore", + "Ronald Bultje "); } diff --git a/ext/dts/gstdtsdec.c b/ext/dts/gstdtsdec.c index 8d026a43be..9f3ddf0b10 100644 --- a/ext/dts/gstdtsdec.c +++ b/ext/dts/gstdtsdec.c @@ -85,13 +85,6 @@ typedef struct dts_state_s dca_state_t; #include #include -static const GstElementDetails gst_dtsdec_details = -GST_ELEMENT_DETAILS ("DTS audio decoder", - "Codec/Decoder/Audio", - "Decodes DTS audio streams", - "Jan Schmidt \n" - "Ronald Bultje "); - #if defined(LIBDTS_FIXED) || defined(LIBDCA_FIXED) #define SAMPLE_WIDTH 16 #elif defined (LIBDTS_DOUBLE) || defined(LIBDCA_DOUBLE) @@ -158,7 +151,11 @@ gst_dtsdec_base_init (gpointer g_class) gst_static_pad_template_get (&sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_factory)); - gst_element_class_set_details (element_class, &gst_dtsdec_details); + gst_element_class_set_details_simple (element_class, "DTS audio decoder", + "Codec/Decoder/Audio", + "Decodes DTS audio streams", + "Jan Schmidt , " + "Ronald Bultje "); GST_DEBUG_CATEGORY_INIT (dtsdec_debug, "dtsdec", 0, "DTS/DCA audio decoder"); } diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c index 16c5fdce5a..85716db64c 100644 --- a/ext/faac/gstfaac.c +++ b/ext/faac/gstfaac.c @@ -91,12 +91,6 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS (SINK_CAPS)); -static const GstElementDetails gst_faac_details = -GST_ELEMENT_DETAILS ("AAC audio encoder", - "Codec/Encoder/Audio", - "Free MPEG-2/4 AAC encoder", - "Ronald Bultje "); - enum { ARG_0, @@ -184,7 +178,10 @@ gst_faac_base_init (GstFaacClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &gst_faac_details); + gst_element_class_set_details_simple (element_class, "AAC audio encoder", + "Codec/Encoder/Audio", + "Free MPEG-2/4 AAC encoder", + "Ronald Bultje "); GST_DEBUG_CATEGORY_INIT (faac_debug, "faac", 0, "AAC encoding"); } diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c index 15c993f711..5e4570095b 100644 --- a/ext/faad/gstfaad.c +++ b/ext/faad/gstfaad.c @@ -89,12 +89,6 @@ extern gint8 faacDecInit2 (faacDecHandle, guint8 *, guint32, GST_DEBUG_CATEGORY_STATIC (faad_debug); #define GST_CAT_DEFAULT faad_debug -static const GstElementDetails faad_details = -GST_ELEMENT_DETAILS ("AAC audio decoder", - "Codec/Decoder/Audio", - "Free MPEG-2/4 AAC decoder", - "Ronald Bultje "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -203,7 +197,10 @@ gst_faad_base_init (GstFaadClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &faad_details); + gst_element_class_set_details_simple (element_class, "AAC audio decoder", + "Codec/Decoder/Audio", + "Free MPEG-2/4 AAC decoder", + "Ronald Bultje "); GST_DEBUG_CATEGORY_INIT (faad_debug, "faad", 0, "AAC decoding"); } diff --git a/ext/flite/gstflitetestsrc.c b/ext/flite/gstflitetestsrc.c index 22340727bc..c8c4a1f798 100644 --- a/ext/flite/gstflitetestsrc.c +++ b/ext/flite/gstflitetestsrc.c @@ -72,12 +72,6 @@ GType gst_flite_test_src_get_type (void); GST_DEBUG_CATEGORY_STATIC (flite_test_src_debug); #define GST_CAT_DEFAULT flite_test_src_debug -static const GstElementDetails gst_flite_test_src_details = -GST_ELEMENT_DETAILS ("Flite speech test source", - "Source/Audio", - "Creates audio test signals identifying channels", - "David Schleef "); - #define DEFAULT_SAMPLES_PER_BUFFER 1024 enum @@ -126,7 +120,10 @@ gst_flite_test_src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_flite_test_src_src_template)); - gst_element_class_set_details (element_class, &gst_flite_test_src_details); + gst_element_class_set_details_simple (element_class, + "Flite speech test source", "Source/Audio", + "Creates audio test signals identifying channels", + "David Schleef "); } static void diff --git a/ext/gsm/gstgsmdec.c b/ext/gsm/gstgsmdec.c index f3a83904b3..facea23ceb 100644 --- a/ext/gsm/gstgsmdec.c +++ b/ext/gsm/gstgsmdec.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (gsmdec_debug); #define GST_CAT_DEFAULT (gsmdec_debug) -/* elementfactory information */ -static const GstElementDetails gst_gsmdec_details = -GST_ELEMENT_DETAILS ("GSM audio decoder", - "Codec/Decoder/Audio", - "Decodes GSM encoded audio", - "Philippe Khalaf "); - /* GSMDec signals and args */ enum { @@ -117,7 +110,9 @@ gst_gsmdec_base_init (gpointer g_class) gst_static_pad_template_get (&gsmdec_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gsmdec_src_template)); - gst_element_class_set_details (element_class, &gst_gsmdec_details); + gst_element_class_set_details_simple (element_class, "GSM audio decoder", + "Codec/Decoder/Audio", + "Decodes GSM encoded audio", "Philippe Khalaf "); } static void diff --git a/ext/gsm/gstgsmenc.c b/ext/gsm/gstgsmenc.c index ffd629a1fb..828334032c 100644 --- a/ext/gsm/gstgsmenc.c +++ b/ext/gsm/gstgsmenc.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (gsmenc_debug); #define GST_CAT_DEFAULT (gsmenc_debug) -/* elementfactory information */ -static const GstElementDetails gst_gsmenc_details = -GST_ELEMENT_DETAILS ("GSM audio encoder", - "Codec/Encoder/Audio", - "Encodes GSM audio", - "Philippe Khalaf "); - /* GSMEnc signals and args */ enum { @@ -111,7 +104,9 @@ gst_gsmenc_base_init (gpointer g_class) gst_static_pad_template_get (&gsmenc_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gsmenc_src_template)); - gst_element_class_set_details (element_class, &gst_gsmenc_details); + gst_element_class_set_details_simple (element_class, "GSM audio encoder", + "Codec/Encoder/Audio", + "Encodes GSM audio", "Philippe Khalaf "); } static void diff --git a/ext/hermes/gsthermescolorspace.c b/ext/hermes/gsthermescolorspace.c index fdf4f154a4..c46572c777 100644 --- a/ext/hermes/gsthermescolorspace.c +++ b/ext/hermes/gsthermescolorspace.c @@ -100,13 +100,6 @@ static GstHermesColorspaceFormat gst_hermes_colorspace_formats[] = { {GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB_16)}, }; -static const GstElementDetails colorspace_details = -GST_ELEMENT_DETAILS ("Colorspace converter", - "Filter/Converter/Video", - "Converts video from one colorspace to another using libhermes", - "Wim Taymans "); - - /* Stereo signals and args */ enum { @@ -387,8 +380,8 @@ gst_hermes_colorspace_link (GstPad * pad, const GstCaps * caps) GstCaps *fcaps; fcaps = - gst_caps_copy (gst_static_caps_get (&gst_hermes_colorspace_formats[i]. - caps)); + gst_caps_copy (gst_static_caps_get (&gst_hermes_colorspace_formats + [i].caps)); icaps = gst_caps_intersect (caps, fcaps); if (!gst_caps_is_empty (icaps)) { @@ -513,7 +506,10 @@ gst_hermes_colorspace_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_hermes_colorspace_sink_pad_template)); - gst_element_class_set_details (element_class, &colorspace_details); + gst_element_class_set_details_simple (element_class, "Colorspace converter", + "Filter/Converter/Video", + "Converts video from one colorspace to another using libhermes", + "Wim Taymans "); } static void diff --git a/ext/jack/gstjackaudiosink.c b/ext/jack/gstjackaudiosink.c index 0e75f16d25..40ee5a0fea 100644 --- a/ext/jack/gstjackaudiosink.c +++ b/ext/jack/gstjackaudiosink.c @@ -621,13 +621,6 @@ gst_jack_ring_buffer_delay (GstRingBuffer * buf) return res; } -/* elementfactory information */ -static const GstElementDetails gst_jack_audio_sink_details = -GST_ELEMENT_DETAILS ("Audio Sink (Jack)", - "Sink/Audio", - "Output to Jack", - "Wim Taymans "); - static GstStaticPadTemplate jackaudiosink_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -676,7 +669,8 @@ gst_jack_audio_sink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_jack_audio_sink_details); + gst_element_class_set_details_simple (element_class, "Audio Sink (Jack)", + "Sink/Audio", "Output to Jack", "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&jackaudiosink_sink_factory)); diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c index 211e1d2e6d..da97404fa8 100644 --- a/ext/jack/gstjackaudiosrc.c +++ b/ext/jack/gstjackaudiosrc.c @@ -678,17 +678,14 @@ static GstRingBuffer *gst_jack_audio_src_create_ringbuffer (GstBaseAudioSrc * static void gst_jack_audio_src_base_init (gpointer gclass) { - static GstElementDetails gst_jack_audio_src_details = { - "Audio Source (Jack)", - "Source/Audio", - "Input from Jack", - "Tristan Matthews " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_factory)); - gst_element_class_set_details (element_class, &gst_jack_audio_src_details); + gst_element_class_set_details_simple (element_class, "Audio Source (Jack)", + "Source/Audio", + "Input from Jack", "Tristan Matthews "); } /* initialize the jack_audio_src's class */ diff --git a/ext/jp2k/gstjasperdec.c b/ext/jp2k/gstjasperdec.c index 2b3ab445d6..73662c0143 100644 --- a/ext/jp2k/gstjasperdec.c +++ b/ext/jp2k/gstjasperdec.c @@ -37,12 +37,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_jasper_dec_debug); #define GST_CAT_DEFAULT gst_jasper_dec_debug -static const GstElementDetails plugin_details = -GST_ELEMENT_DETAILS ("Jasper JPEG2000 image decoder", - "Codec/Decoder/Image", - "Decodes JPEG2000 encoded images using jasper", - "Mark Nauwelaerts "); - enum { ARG_0, @@ -115,7 +109,10 @@ gst_jasper_dec_base_init (gpointer g_class) gst_static_pad_template_get (&gst_jasper_dec_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_jasper_dec_sink_template)); - gst_element_class_set_details (element_class, &plugin_details); + gst_element_class_set_details_simple (element_class, + "Jasper JPEG2000 image decoder", "Codec/Decoder/Image", + "Decodes JPEG2000 encoded images using jasper", + "Mark Nauwelaerts "); } /* initialize the plugin's class */ diff --git a/ext/jp2k/gstjasperenc.c b/ext/jp2k/gstjasperenc.c index 10fc3e56f8..870ebd691e 100644 --- a/ext/jp2k/gstjasperenc.c +++ b/ext/jp2k/gstjasperenc.c @@ -37,12 +37,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_jasper_enc_debug); #define GST_CAT_DEFAULT gst_jasper_enc_debug -static const GstElementDetails plugin_details = -GST_ELEMENT_DETAILS ("Jasper JPEG2000 image encoder", - "Codec/Encoder/Image", - "Encodes video to JPEG2000 using jasper", - "Mark Nauwelaerts "); - enum { ARG_0, @@ -119,7 +113,10 @@ gst_jasper_enc_base_init (gpointer g_class) gst_static_pad_template_get (&gst_jasper_enc_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_jasper_enc_sink_template)); - gst_element_class_set_details (element_class, &plugin_details); + gst_element_class_set_details_simple (element_class, + "Jasper JPEG2000 image encoder", "Codec/Encoder/Image", + "Encodes video to JPEG2000 using jasper", + "Mark Nauwelaerts "); } /* initialize the plugin's class */ diff --git a/ext/kate/gstkatedec.c b/ext/kate/gstkatedec.c index ffae36543c..50a8cc4dc8 100644 --- a/ext/kate/gstkatedec.c +++ b/ext/kate/gstkatedec.c @@ -132,18 +132,17 @@ static gboolean gst_kate_dec_sink_query (GstPad * pad, GstQuery * query); static void gst_kate_dec_base_init (gpointer gclass) { - static GstElementDetails element_details = - GST_ELEMENT_DETAILS ("Kate stream text decoder", - "Codec/Decoder/Subtitle", - "Decodes Kate text streams", - "Vincent Penquerc'h "); + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); gst_element_class_add_pad_template (element_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, + "Kate stream text decoder", "Codec/Decoder/Subtitle", + "Decodes Kate text streams", + "Vincent Penquerc'h "); } /* initialize the plugin's class */ diff --git a/ext/kate/gstkateenc.c b/ext/kate/gstkateenc.c index 752dc10400..bc2ba2901c 100644 --- a/ext/kate/gstkateenc.c +++ b/ext/kate/gstkateenc.c @@ -150,18 +150,17 @@ GST_BOILERPLATE_FULL (GstKateEnc, gst_kate_enc, GstElement, static void gst_kate_enc_base_init (gpointer gclass) { - static const GstElementDetails element_details = - GST_ELEMENT_DETAILS ("Kate stream encoder", - "Codec/Encoder/Subtitle", - "Encodes Kate streams from text or subpictures", - "Vincent Penquerc'h "); + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); gst_element_class_add_pad_template (element_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, "Kate stream encoder", + "Codec/Encoder/Subtitle", + "Encodes Kate streams from text or subpictures", + "Vincent Penquerc'h "); } /* initialize the plugin's class */ diff --git a/ext/kate/gstkateparse.c b/ext/kate/gstkateparse.c index e4a834776b..c410666451 100644 --- a/ext/kate/gstkateparse.c +++ b/ext/kate/gstkateparse.c @@ -69,12 +69,6 @@ GST_DEBUG_CATEGORY_EXTERN (gst_kateparse_debug); #define GST_CAT_DEFAULT gst_kateparse_debug -static const GstElementDetails gst_kate_parse_details = -GST_ELEMENT_DETAILS ("Kate stream parser", - "Codec/Parser/Subtitle", - "parse raw kate streams", - "Vincent Penquerc'h "); - static GstStaticPadTemplate gst_kate_parse_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -113,7 +107,10 @@ gst_kate_parse_base_init (gpointer g_class) gst_static_pad_template_get (&gst_kate_parse_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_kate_parse_sink_factory)); - gst_element_class_set_details (element_class, &gst_kate_parse_details); + gst_element_class_set_details_simple (element_class, "Kate stream parser", + "Codec/Parser/Subtitle", + "parse raw kate streams", + "Vincent Penquerc'h "); } static void diff --git a/ext/kate/gstkatetag.c b/ext/kate/gstkatetag.c index ac4e925ff6..897d1a571e 100644 --- a/ext/kate/gstkatetag.c +++ b/ext/kate/gstkatetag.c @@ -115,19 +115,14 @@ static void gst_kate_tag_dispose (GObject * object); GST_BOILERPLATE_FULL (GstKateTag, gst_kate_tag, GstKateParse, GST_TYPE_KATE_PARSE, _do_init); -static GstElementDetails kate_tag_details = -GST_ELEMENT_DETAILS ("Kate stream tagger", - "Formatter/Metadata", - "Retags kate streams", - "Vincent Penquerc'h "); - - static void gst_kate_tag_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &kate_tag_details); + gst_element_class_set_details_simple (element_class, "Kate stream tagger", + "Formatter/Metadata", + "Retags kate streams", "Vincent Penquerc'h "); } static void diff --git a/ext/kate/gstkatetiger.c b/ext/kate/gstkatetiger.c index 55f183bb66..737fbb3988 100644 --- a/ext/kate/gstkatetiger.c +++ b/ext/kate/gstkatetiger.c @@ -169,11 +169,7 @@ static gboolean gst_kate_tiger_source_event (GstPad * pad, GstEvent * event); static void gst_kate_tiger_base_init (gpointer gclass) { - static GstElementDetails element_details = - GST_ELEMENT_DETAILS ("Kate stream renderer", - "Mixer/Video/Overlay/Subtitle", - "Decodes and renders Kate streams on top of a video", - "Vincent Penquerc'h "); + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); gst_element_class_add_pad_template (element_class, @@ -182,7 +178,10 @@ gst_kate_tiger_base_init (gpointer gclass) gst_static_pad_template_get (&kate_sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&video_sink_factory)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "Kate stream renderer", + "Mixer/Video/Overlay/Subtitle", + "Decodes and renders Kate streams on top of a video", + "Vincent Penquerc'h "); } /* initialize the plugin's class */ diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 5019734575..c10c5bbd1d 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -80,13 +80,14 @@ gst_ladspa_base_init (gpointer g_class) GstLADSPAClass *klass = (GstLADSPAClass *) g_class; GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstSignalProcessorClass *gsp_class = GST_SIGNAL_PROCESSOR_CLASS (g_class); - GstElementDetails *details; LADSPA_Descriptor *desc; guint j, audio_in_count, audio_out_count, control_in_count, control_out_count; - gchar *klass_tags; + const gchar *klass_tags; + gchar *longname, *author; #if HAVE_LRDF - gchar *uri, *extra_klass_tags = NULL; + gchar *uri; #endif + gchar *extra_klass_tags = NULL; GST_DEBUG ("base_init %p", g_class); @@ -138,15 +139,12 @@ gst_ladspa_base_init (gpointer g_class) } } - /* construct the element details struct */ - details = g_new0 (GstElementDetails, 1); - details->longname = g_locale_to_utf8 (desc->Name, -1, NULL, NULL, NULL); - if (!details->longname) - details->longname = g_strdup ("no description available"); - details->description = details->longname; - details->author = g_locale_to_utf8 (desc->Maker, -1, NULL, NULL, NULL); - if (!details->author) - details->author = g_strdup ("no author available"); + longname = g_locale_to_utf8 (desc->Name, -1, NULL, NULL, NULL); + if (!longname) + longname = g_strdup ("no description available"); + author = g_locale_to_utf8 (desc->Maker, -1, NULL, NULL, NULL); + if (!author) + author = g_strdup ("no author available"); #if HAVE_LRDF /* libldrf support, we want to get extra class information here */ @@ -236,18 +234,17 @@ gst_ladspa_base_init (gpointer g_class) #if HAVE_LRDF if (extra_klass_tags) { - details->klass = g_strconcat (klass_tags, extra_klass_tags, NULL); + char *s = g_strconcat (klass_tags, extra_klass_tags, NULL); g_free (extra_klass_tags); - } else -#endif - { - details->klass = klass_tags; + extra_klass_tags = s; } - GST_INFO ("tags : %s", details->klass); - gst_element_class_set_details (element_class, details); - g_free (details->longname); - g_free (details->author); - g_free (details); +#endif + GST_INFO ("tags : %s", klass_tags); + gst_element_class_set_details_simple (element_class, longname, + extra_klass_tags ? extra_klass_tags : klass_tags, longname, author); + g_free (longname); + g_free (author); + g_free (extra_klass_tags); klass->audio_in_portnums = g_new0 (gint, gsp_class->num_audio_in); klass->audio_out_portnums = g_new0 (gint, gsp_class->num_audio_out); diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c index cdf8cb83ed..5b4479c148 100644 --- a/ext/lcs/gstcolorspace.c +++ b/ext/lcs/gstcolorspace.c @@ -58,14 +58,6 @@ struct _GstColorspaceClass GstElementClass parent_class; }; -/* elementfactory information */ -static const GstElementDetails colorspace_details = -GST_ELEMENT_DETAILS ("Colorspace converter", - "Filter/Effect", - "Converts video from one colorspace to another", - "Wim Taymans "); - - /* Stereo signals and args */ enum { @@ -346,7 +338,10 @@ gst_colorspace_base_init (GstColorspaceClass * klass) gst_static_pad_template_get (&gst_colorspace_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_colorspace_sink_template)); - gst_element_class_set_details (element_class, &colorspace_details); + gst_element_class_set_details_simple (element_class, "Colorspace converter", + "Filter/Effect", + "Converts video from one colorspace to another", + "Wim Taymans "); } static void diff --git a/ext/libfame/gstlibfame.c b/ext/libfame/gstlibfame.c index b172737164..c8491a6346 100644 --- a/ext/libfame/gstlibfame.c +++ b/ext/libfame/gstlibfame.c @@ -29,13 +29,6 @@ #define FAMEENC_BUFFER_SIZE (300 * 1024) -/* elementfactory information */ -static const GstElementDetails gst_fameenc_details = -GST_ELEMENT_DETAILS ("MPEG-1 and MPEG-4 video encoder", - "Codec/Encoder/Video", - "Uses fameenc to encode MPEG video streams", - "Thomas Vander Stichele "); - static GQuark fame_object_name; @@ -184,7 +177,10 @@ gst_fameenc_base_init (GstFameEncClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_fameenc_details); + gst_element_class_set_details_simple (element_class, + "MPEG-1 and MPEG-4 video encoder", "Codec/Encoder/Video", + "Uses fameenc to encode MPEG video streams", + "Thomas Vander Stichele "); } static void diff --git a/ext/libmms/gstmms.c b/ext/libmms/gstmms.c index 20abafb478..cbaa8e799a 100644 --- a/ext/libmms/gstmms.c +++ b/ext/libmms/gstmms.c @@ -41,12 +41,6 @@ enum GST_DEBUG_CATEGORY_STATIC (mmssrc_debug); #define GST_CAT_DEFAULT mmssrc_debug -static const GstElementDetails plugin_details = -GST_ELEMENT_DETAILS ("MMS streaming source", - "Source/Network", - "Receive data streamed via MSFT Multi Media Server protocol", - "Maciej Katafiasz "); - static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -96,7 +90,10 @@ gst_mms_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, &plugin_details); + gst_element_class_set_details_simple (element_class, "MMS streaming source", + "Source/Network", + "Receive data streamed via MSFT Multi Media Server protocol", + "Maciej Katafiasz "); GST_DEBUG_CATEGORY_INIT (mmssrc_debug, "mmssrc", 0, "MMS Source Element"); } diff --git a/ext/lv2/gstlv2.c b/ext/lv2/gstlv2.c index fbac7fc0f0..8572aa225a 100644 --- a/ext/lv2/gstlv2.c +++ b/ext/lv2/gstlv2.c @@ -178,14 +178,14 @@ gst_lv2_base_init (gpointer g_class) GstLV2Class *klass = (GstLV2Class *) g_class; GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstSignalProcessorClass *gsp_class = GST_SIGNAL_PROCESSOR_CLASS (g_class); - GstElementDetails *details; SLV2Plugin lv2plugin; SLV2Value val; SLV2Values values, sub_values; GstLV2Group *group = NULL; GstAudioChannelPosition position = GST_AUDIO_CHANNEL_POSITION_INVALID; guint j, in_pad_index = 0, out_pad_index = 0; - gchar *klass_tags; + const gchar *klass_tags; + gchar *longname, *author; lv2plugin = (SLV2Plugin) g_type_get_qdata (G_OBJECT_CLASS_TYPE (klass), descriptor_quark); @@ -341,22 +341,19 @@ gst_lv2_base_init (gpointer g_class) j, 1); } - /* construct the element details struct */ - details = g_new0 (GstElementDetails, 1); val = slv2_plugin_get_name (lv2plugin); if (val) { - details->longname = g_strdup (slv2_value_as_string (val)); + longname = g_strdup (slv2_value_as_string (val)); slv2_value_free (val); } else { - details->longname = g_strdup ("no description available"); + longname = g_strdup ("no description available"); } - details->description = details->longname; val = slv2_plugin_get_author_name (lv2plugin); if (val) { - details->author = g_strdup (slv2_value_as_string (val)); + author = g_strdup (slv2_value_as_string (val)); slv2_value_free (val); } else { - details->author = g_strdup ("no author available"); + author = g_strdup ("no author available"); } if (gsp_class->num_audio_in == 0) @@ -369,12 +366,11 @@ gst_lv2_base_init (gpointer g_class) } else klass_tags = "Filter/Effect/Audio/LV2"; - details->klass = klass_tags; - GST_INFO ("tags : %s", details->klass); - gst_element_class_set_details (element_class, details); - g_free (details->longname); - g_free (details->author); - g_free (details); + GST_INFO ("tags : %s", klass_tags); + gst_element_class_set_details_simple (element_class, longname, + klass_tags, longname, author); + g_free (longname); + g_free (author); if (!slv2_plugin_has_feature (lv2plugin, in_place_broken_pred)) GST_SIGNAL_PROCESSOR_CLASS_SET_CAN_PROCESS_IN_PLACE (klass); diff --git a/ext/metadata/gstmetadatademux.c b/ext/metadata/gstmetadatademux.c index 09ace3dcee..337c61ba1e 100644 --- a/ext/metadata/gstmetadatademux.c +++ b/ext/metadata/gstmetadatademux.c @@ -247,22 +247,17 @@ done: static void gst_metadata_demux_base_init (gpointer gclass) { -/* *INDENT-OFF* */ - static GstElementDetails element_details = { - "Metadata demuxer", - "Demuxer/Extracter/Metadata", - "Send metadata tags (EXIF, IPTC and XMP) and " - "remove metadata chunks from stream", - "Edgard Lima " - }; -/* *INDENT-ON* */ GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); gst_element_class_add_pad_template (element_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, "Metadata demuxer", + "Demuxer/Extracter/Metadata", + "Send metadata tags (EXIF, IPTC and XMP) and " + "remove metadata chunks from stream", + "Edgard Lima "); } static void diff --git a/ext/metadata/gstmetadatamux.c b/ext/metadata/gstmetadatamux.c index 626a40db14..2caaf74ad1 100644 --- a/ext/metadata/gstmetadatamux.c +++ b/ext/metadata/gstmetadatamux.c @@ -239,13 +239,7 @@ done: static void gst_metadata_mux_base_init (gpointer gclass) { -/* *INDENT-OFF* */ - static GstElementDetails element_details = { - "Metadata muxer", - "Muxer/Formatter/Metadata", - "Write metadata (EXIF, IPTC and XMP) into a image stream", - "Edgard Lima " - }; + /* *INDENT-ON* */ GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); @@ -253,7 +247,10 @@ gst_metadata_mux_base_init (gpointer gclass) 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, "Metadata muxer", + "Muxer/Formatter/Metadata", + "Write metadata (EXIF, IPTC and XMP) into a image stream", + "Edgard Lima "); } static void diff --git a/ext/mimic/gstmimdec.c b/ext/mimic/gstmimdec.c index a0878a136d..17ccf2242f 100644 --- a/ext/mimic/gstmimdec.c +++ b/ext/mimic/gstmimdec.c @@ -76,15 +76,7 @@ GST_BOILERPLATE (GstMimDec, gst_mimdec, GstElement, GST_TYPE_ELEMENT); static void gst_mimdec_base_init (gpointer klass) { - static GstElementDetails plugin_details = { - "MimDec", - "Codec/Decoder/Video", - "Mimic decoder", - "Andre Moreira Magalhaes , " - "Rob Taylor , " - "Philippe Khalaf , " - "Ole André Vadla Ravnås " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_pad_template (element_class, @@ -92,7 +84,13 @@ gst_mimdec_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, &plugin_details); + gst_element_class_set_details_simple (element_class, "MimDec", + "Codec/Decoder/Video", + "Mimic decoder", + "Andre Moreira Magalhaes , " + "Rob Taylor , " + "Philippe Khalaf , " + "Ole André Vadla Ravnås "); } static void diff --git a/ext/mimic/gstmimenc.c b/ext/mimic/gstmimenc.c index f47b43a917..aa786e930f 100644 --- a/ext/mimic/gstmimenc.c +++ b/ext/mimic/gstmimenc.c @@ -101,12 +101,7 @@ GST_BOILERPLATE (GstMimEnc, gst_mimenc, GstElement, GST_TYPE_ELEMENT); static void gst_mimenc_base_init (gpointer klass) { - static GstElementDetails plugin_details = { - "MimEnc", - "Codec/Encoder/Video", - "Mimic encoder", - "Andre Moreira Magalhaes " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -123,7 +118,9 @@ gst_mimenc_base_init (gpointer 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, &plugin_details); + gst_element_class_set_details_simple (element_class, "MimEnc", + "Codec/Encoder/Video", + "Mimic encoder", "Andre Moreira Magalhaes "); } static void diff --git a/ext/musicbrainz/gsttrm.c b/ext/musicbrainz/gsttrm.c index a4883b3549..7ae4eb7e0b 100644 --- a/ext/musicbrainz/gsttrm.c +++ b/ext/musicbrainz/gsttrm.c @@ -65,12 +65,6 @@ enum GST_DEBUG_CATEGORY_STATIC (trm_debug); #define GST_CAT_DEFAULT trm_debug -static const GstElementDetails gst_trm_details = -GST_ELEMENT_DETAILS ("MusicBrainz TRM generator", - "Filter/Analyzer/Audio", - "Compute MusicBrainz TRM Id using libmusicbrainz", - "Jeremy Simon "); - GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -123,7 +117,10 @@ gst_trm_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &gst_trm_details); + gst_element_class_set_details_simple (element_class, + "MusicBrainz TRM generator", "Filter/Analyzer/Audio", + "Compute MusicBrainz TRM Id using libmusicbrainz", + "Jeremy Simon "); } static void diff --git a/ext/mythtv/gstmythtvsrc.c b/ext/mythtv/gstmythtvsrc.c index 5ef5b00e17..5ec839786c 100644 --- a/ext/mythtv/gstmythtvsrc.c +++ b/ext/mythtv/gstmythtvsrc.c @@ -86,14 +86,6 @@ GST_DEBUG_CATEGORY_STATIC (mythtvsrc_debug); #define READ_SIZE_LIVETV (80*1024) #define GST_FLOW_ERROR_NO_DATA (-101) -static const GstElementDetails gst_mythtv_src_details = -GST_ELEMENT_DETAILS ("MythTV client source", - "Source/Network", - "Control and receive data as a client over the network " - "via raw socket connections using the MythTV protocol", - "Rosfran Borges ," - "Renato Filho "); - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -167,7 +159,12 @@ GST_BOILERPLATE_FULL (GstMythtvSrc, gst_mythtv_src, GstPushSrc, gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&srctemplate)); - gst_element_class_set_details (element_class, &gst_mythtv_src_details); + gst_element_class_set_details_simple (element_class, "MythTV client source", + "Source/Network", + "Control and receive data as a client over the network " + "via raw socket connections using the MythTV protocol", + "Rosfran Borges , " + "Renato Filho "); element_class->change_state = gst_mythtv_src_change_state; diff --git a/ext/nas/nassink.c b/ext/nas/nassink.c index 6f5a003eea..93e9c10438 100644 --- a/ext/nas/nassink.c +++ b/ext/nas/nassink.c @@ -88,13 +88,6 @@ static AuBool NAS_EventHandler (AuServer * aud, AuEvent * ev, static AuDeviceID NAS_getDevice (AuServer * aud, int numTracks); static int NAS_createFlow (GstNasSink * sink, GstRingBufferSpec * spec); -static const GstElementDetails nas_sink_details = -GST_ELEMENT_DETAILS ("NAS audio sink", - "Sink/Audio", - "Plays audio to a Network Audio Server", - "Laurent Vivier , " - "Arwed v. Merkatz "); - GST_BOILERPLATE (GstNasSink, gst_nas_sink, GstAudioSink, GST_TYPE_AUDIO_SINK); static void @@ -104,7 +97,11 @@ gst_nas_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, &nas_sink_details); + gst_element_class_set_details_simple (element_class, "NAS audio sink", + "Sink/Audio", + "Plays audio to a Network Audio Server", + "Laurent Vivier , " + "Arwed v. Merkatz "); } static void diff --git a/ext/neon/gstneonhttpsrc.c b/ext/neon/gstneonhttpsrc.c index 61eec9aeca..fd704f85bf 100644 --- a/ext/neon/gstneonhttpsrc.c +++ b/ext/neon/gstneonhttpsrc.c @@ -37,14 +37,6 @@ GST_DEBUG_CATEGORY_STATIC (neonhttpsrc_debug); /* max number of HTTP redirects, when iterating over a sequence of HTTP 3xx status code */ #define MAX_HTTP_REDIRECTS_NUMBER 5 -static const GstElementDetails gst_neonhttp_src_details = -GST_ELEMENT_DETAILS ("HTTP client source", - "Source/Network", - "Receive data as a client over the network via HTTP using NEON", - "Edgard Lima , " - "Rosfran Borges , " - "Andre Moreira Magalhaes "); - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -140,7 +132,12 @@ gst_neonhttp_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_neonhttp_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 NEON", + "Edgard Lima , " + "Rosfran Borges , " + "Andre Moreira Magalhaes "); } static void diff --git a/ext/polyp/polypsink.c b/ext/polyp/polypsink.c index cb126cb422..67d27d74b8 100644 --- a/ext/polyp/polypsink.c +++ b/ext/polyp/polypsink.c @@ -63,17 +63,12 @@ gst_polypsink_base_init (gpointer g_class) ) ); - static const GstElementDetails details = - GST_ELEMENT_DETAILS ("Polypaudio audio sink", - "Sink/Audio", - "Plays audio to a Polypaudio server", - "Lennart Poettering"); - GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&pad_template)); - gst_element_class_set_details (element_class, &details); + gst_element_class_set_details_simple (element_class, "Polypaudio audio sink", + "Sink/Audio", "Plays audio to a Polypaudio server", "Lennart Poettering"); } static void diff --git a/ext/resindvd/gstmpegdemux.c b/ext/resindvd/gstmpegdemux.c index 405a0c1fe1..bfa8835088 100644 --- a/ext/resindvd/gstmpegdemux.c +++ b/ext/resindvd/gstmpegdemux.c @@ -47,14 +47,6 @@ GST_DEBUG_CATEGORY_STATIC (gstflupsdemux_debug); GST_DEBUG_CATEGORY_EXTERN (gstflupesfilter_debug); -/* elementfactory information */ -static GstElementDetails flups_demux_details = { - "MPEG Program Demuxer", - "Codec/Demuxer", - "Demultiplexes MPEG Program Streams", - "Wim Taymans " -}; - /* MPEG2Demux signals and args */ enum { @@ -172,7 +164,9 @@ gst_flups_demux_base_init (GstFluPSDemuxClass * klass) klass->subpicture_template); gst_element_class_add_pad_template (element_class, klass->sink_template); - gst_element_class_set_details (element_class, &flups_demux_details); + gst_element_class_set_details_simple (element_class, "MPEG Program Demuxer", + "Codec/Demuxer", + "Demultiplexes MPEG Program Streams", "Wim Taymans "); } static void diff --git a/ext/resindvd/resindvdbin.c b/ext/resindvd/resindvdbin.c index fb50b5503a..df0df2d0b1 100644 --- a/ext/resindvd/resindvdbin.c +++ b/ext/resindvd/resindvdbin.c @@ -98,12 +98,7 @@ static GstStateChangeReturn rsn_dvdbin_change_state (GstElement * element, static void rsn_dvdbin_base_init (gpointer gclass) { - static GstElementDetails element_details = { - "rsndvdbin", - "Generic/Bin/Player", - "DVD playback element", - "Jan Schmidt " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); gst_element_class_add_pad_template (element_class, @@ -112,7 +107,9 @@ rsn_dvdbin_base_init (gpointer gclass) gst_static_pad_template_get (&audio_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&subpicture_src_template)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "rsndvdbin", + "Generic/Bin/Player", + "DVD playback element", "Jan Schmidt "); element_class->change_state = GST_DEBUG_FUNCPTR (rsn_dvdbin_change_state); } diff --git a/ext/resindvd/resindvdsrc.c b/ext/resindvd/resindvdsrc.c index cd482367ae..ec8f92bdcb 100644 --- a/ext/resindvd/resindvdsrc.c +++ b/ext/resindvd/resindvdsrc.c @@ -189,17 +189,13 @@ rsn_dvdsrc_register_extra (GType rsn_dvdsrc_type) static void rsn_dvdsrc_base_init (gpointer gclass) { - static GstElementDetails element_details = { - "Resin DVD Src", - "Source/DVD", - "DVD source element", - "Jan Schmidt " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_factory)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "Resin DVD Src", + "Source/DVD", "DVD source element", "Jan Schmidt "); } static void diff --git a/ext/resindvd/rsnaudiomunge.c b/ext/resindvd/rsnaudiomunge.c index 7c8cfde085..5e6f9cc6f1 100644 --- a/ext/resindvd/rsnaudiomunge.c +++ b/ext/resindvd/rsnaudiomunge.c @@ -80,12 +80,6 @@ rsn_audiomunge_class_init (RsnAudioMungeClass * klass) { GObjectClass *gobject_class = (GObjectClass *) (klass); GstElementClass *element_class = (GstElementClass *) (klass); - static GstElementDetails element_details = { - "RsnAudioMunge", - "Audio/Filter", - "Resin DVD audio stream regulator", - "Jan Schmidt " - }; GST_DEBUG_CATEGORY_INIT (rsn_audiomunge_debug, "rsnaudiomunge", 0, "ResinDVD audio stream regulator"); @@ -95,7 +89,9 @@ rsn_audiomunge_class_init (RsnAudioMungeClass * klass) 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, "RsnAudioMunge", + "Audio/Filter", + "Resin DVD audio stream regulator", "Jan Schmidt "); gobject_class->set_property = rsn_audiomunge_set_property; gobject_class->get_property = rsn_audiomunge_get_property; diff --git a/ext/resindvd/rsnparsetter.c b/ext/resindvd/rsnparsetter.c index 65de2ac313..a4206aaf88 100644 --- a/ext/resindvd/rsnparsetter.c +++ b/ext/resindvd/rsnparsetter.c @@ -56,19 +56,17 @@ rsn_parsetter_register_extra (GType rsn_parsetter_type) static void rsn_parsetter_base_init (gpointer gclass) { - static GstElementDetails element_details = { - "Resin Aspect Ratio Setter", - "Filter/Video", - "Overrides caps on video buffers to force a particular display ratio", - "Jan Schmidt " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); gst_element_class_add_pad_template (element_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, + "Resin Aspect Ratio Setter", "Filter/Video", + "Overrides caps on video buffers to force a particular display ratio", + "Jan Schmidt "); } static void diff --git a/ext/resindvd/rsnstreamselector.c b/ext/resindvd/rsnstreamselector.c index 6171c68e6f..3bb6071577 100644 --- a/ext/resindvd/rsnstreamselector.c +++ b/ext/resindvd/rsnstreamselector.c @@ -32,15 +32,6 @@ GST_DEBUG_CATEGORY_STATIC (stream_selector_debug); #define GST_CAT_DEFAULT stream_selector_debug -static const GstElementDetails rsn_stream_selector_details = -GST_ELEMENT_DETAILS ("StreamSelector", - "Generic", - "N-to-1 input stream_selectoring", - "Julien Moutte \n" - "Ronald S. Bultje \n" - "Jan Schmidt \n" - "Wim Taymans "); - static GstStaticPadTemplate rsn_stream_selector_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink%d", GST_PAD_SINK, @@ -485,7 +476,12 @@ rsn_stream_selector_base_init (RsnStreamSelectorClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &rsn_stream_selector_details); + gst_element_class_set_details_simple (element_class, "StreamSelector", + "Generic", "N-to-1 input stream_selectoring", + "Julien Moutte , " + "Ronald S. Bultje , " + "Jan Schmidt , " + "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&rsn_stream_selector_sink_factory)); gst_element_class_add_pad_template (element_class, diff --git a/ext/schroedinger/gstschrodec.c b/ext/schroedinger/gstschrodec.c index 54653a9577..6d6faa56de 100644 --- a/ext/schroedinger/gstschrodec.c +++ b/ext/schroedinger/gstschrodec.c @@ -116,11 +116,7 @@ GST_BOILERPLATE (GstSchroDec, gst_schro_dec, GstBaseVideoDecoder, static void gst_schro_dec_base_init (gpointer g_class) { - static GstElementDetails compress_details = - GST_ELEMENT_DETAILS ("Dirac Decoder", - "Codec/Decoder/Video", - "Decode Dirac streams", - "David Schleef "); + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -128,7 +124,9 @@ gst_schro_dec_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_schro_dec_sink_template)); - gst_element_class_set_details (element_class, &compress_details); + gst_element_class_set_details_simple (element_class, "Dirac Decoder", + "Codec/Decoder/Video", + "Decode Dirac streams", "David Schleef "); } static void diff --git a/ext/schroedinger/gstschroenc.c b/ext/schroedinger/gstschroenc.c index 0a5dadab38..6cc1a0d92e 100644 --- a/ext/schroedinger/gstschroenc.c +++ b/ext/schroedinger/gstschroenc.c @@ -135,11 +135,7 @@ GST_BOILERPLATE (GstSchroEnc, gst_schro_enc, GstBaseVideoEncoder, static void gst_schro_enc_base_init (gpointer g_class) { - static GstElementDetails schro_enc_details = - GST_ELEMENT_DETAILS ("Dirac Encoder", - "Codec/Encoder/Video", - "Encode raw video into Dirac stream", - "David Schleef "); + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -147,7 +143,9 @@ gst_schro_enc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_schro_enc_sink_template)); - gst_element_class_set_details (element_class, &schro_enc_details); + gst_element_class_set_details_simple (element_class, "Dirac Encoder", + "Codec/Encoder/Video", + "Encode raw video into Dirac stream", "David Schleef "); } static GType diff --git a/ext/schroedinger/gstschroparse.c b/ext/schroedinger/gstschroparse.c index 75ccf09766..adff59cc0c 100644 --- a/ext/schroedinger/gstschroparse.c +++ b/ext/schroedinger/gstschroparse.c @@ -133,11 +133,7 @@ GST_BOILERPLATE (GstSchroParse, gst_schro_parse, GstBaseVideoParse, static void gst_schro_parse_base_init (gpointer g_class) { - static GstElementDetails compress_details = - GST_ELEMENT_DETAILS ("Dirac Parser", - "Codec/Parser/Video", - "Parse Dirac streams", - "David Schleef "); + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -145,7 +141,9 @@ gst_schro_parse_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_schro_parse_sink_template)); - gst_element_class_set_details (element_class, &compress_details); + gst_element_class_set_details_simple (element_class, "Dirac Parser", + "Codec/Parser/Video", + "Parse Dirac streams", "David Schleef "); } static void diff --git a/ext/sdl/sdlaudiosink.c b/ext/sdl/sdlaudiosink.c index 3b1ed4adf1..2106864c1f 100644 --- a/ext/sdl/sdlaudiosink.c +++ b/ext/sdl/sdlaudiosink.c @@ -26,13 +26,6 @@ GST_DEBUG_CATEGORY_EXTERN (sdl_debug); #define GST_CAT_DEFAULT sdl_debug -/* elementfactory information */ -static const GstElementDetails gst_sdlaudio_sink_details = -GST_ELEMENT_DETAILS ("SDL audio sink", - "Sink/Audio", - "Output to a sound card via SDLAUDIO", - "Edgard Lima "); - static void gst_sdlaudio_sink_dispose (GObject * object); static GstCaps *gst_sdlaudio_sink_getcaps (GstBaseSink * bsink); @@ -151,11 +144,15 @@ gst_sdlaudio_sink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_sdlaudio_sink_details); + gst_element_class_set_details_simple (element_class, "SDL audio sink", + "Sink/Audio", + "Output to a sound card via SDLAUDIO", + "Edgard Lima "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sdlaudiosink_sink_factory)); } + static void gst_sdlaudio_sink_class_init (GstSDLAudioSinkClass * klass) { diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index 22c7aa5e21..e4b81fafed 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -50,15 +50,6 @@ GST_DEBUG_CATEGORY_EXTERN (sdl_debug); #define I420_SIZE(w,h) (I420_V_OFFSET(w,h)+(I420_V_ROWSTRIDE(w)*GST_ROUND_UP_2(h)/2)) -/* elementfactory information */ -static const GstElementDetails gst_sdlvideosink_details = -GST_ELEMENT_DETAILS ("SDL video sink", - "Sink/Video", - "An SDL-based videosink", - "Ronald Bultje \n" - "Edgard Lima \n" - "Jan Schmidt "); - enum { @@ -162,8 +153,11 @@ gst_sdlvideosink_base_init (gpointer g_class) GST_PAD_SINK, GST_PAD_ALWAYS, capslist); gst_element_class_add_pad_template (element_class, sink_template); - gst_element_class_set_details (element_class, &gst_sdlvideosink_details); - + gst_element_class_set_details_simple (element_class, "SDL video sink", + "Sink/Video", "An SDL-based videosink", + "Ronald Bultje , " + "Edgard Lima , " + "Jan Schmidt "); } static void diff --git a/ext/shout/gstshout.c b/ext/shout/gstshout.c index 1fbbc0987d..4e81b39619 100644 --- a/ext/shout/gstshout.c +++ b/ext/shout/gstshout.c @@ -22,13 +22,6 @@ #endif #include "gstshout.h" -/* elementfactory information */ -static const GstElementDetails icecastsend_details = -GST_ELEMENT_DETAILS ("Icecast network sink", - "Sink/Network", - "Sends data to an icecast server using libshout", - "Wim Taymans "); - static char *SHOUT_ERRORS[] = { "ok", "insane", @@ -119,7 +112,10 @@ gst_icecastsend_base_init (GstIcecastSendClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template_factory)); - gst_element_class_set_details (element_class, &icecastsend_details); + gst_element_class_set_details_simple (element_class, "Icecast network sink", + "Sink/Network", + "Sends data to an icecast server using libshout", + "Wim Taymans "); } static void diff --git a/ext/snapshot/gstsnapshot.c b/ext/snapshot/gstsnapshot.c index 185c063037..f61ded16f7 100644 --- a/ext/snapshot/gstsnapshot.c +++ b/ext/snapshot/gstsnapshot.c @@ -28,13 +28,6 @@ #define MAX_HEIGHT 2048 -/* elementfactory information */ -static const GstElementDetails snapshot_details = -GST_ELEMENT_DETAILS ("Snapshot", - "Filter/Editor/Video", - "Dump a frame to a png file", - "Jeremy SIMON "); - static GstStaticPadTemplate snapshot_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -128,7 +121,9 @@ gst_snapshot_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&snapshot_src_factory)); - gst_element_class_set_details (element_class, &snapshot_details); + gst_element_class_set_details_simple (element_class, "Snapshot", + "Filter/Editor/Video", + "Dump a frame to a png file", "Jeremy SIMON "); } static void diff --git a/ext/sndfile/gstsfsink.c b/ext/sndfile/gstsfsink.c index 4039a792d6..2bdb2fe35a 100644 --- a/ext/sndfile/gstsfsink.c +++ b/ext/sndfile/gstsfsink.c @@ -28,13 +28,6 @@ #include "gstsfsink.h" - -static const GstElementDetails sfsink_details = -GST_ELEMENT_DETAILS ("Sndfile sink", - "Sink/Audio", - "Write audio streams to disk using libsndfile", - "Andy Wingo "); - enum { PROP_0, @@ -93,7 +86,10 @@ gst_sf_sink_base_init (gpointer g_class) GST_DEBUG_CATEGORY_INIT (gst_sf_debug, "sfsink", 0, "sfsink element"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sf_sink_factory)); - gst_element_class_set_details (element_class, &sfsink_details); + gst_element_class_set_details_simple (element_class, "Sndfile sink", + "Sink/Audio", + "Write audio streams to disk using libsndfile", + "Andy Wingo "); } static void diff --git a/ext/sndfile/gstsfsrc.c b/ext/sndfile/gstsfsrc.c index 0cd1e91379..f725d3f5b4 100644 --- a/ext/sndfile/gstsfsrc.c +++ b/ext/sndfile/gstsfsrc.c @@ -29,13 +29,6 @@ #include "gstsfsrc.h" - -static const GstElementDetails sf_src_details = -GST_ELEMENT_DETAILS ("Sndfile source", - "Source/Audio", - "Read audio streams from disk using libsndfile", - "Andy Wingo "); - enum { PROP_0, @@ -93,7 +86,10 @@ gst_sf_src_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&sf_src_factory)); - gst_element_class_set_details (gstelement_class, &sf_src_details); + gst_element_class_set_details_simple (gstelement_class, "Sndfile source", + "Source/Audio", + "Read audio streams from disk using libsndfile", + "Andy Wingo "); GST_DEBUG_CATEGORY_INIT (gst_sf_src_debug, "sfsrc", 0, "sfsrc element"); } diff --git a/ext/spc/gstspc.c b/ext/spc/gstspc.c index 7032065a27..0facad2e4e 100644 --- a/ext/spc/gstspc.c +++ b/ext/spc/gstspc.c @@ -28,12 +28,6 @@ #include #include -static const GstElementDetails gst_spc_dec_details = -GST_ELEMENT_DETAILS ("OpenSPC SPC decoder", - "Codec/Audio/Decoder", - "Uses OpenSPC to emulate an SPC processor", - "Chris Lee , Brian Koropoff "); - static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-spc")); @@ -109,7 +103,10 @@ gst_spc_dec_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_spc_dec_details); + gst_element_class_set_details_simple (element_class, "OpenSPC SPC decoder", + "Codec/Audio/Decoder", + "Uses OpenSPC to emulate an SPC processor", + "Chris Lee , Brian Koropoff "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory)); diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c index 19e819e323..9394ddec3b 100644 --- a/ext/swfdec/gstswfdec.c +++ b/ext/swfdec/gstswfdec.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (swfdec_debug); #define GST_CAT_DEFAULT swfdec_debug -/* elementfactory information */ -static const GstElementDetails gst_swfdec_details = -GST_ELEMENT_DETAILS ("SWF video decoder", - "Codec/Decoder/Video", - "Uses libswfdec to decode Flash video streams", - "David Schleef "); - /* Swfdec signals and args */ enum { @@ -178,8 +171,8 @@ gst_swfdecbuffer_finalize (GstSwfdecBuffer * swfdecbuffer) swfdec_buffer_unref (swfdecbuffer->swfdec_buffer); - ((GstMiniObjectClass *) buffer_parent_class)-> - finalize ((GstMiniObject *) swfdecbuffer); + ((GstMiniObjectClass *) buffer_parent_class)->finalize ((GstMiniObject *) + swfdecbuffer); } @@ -215,7 +208,10 @@ gst_swfdec_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_swfdec_details); + gst_element_class_set_details_simple (element_class, "SWF video decoder", + "Codec/Decoder/Video", + "Uses libswfdec to decode Flash video streams", + "David Schleef "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&video_template_factory)); diff --git a/ext/tarkin/gsttarkindec.c b/ext/tarkin/gsttarkindec.c index bfa0f1157a..a0786237f9 100644 --- a/ext/tarkin/gsttarkindec.c +++ b/ext/tarkin/gsttarkindec.c @@ -28,13 +28,6 @@ static GstPadTemplate *dec_src_template, *dec_sink_template; -/* elementfactory information */ -static const GstElementDetails tarkindec_details = -GST_ELEMENT_DETAILS ("Tarkin video decoder", - "Codec/Decoder/Video", - "Decodes video in OGG Tarkin format", - "Monty , " "Wim Taymans "); - /* TarkinDec signals and args */ enum { @@ -131,7 +124,10 @@ gst_tarkindec_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, dec_sink_template); gst_element_class_add_pad_template (element_class, dec_src_template); - gst_element_class_set_details (element_class, &tarkindec_details); + gst_element_class_set_details_simple (element_class, "Tarkin video decoder", + "Codec/Decoder/Video", + "Decodes video in OGG Tarkin format", + "Monty , " "Wim Taymans "); } static void diff --git a/ext/tarkin/gsttarkinenc.c b/ext/tarkin/gsttarkinenc.c index 95b49a4c8d..700b5a230e 100644 --- a/ext/tarkin/gsttarkinenc.c +++ b/ext/tarkin/gsttarkinenc.c @@ -28,13 +28,6 @@ static GstPadTemplate *enc_src_template, *enc_sink_template; -/* elementfactory information */ -static const GstElementDetails tarkinenc_details = -GST_ELEMENT_DETAILS ("Tarkin video encoder", - "Codec/Encoder/Video", - "Encodes video in OGG Tarkin format", - "Monty , " "Wim Taymans "); - /* TarkinEnc signals and args */ enum { @@ -131,7 +124,10 @@ gst_tarkinenc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, enc_sink_template); gst_element_class_add_pad_template (element_class, enc_src_template); - gst_element_class_set_details (element_class, &tarkinenc_details); + gst_element_class_set_details_simple (element_class, "Tarkin video encoder", + "Codec/Encoder/Video", + "Encodes video in OGG Tarkin format", + "Monty , " "Wim Taymans "); } static void diff --git a/ext/theora/theoradec.c b/ext/theora/theoradec.c index afb0841e05..f5dba2f773 100644 --- a/ext/theora/theoradec.c +++ b/ext/theora/theoradec.c @@ -47,13 +47,6 @@ GST_DEBUG_CATEGORY_STATIC (theoradecexp_debug); #define GST_CAT_DEFAULT theoradecexp_debug -static const GstElementDetails theora_dec_details = -GST_ELEMENT_DETAILS ("Theora video decoder", - "Codec/Decoder/Video", - "decode raw theora streams to raw YUV video using libtheoradec", - "Benjamin Otte , " - "Wim Taymans , " "Michael Smith "); - static GstStaticPadTemplate theora_dec_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -98,7 +91,11 @@ gst_theoradec_base_init (gpointer g_class) gst_static_pad_template_get (&theora_dec_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&theora_dec_sink_factory)); - gst_element_class_set_details (element_class, &theora_dec_details); + gst_element_class_set_details_simple (element_class, "Theora video decoder", + "Codec/Decoder/Video", + "decode raw theora streams to raw YUV video using libtheoradec", + "Benjamin Otte , " + "Wim Taymans , " "Michael Smith "); } static void diff --git a/ext/timidity/gsttimidity.c b/ext/timidity/gsttimidity.c index 3d72fcd39f..eda20ca753 100644 --- a/ext/timidity/gsttimidity.c +++ b/ext/timidity/gsttimidity.c @@ -51,12 +51,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_timidity_debug); #define GST_CAT_DEFAULT gst_timidity_debug -static const GstElementDetails gst_timidity_details = -GST_ELEMENT_DETAILS ("Timidity", - "Codec/Decoder/Audio", - "Midi Synthesizer Element", - "Wouter Paesen "); - enum { /* FILL ME */ @@ -108,7 +102,9 @@ gst_timidity_base_init (gpointer gclass) 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_timidity_details); + gst_element_class_set_details_simple (element_class, "Timidity", + "Codec/Decoder/Audio", + "Midi Synthesizer Element", "Wouter Paesen "); } /* initialize the plugin's class */ diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c index 068666ac64..a5e6e2a510 100644 --- a/ext/timidity/gstwildmidi.c +++ b/ext/timidity/gstwildmidi.c @@ -61,12 +61,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_wildmidi_debug); #define GST_CAT_DEFAULT gst_wildmidi_debug -static const GstElementDetails gst_wildmidi_details = -GST_ELEMENT_DETAILS ("WildMidi", - "Codec/Decoder/Audio", - "Midi Synthesizer Element", - "Wouter Paesen "); - enum { /* FILL ME */ @@ -129,7 +123,9 @@ gst_wildmidi_base_init (gpointer gclass) 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_wildmidi_details); + gst_element_class_set_details_simple (element_class, "WildMidi", + "Codec/Decoder/Audio", + "Midi Synthesizer Element", "Wouter Paesen "); } static gboolean diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c index 40ec52be1a..84a0eaad90 100644 --- a/ext/xvid/gstxviddec.c +++ b/ext/xvid/gstxviddec.c @@ -29,13 +29,6 @@ #include #include "gstxviddec.h" -/* elementfactory information */ -static const GstElementDetails gst_xviddec_details = -GST_ELEMENT_DETAILS ("XviD video decoder", - "Codec/Decoder/Video", - "XviD decoder based on xvidcore", - "Ronald Bultje "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -107,7 +100,10 @@ gst_xviddec_base_init (GstXvidDecClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_xviddec_details); + gst_element_class_set_details_simple (element_class, "XviD video decoder", + "Codec/Decoder/Video", + "XviD decoder based on xvidcore", + "Ronald Bultje "); } static void diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c index c5598595d8..304fad7a16 100644 --- a/ext/xvid/gstxvidenc.c +++ b/ext/xvid/gstxvidenc.c @@ -36,13 +36,6 @@ #include #include "gstxvidenc.h" -/* elementfactory information */ -static const GstElementDetails gst_xvidenc_details = -GST_ELEMENT_DETAILS ("XviD video encoder", - "Codec/Encoder/Video", - "XviD encoder based on xvidcore", - "Ronald Bultje "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -228,7 +221,10 @@ gst_xvidenc_base_init (GstXvidEncClass * klass) 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_xvidenc_details); + gst_element_class_set_details_simple (element_class, "XviD video encoder", + "Codec/Encoder/Video", + "XviD encoder based on xvidcore", + "Ronald Bultje "); } /* add property pspec to klass using the counter count, diff --git a/ext/zbar/gstzbar.c b/ext/zbar/gstzbar.c index ce7e0e39a2..d1d3168273 100644 --- a/ext/zbar/gstzbar.c +++ b/ext/zbar/gstzbar.c @@ -106,12 +106,6 @@ enum #define DEFAULT_PROP_ZBAR 1 -static const GstElementDetails zbar_details = -GST_ELEMENT_DETAILS ("Barcode detector", - "Filter/Analyzer/Video", - "Detect bar codes in the video streams", - "Stefan Kost "); - static GstStaticPadTemplate gst_zbar_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -147,7 +141,10 @@ gst_zbar_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &zbar_details); + gst_element_class_set_details_simple (element_class, "Barcode detector", + "Filter/Analyzer/Video", + "Detect bar codes in the video streams", + "Stefan Kost "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_zbar_sink_template)); diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c index 79b1b843b4..d738a11b53 100644 --- a/gst-libs/gst/app/gstappsink.c +++ b/gst-libs/gst/app/gstappsink.c @@ -75,12 +75,6 @@ GST_DEBUG_CATEGORY (app_sink_debug); #define GST_CAT_DEFAULT app_sink_debug -static const GstElementDetails app_sink_details = -GST_ELEMENT_DETAILS ("AppSink", - "Generic/Sink", - "Allow the application to get access to raw buffer", - "David Schleef , Wim Taymans "); - enum { /* signals */ @@ -179,7 +173,10 @@ gst_app_sink_base_init (gpointer g_class) GST_DEBUG_CATEGORY_INIT (app_sink_debug, "appsink", 0, "appsink element"); - gst_element_class_set_details (element_class, &app_sink_details); + gst_element_class_set_details_simple (element_class, "AppSink", + "Generic/Sink", + "Allow the application to get access to raw buffer", + "David Schleef , Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_app_sink_template)); diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c index 9cf1afc33a..05f682a5d6 100644 --- a/gst-libs/gst/app/gstappsrc.c +++ b/gst-libs/gst/app/gstappsrc.c @@ -99,11 +99,6 @@ GST_DEBUG_CATEGORY (app_src_debug); #define GST_CAT_DEFAULT app_src_debug -static const GstElementDetails app_src_details = GST_ELEMENT_DETAILS ("AppSrc", - "Generic/Src", - "Allow the application to feed buffers to a pipeline", - "David Schleef , Wim Taymans "); - enum { /* signals */ @@ -212,7 +207,10 @@ gst_app_src_base_init (gpointer g_class) GST_DEBUG_CATEGORY_INIT (app_src_debug, "appsrc", 0, "appsrc element"); - gst_element_class_set_details (element_class, &app_src_details); + gst_element_class_set_details_simple (element_class, "AppSrc", + "Generic/Src", + "Allow the application to feed buffers to a pipeline", + "David Schleef , Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_app_src_template)); @@ -1135,6 +1133,7 @@ gst_app_src_uri_get_protocols (void) return protocols; } + static const gchar * gst_app_src_uri_get_uri (GstURIHandler * handler) { diff --git a/gst/adpcmdec/adpcmdec.c b/gst/adpcmdec/adpcmdec.c index 905f3b772a..34e4f3ae99 100644 --- a/gst/adpcmdec/adpcmdec.c +++ b/gst/adpcmdec/adpcmdec.c @@ -39,12 +39,6 @@ #define GST_CAT_DEFAULT adpcmdec_debug GST_DEBUG_CATEGORY_STATIC (adpcmdec_debug); -static const GstElementDetails adpcmdec_details = -GST_ELEMENT_DETAILS ("ADPCM decoder", - "Codec/Decoder/Audio", - "Decode MS and IMA ADPCM audio", - "Pioneers of the Inevitable "); - static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -249,7 +243,10 @@ gst_asf_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_asf_mux_details); + gst_element_class_set_details_simple (element_class, "ASF muxer", + "Codec/Muxer", + "Muxes audio and video into an ASF stream", + "Thiago Santos "); GST_DEBUG_CATEGORY_INIT (asfmux_debug, "asfmux", 0, "Muxer for ASF streams"); } diff --git a/gst/asfmux/gstasfparse.c b/gst/asfmux/gstasfparse.c index 8e76a3ccc2..44b2acbe97 100644 --- a/gst/asfmux/gstasfparse.c +++ b/gst/asfmux/gstasfparse.c @@ -35,12 +35,6 @@ enum PROP_0, }; -static const GstElementDetails gst_asf_parse_details = -GST_ELEMENT_DETAILS ("ASF parser", - "Parser", - "Parses ASF", - "Thiago Santos "); - static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -490,7 +484,8 @@ gst_asf_parse_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_asf_parse_details); + gst_element_class_set_details_simple (element_class, "ASF parser", + "Parser", "Parses ASF", "Thiago Santos "); GST_DEBUG_CATEGORY_INIT (asfparse_debug, "asfparse", 0, "Parser for ASF streams"); diff --git a/gst/asfmux/gstrtpasfpay.c b/gst/asfmux/gstrtpasfpay.c index 302cf3e230..1e616546e3 100644 --- a/gst/asfmux/gstrtpasfpay.c +++ b/gst/asfmux/gstrtpasfpay.c @@ -34,13 +34,6 @@ GST_DEBUG_CATEGORY_STATIC (rtpasfpay_debug); #define GST_CAT_DEFAULT (rtpasfpay_debug) -/* elementfactory information */ -static const GstElementDetails gst_rtp_asf_pay_details = -GST_ELEMENT_DETAILS ("RTP ASF payloader", - "Codec/Payloader/Network", - "Payload-encodes ASF into RTP packets (MS_RTSP)", - "Thiago Santos "); - static GstStaticPadTemplate gst_rtp_asf_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -96,7 +89,10 @@ gst_rtp_asf_pay_base_init (gpointer klass) gst_static_pad_template_get (&gst_rtp_asf_pay_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_asf_pay_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_asf_pay_details); + gst_element_class_set_details_simple (element_class, "RTP ASF payloader", + "Codec/Payloader/Network", + "Payload-encodes ASF into RTP packets (MS_RTSP)", + "Thiago Santos "); } static void diff --git a/gst/audiobuffer/gstaudioringbuffer.c b/gst/audiobuffer/gstaudioringbuffer.c index 19a9c48bfb..e3bc47a562 100644 --- a/gst/audiobuffer/gstaudioringbuffer.c +++ b/gst/audiobuffer/gstaudioringbuffer.c @@ -39,12 +39,6 @@ #include -static const GstElementDetails gst_audio_ringbuffer_details = -GST_ELEMENT_DETAILS ("AudioRingbuffer", - "Generic", - "Asynchronous Audio ringbuffer", - "Wim Taymans "); - static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -331,8 +325,9 @@ gst_audio_ringbuffer_class_init (GstAudioRingbufferClass * klass) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (gstelement_class, - &gst_audio_ringbuffer_details); + gst_element_class_set_details_simple (gstelement_class, "AudioRingbuffer", + "Generic", + "Asynchronous Audio ringbuffer", "Wim Taymans "); /* set several parent class virtual functions */ gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_audio_ringbuffer_finalize); diff --git a/gst/audioparsers/gstaacparse.c b/gst/audioparsers/gstaacparse.c index db63c5a515..d5a72d5117 100644 --- a/gst/audioparsers/gstaacparse.c +++ b/gst/audioparsers/gstaacparse.c @@ -128,17 +128,15 @@ static void gst_aacparse_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - GstElementDetails details = GST_ELEMENT_DETAILS ("AAC audio stream parser", - "Codec/Parser/Audio", - "Advanced Audio Coding parser", - "Stefan Kost "); gst_element_class_add_pad_template (element_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, &details); + gst_element_class_set_details_simple (element_class, + "AAC audio stream parser", "Codec/Parser/Audio", + "Advanced Audio Coding parser", "Stefan Kost "); } diff --git a/gst/audioparsers/gstamrparse.c b/gst/audioparsers/gstamrparse.c index 0266ee875a..313c74dc57 100644 --- a/gst/audioparsers/gstamrparse.c +++ b/gst/audioparsers/gstamrparse.c @@ -105,17 +105,16 @@ static void gst_amrparse_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - GstElementDetails details = GST_ELEMENT_DETAILS ("AMR audio stream parser", - "Codec/Parser/Audio", - "Adaptive Multi-Rate audio parser", - "Ronald Bultje "); gst_element_class_add_pad_template (element_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, &details); + gst_element_class_set_details_simple (element_class, + "AMR audio stream parser", "Codec/Parser/Audio", + "Adaptive Multi-Rate audio parser", + "Ronald Bultje "); } diff --git a/gst/bayer/gstbayer2rgb.c b/gst/bayer/gstbayer2rgb.c index ec2dadb1ae..153846503b 100644 --- a/gst/bayer/gstbayer2rgb.c +++ b/gst/bayer/gstbayer2rgb.c @@ -115,12 +115,6 @@ struct _GstBayer2RGBClass GstBaseTransformClass parent; }; -static const GstElementDetails element_details = -GST_ELEMENT_DETAILS ("Bayer to RGB decoder for cameras", - "Filter/Converter/Video", - "Converts video/x-raw-bayer to video/x-raw-rgb", - "William Brack "); - //#define SRC_CAPS GST_VIDEO_CAPS_RGBx #define SRC_CAPS \ GST_VIDEO_CAPS_RGBx ";" \ @@ -168,7 +162,10 @@ gst_bayer2rgb_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, + "Bayer to RGB decoder for cameras", "Filter/Converter/Video", + "Converts video/x-raw-bayer to video/x-raw-rgb", + "William Brack "); gst_element_class_add_pad_template (element_class, gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, diff --git a/gst/camerabin/camerabinimage.c b/gst/camerabin/camerabinimage.c index 0defb6367a..95a74dbfbb 100644 --- a/gst/camerabin/camerabinimage.c +++ b/gst/camerabin/camerabinimage.c @@ -85,13 +85,6 @@ static void gst_camerabin_image_get_property (GObject * object, guint prop_id, GST_BOILERPLATE (GstCameraBinImage, gst_camerabin_image, GstBin, GST_TYPE_BIN); -static const GstElementDetails gst_camerabin_image_details = -GST_ELEMENT_DETAILS ("Image capture bin for camerabin", - "Bin/Image", - "Process and store image data", - "Edgard Lima \n" - "Nokia Corporation "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -111,7 +104,11 @@ gst_camerabin_image_base_init (gpointer klass) gst_static_pad_template_get (&sink_template)); gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (eklass, &gst_camerabin_image_details); + gst_element_class_set_details_simple (eklass, + "Image capture bin for camerabin", "Bin/Image", + "Process and store image data", + "Edgard Lima , " + "Nokia Corporation "); } static void diff --git a/gst/camerabin/camerabinvideo.c b/gst/camerabin/camerabinvideo.c index 4796fc8353..e88f2aafc4 100644 --- a/gst/camerabin/camerabinvideo.c +++ b/gst/camerabin/camerabinvideo.c @@ -102,13 +102,6 @@ static void gst_camerabin_video_destroy_elements (GstCameraBinVideo * vid); GST_BOILERPLATE (GstCameraBinVideo, gst_camerabin_video, GstBin, GST_TYPE_BIN); -static const GstElementDetails gst_camerabin_video_details = -GST_ELEMENT_DETAILS ("Video capture bin for camerabin", - "Bin/Video", - "Process and store video data", - "Edgard Lima \n" - "Nokia Corporation "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -131,7 +124,11 @@ gst_camerabin_video_base_init (gpointer klass) gst_static_pad_template_get (&sink_template)); gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (eklass, &gst_camerabin_video_details); + gst_element_class_set_details_simple (eklass, + "Video capture bin for camerabin", "Bin/Video", + "Process and store video data", + "Edgard Lima , " + "Nokia Corporation "); } static void diff --git a/gst/camerabin/gstcamerabin.c b/gst/camerabin/gstcamerabin.c index cf02ad075d..1b1929d81f 100644 --- a/gst/camerabin/gstcamerabin.c +++ b/gst/camerabin/gstcamerabin.c @@ -2346,16 +2346,13 @@ gst_camerabin_adapt_image_capture (GstCameraBin * camera, GstCaps * in_caps) static void gst_camerabin_base_init (gpointer gclass) { - static GstElementDetails element_details = { - "Camera Bin", - "Generic/Bin/Camera", - "Handle lot of features present in DSC", - "Nokia Corporation \n" - "Edgard Lima " - }; GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "Camera Bin", + "Generic/Bin/Camera", + "Handle lot of features present in DSC", + "Nokia Corporation , " + "Edgard Lima "); } static void diff --git a/gst/cdxaparse/gstcdxaparse.c b/gst/cdxaparse/gstcdxaparse.c index 466e287f99..dda0d4ff12 100644 --- a/gst/cdxaparse/gstcdxaparse.c +++ b/gst/cdxaparse/gstcdxaparse.c @@ -65,14 +65,12 @@ static void gst_cdxa_parse_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - static const GstElementDetails gst_cdxa_parse_details = - GST_ELEMENT_DETAILS ("(S)VCD parser", + + gst_element_class_set_details_simple (element_class, "(S)VCD parser", "Codec/Parser", "Parse a .dat file from (S)VCD into raw MPEG-1", "Wim Taymans "); - gst_element_class_set_details (element_class, &gst_cdxa_parse_details); - /* register src pads */ gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template_factory)); diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c index 775e37cc61..4e818b62a5 100644 --- a/gst/chart/gstchart.c +++ b/gst/chart/gstchart.c @@ -62,14 +62,6 @@ struct _GstChartClass GType gst_chart_get_type (void); - -/* elementfactory information */ -static const GstElementDetails gst_chart_details = -GST_ELEMENT_DETAILS ("Chart drawer", - "Visualization", - "Takes frames of data and outputs video frames of a chart of data", - "Richard Boulton "); - /* signals and args */ enum { @@ -150,7 +142,10 @@ gst_chart_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, &gst_chart_details); + gst_element_class_set_details_simple (element_class, "Chart drawer", + "Visualization", + "Takes frames of data and outputs video frames of a chart of data", + "Richard Boulton "); } static void diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c index 59339bf610..9c07644f39 100644 --- a/gst/colorspace/gstcolorspace.c +++ b/gst/colorspace/gstcolorspace.c @@ -44,12 +44,6 @@ static GstColorspaceConverter gst_colorspace_converters[] = { {GST_COLORSPACE_YV12, GST_COLORSPACE_RGB16, gst_colorspace_YV12_to_rgb16}, }; -static const GstElementDetails colorspace_details = -GST_ELEMENT_DETAILS ("Colorspace converter", - "Filter/Converter/Video", - "Converts video from YUV to RGB", - "Wim Taymans "); - static GstStaticPadTemplate gst_colorspace_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -490,7 +484,9 @@ gst_colorspace_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_colorspace_sink_template)); - gst_element_class_set_details (element_class, &colorspace_details); + gst_element_class_set_details_simple (element_class, "Colorspace converter", + "Filter/Converter/Video", + "Converts video from YUV to RGB", "Wim Taymans "); } static void diff --git a/gst/dccp/gstdccpclientsink.c b/gst/dccp/gstdccpclientsink.c index 4c1fd50f00..ed7f462a9f 100644 --- a/gst/dccp/gstdccpclientsink.c +++ b/gst/dccp/gstdccpclientsink.c @@ -76,12 +76,6 @@ static GstFlowReturn gst_dccp_client_sink_render (GstBaseSink * bsink, GST_DEBUG_CATEGORY_STATIC (dccpclientsink_debug); -static const GstElementDetails gst_dccp_client_sink_details = -GST_ELEMENT_DETAILS ("DCCP client sink", - "Sink/Network", - "Send data as a client over the network via DCCP", - "E-Phone Team at Federal University of Campina Grande "); - static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -237,7 +231,10 @@ gst_dccp_client_sink_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (element_class, &gst_dccp_client_sink_details); + gst_element_class_set_details_simple (element_class, "DCCP client sink", + "Sink/Network", + "Send data as a client over the network via DCCP", + "E-Phone Team at Federal University of Campina Grande "); } static void diff --git a/gst/dccp/gstdccpclientsrc.c b/gst/dccp/gstdccpclientsrc.c index 4cb33e7c7f..a07d5e59dd 100644 --- a/gst/dccp/gstdccpclientsrc.c +++ b/gst/dccp/gstdccpclientsrc.c @@ -81,12 +81,6 @@ static gboolean gst_dccp_client_src_stop (GstBaseSrc * bsrc); GST_DEBUG_CATEGORY_STATIC (dccpclientsrc_debug); -static const GstElementDetails gst_dccp_client_src_details = -GST_ELEMENT_DETAILS ("DCCP client source", - "Source/Network", - "Receive data as a client over the network via DCCP", - "E-Phone Team at Federal University of Campina Grande "); - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -281,7 +275,10 @@ gst_dccp_client_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_dccp_client_src_details); + gst_element_class_set_details_simple (element_class, "DCCP client source", + "Source/Network", + "Receive data as a client over the network via DCCP", + "E-Phone Team at Federal University of Campina Grande "); } static void diff --git a/gst/dccp/gstdccpserversink.c b/gst/dccp/gstdccpserversink.c index e8f8a04f59..23282b1eba 100644 --- a/gst/dccp/gstdccpserversink.c +++ b/gst/dccp/gstdccpserversink.c @@ -78,13 +78,6 @@ static gboolean gst_dccp_server_sink_stop (GstBaseSink * bsink); GST_DEBUG_CATEGORY_STATIC (dccpserversink_debug); -static const GstElementDetails gst_dccp_server_sink_details = -GST_ELEMENT_DETAILS ("DCCP server sink", - "Sink/Network", - "Send data as a server over the network via DCCP", - "E-Phone Team at Federal University of Campina Grande "); - - static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -337,7 +330,10 @@ gst_dccp_server_sink_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (element_class, &gst_dccp_server_sink_details); + gst_element_class_set_details_simple (element_class, "DCCP server sink", + "Sink/Network", + "Send data as a server over the network via DCCP", + "E-Phone Team at Federal University of Campina Grande "); } /* diff --git a/gst/dccp/gstdccpserversrc.c b/gst/dccp/gstdccpserversrc.c index 4c344e422d..16cd38241b 100644 --- a/gst/dccp/gstdccpserversrc.c +++ b/gst/dccp/gstdccpserversrc.c @@ -76,12 +76,6 @@ static gboolean gst_dccp_server_src_stop (GstBaseSrc * bsrc); GST_DEBUG_CATEGORY_STATIC (dccpserversrc_debug); -static const GstElementDetails gst_dccp_server_src_details = -GST_ELEMENT_DETAILS ("DCCP server source", - "Source/Network", - "Receive data as a server over the network via DCCP", - "E-Phone Team at Federal University of Campina Grande "); - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -271,7 +265,10 @@ gst_dccp_server_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_dccp_server_src_details); + gst_element_class_set_details_simple (element_class, "DCCP server source", + "Source/Network", + "Receive data as a server over the network via DCCP", + "E-Phone Team at Federal University of Campina Grande "); } diff --git a/gst/debugutils/fpsdisplaysink.c b/gst/debugutils/fpsdisplaysink.c index 2521ca6377..7c97dfb135 100644 --- a/gst/debugutils/fpsdisplaysink.c +++ b/gst/debugutils/fpsdisplaysink.c @@ -56,13 +56,6 @@ #define FPS_DISPLAY_INTERVAL_MS 500 /* 500 ms */ #define DEFAULT_FONT "Sans 20" -static GstElementDetails fps_display_sink_details = { - "Measure and show framerate on videosink", - "Sink/Video", - "Shows the current frame-rate and drop-rate of the videosink as overlay or text on stdout", - "Zeeshan Ali , Stefan Kost " -}; - /* generic templates */ static GstStaticPadTemplate fps_display_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", @@ -127,7 +120,10 @@ fps_display_sink_class_init (GstFPSDisplaySinkClass * klass) gst_element_class_add_pad_template (gstelement_klass, gst_static_pad_template_get (&fps_display_sink_template)); - gst_element_class_set_details (gstelement_klass, &fps_display_sink_details); + gst_element_class_set_details_simple (gstelement_klass, + "Measure and show framerate on videosink", "Sink/Video", + "Shows the current frame-rate and drop-rate of the videosink as overlay or text on stdout", + "Zeeshan Ali , Stefan Kost "); } static gboolean diff --git a/gst/debugutils/gstcapssetter.c b/gst/debugutils/gstcapssetter.c index 12077c0dec..9489268ce2 100644 --- a/gst/debugutils/gstcapssetter.c +++ b/gst/debugutils/gstcapssetter.c @@ -83,12 +83,6 @@ enum #define DEFAULT_JOIN TRUE #define DEFAULT_REPLACE FALSE -static GstElementDetails caps_setter_details = -GST_ELEMENT_DETAILS ("CapsSetter", - "Generic", - "Set/merge caps on stream", - "Mark Nauwelaerts "); - static GstStaticPadTemplate gst_caps_setter_src_template = GST_STATIC_PAD_TEMPLATE (GST_BASE_TRANSFORM_SRC_NAME, GST_PAD_SRC, @@ -125,7 +119,10 @@ gst_caps_setter_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &caps_setter_details); + gst_element_class_set_details_simple (element_class, "CapsSetter", + "Generic", + "Set/merge caps on stream", + "Mark Nauwelaerts "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_caps_setter_sink_template)); diff --git a/gst/dtmf/gstdtmfdetect.c b/gst/dtmf/gstdtmfdetect.c index 5cb7c2cabc..cf8c058b11 100644 --- a/gst/dtmf/gstdtmfdetect.c +++ b/gst/dtmf/gstdtmfdetect.c @@ -84,14 +84,6 @@ GST_DEBUG_CATEGORY (dtmf_detect_debug); #define GST_CAT_DEFAULT (dtmf_detect_debug) -/* elementfactory information */ -static const GstElementDetails gst_dtmf_detect_details = -GST_ELEMENT_DETAILS ("DTMF detector element", - "Detect", - "This element detects DTMF tones", - "Olivier Crete "); - - static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -148,7 +140,10 @@ gst_dtmf_detect_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (element_class, &gst_dtmf_detect_details); + gst_element_class_set_details_simple (element_class, "DTMF detector element", + "Detect", + "This element detects DTMF tones", + "Olivier Crete "); } static void diff --git a/gst/dtmf/gstdtmfsrc.c b/gst/dtmf/gstdtmfsrc.c index 39699d8409..f1244b62be 100644 --- a/gst/dtmf/gstdtmfsrc.c +++ b/gst/dtmf/gstdtmfsrc.c @@ -194,13 +194,6 @@ enum DTMF_KEY_EVENT_D = 15, }; -/* elementfactory information */ -static const GstElementDetails gst_dtmf_src_details = -GST_ELEMENT_DETAILS ("DTMF tone generator", - "Source/Audio", - "Generates DTMF tones", - "Youness Alaoui "); - GST_DEBUG_CATEGORY_STATIC (gst_dtmf_src_debug); #define GST_CAT_DEFAULT gst_dtmf_src_debug @@ -253,7 +246,10 @@ gst_dtmf_src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_dtmf_src_template)); - gst_element_class_set_details (element_class, &gst_dtmf_src_details); + gst_element_class_set_details_simple (element_class, "DTMF tone generator", + "Source/Audio", + "Generates DTMF tones", + "Youness Alaoui "); } static void diff --git a/gst/dtmf/gstrtpdtmfdepay.c b/gst/dtmf/gstrtpdtmfdepay.c index 7cdfabfe7e..9f5ae92789 100644 --- a/gst/dtmf/gstrtpdtmfdepay.c +++ b/gst/dtmf/gstrtpdtmfdepay.c @@ -164,13 +164,6 @@ enum DTMF_KEY_EVENT_D = 15, }; -/* elementfactory information */ -static const GstElementDetails gst_rtp_dtmfdepay_details = -GST_ELEMENT_DETAILS ("RTP DTMF packet depayloader", - "Codec/Depayloader/Network", - "Generates DTMF Sound from telephone-event RTP packets", - "Youness Alaoui "); - GST_DEBUG_CATEGORY_STATIC (gst_rtp_dtmf_depay_debug); #define GST_CAT_DEFAULT gst_rtp_dtmf_depay_debug @@ -242,7 +235,10 @@ gst_rtp_dtmf_depay_base_init (gpointer klass) GST_DEBUG_CATEGORY_INIT (gst_rtp_dtmf_depay_debug, "rtpdtmfdepay", 0, "rtpdtmfdepay element"); - gst_element_class_set_details (element_class, &gst_rtp_dtmfdepay_details); + gst_element_class_set_details_simple (element_class, + "RTP DTMF packet depayloader", "Codec/Depayloader/Network", + "Generates DTMF Sound from telephone-event RTP packets", + "Youness Alaoui "); } static void diff --git a/gst/dtmf/gstrtpdtmfsrc.c b/gst/dtmf/gstrtpdtmfsrc.c index 65d0ce8c14..0018cb2b9c 100644 --- a/gst/dtmf/gstrtpdtmfsrc.c +++ b/gst/dtmf/gstrtpdtmfsrc.c @@ -144,13 +144,6 @@ #define MIN_PACKET_REDUNDANCY 1 #define MAX_PACKET_REDUNDANCY 5 -/* elementfactory information */ -static const GstElementDetails gst_rtp_dtmf_src_details = -GST_ELEMENT_DETAILS ("RTP DTMF packet generator", - "Source/Network", - "Generates RTP DTMF packets", - "Zeeshan Ali "); - GST_DEBUG_CATEGORY_STATIC (gst_rtp_dtmf_src_debug); #define GST_CAT_DEFAULT gst_rtp_dtmf_src_debug @@ -228,7 +221,9 @@ gst_rtp_dtmf_src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rtp_dtmf_src_template)); - gst_element_class_set_details (element_class, &gst_rtp_dtmf_src_details); + gst_element_class_set_details_simple (element_class, + "RTP DTMF packet generator", "Source/Network", + "Generates RTP DTMF packets", "Zeeshan Ali "); } static void diff --git a/gst/dvdspu/gstdvdspu.c b/gst/dvdspu/gstdvdspu.c index fd51e262d6..e4ded0535e 100644 --- a/gst/dvdspu/gstdvdspu.c +++ b/gst/dvdspu/gstdvdspu.c @@ -116,12 +116,6 @@ static void gst_dvd_spu_handle_dvd_event (GstDVDSpu * dvdspu, GstEvent * event); static void gst_dvd_spu_base_init (gpointer gclass) { - static GstElementDetails element_details = - GST_ELEMENT_DETAILS ("GStreamer Sub-picture Overlay", - "Mixer/Video/Overlay/SubPicture/DVD/Bluray", - "Parses Sub-Picture command streams and renders the SPU overlay " - "onto the video as it passes through", - "Jan Schmidt "); GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); gst_element_class_add_pad_template (element_class, @@ -130,7 +124,11 @@ gst_dvd_spu_base_init (gpointer gclass) gst_static_pad_template_get (&video_sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&subpic_sink_factory)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "Sub-picture Overlay", + "Mixer/Video/Overlay/SubPicture/DVD/Bluray", + "Parses Sub-Picture command streams and renders the SPU overlay " + "onto the video as it passes through", + "Jan Schmidt "); element_class->change_state = gst_dvd_spu_change_state; } diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c index 7d919b90f8..de76a5826f 100644 --- a/gst/festival/gstfestival.c +++ b/gst/festival/gstfestival.c @@ -122,13 +122,6 @@ static FT_Info *festival_default_info (void); static char *socket_receive_file_to_buff (int fd, int *size); static char *client_accept_s_expr (int fd); -/* elementfactory information */ -static const GstElementDetails gst_festival_details = -GST_ELEMENT_DETAILS ("Festival Text-to-Speech synthesizer", - "Filter/Effect/Audio", - "Synthesizes plain text into audio", - "Wim Taymans "); - static GstStaticPadTemplate sink_template_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -196,7 +189,10 @@ gst_festival_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template_factory)); - gst_element_class_set_details (element_class, &gst_festival_details); + gst_element_class_set_details_simple (element_class, + "Festival Text-to-Speech synthesizer", "Filter/Effect/Audio", + "Synthesizes plain text into audio", + "Wim Taymans "); } static void diff --git a/gst/filter/gstiir.c b/gst/filter/gstiir.c index cf37256cac..a341a94966 100644 --- a/gst/filter/gstiir.c +++ b/gst/filter/gstiir.c @@ -35,14 +35,6 @@ #define GST_CAT_DEFAULT gst_iir_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -static const GstElementDetails iir_details = -GST_ELEMENT_DETAILS ("Infinite Impulse Response (IIR) filter", - "Filter/Effect/Audio", - "IIR filter based on vorbis code", - "Monty , " - "Thomas Vander Stichele , " - "Dreamlab Technologies Ltd. "); - /* Filter signals and args */ enum { @@ -110,7 +102,12 @@ gst_iir_base_init (gpointer g_class) gst_static_pad_template_get (&iir_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&iir_sink_template)); - gst_element_class_set_details (element_class, &iir_details); + gst_element_class_set_details_simple (element_class, + "Infinite Impulse Response (IIR) filter", "Filter/Effect/Audio", + "IIR filter based on vorbis code", + "Monty , " + "Thomas Vander Stichele , " + "Dreamlab Technologies Ltd. "); } static void diff --git a/gst/freeze/gstfreeze.c b/gst/freeze/gstfreeze.c index d554988393..a721eab2b2 100644 --- a/gst/freeze/gstfreeze.c +++ b/gst/freeze/gstfreeze.c @@ -46,14 +46,6 @@ enum ARG_MAX_BUFFERS, }; - -static const GstElementDetails freeze_details = -GST_ELEMENT_DETAILS ("Stream freezer", - "Generic", - "Makes a stream from buffers of data", - "Gergely Nagy ," - " Renato Filho "); - static GstStaticPadTemplate gst_freeze_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -92,7 +84,11 @@ gst_freeze_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &freeze_details); + gst_element_class_set_details_simple (element_class, "Stream freezer", + "Generic", + "Makes a stream from buffers of data", + "Gergely Nagy ," + " Renato Filho "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_freeze_sink_template)); diff --git a/gst/games/gstpuzzle.c b/gst/games/gstpuzzle.c index 5283b6b760..9e35f04248 100644 --- a/gst/games/gstpuzzle.c +++ b/gst/games/gstpuzzle.c @@ -120,17 +120,16 @@ gst_puzzle_get_type (void) static void gst_puzzle_base_init (gpointer g_class) { - static const GstElementDetails puzzle_details = - GST_ELEMENT_DETAILS ("A simple puzzle", - "Filter/Effect/Video/Games", - "A simple puzzle, use arrow keys and space to restart/solve", - "Benjamin Otte "); + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstVideofilterClass *videofilter_class = GST_VIDEOFILTER_CLASS (g_class); int i; GstVideofilterFormat *f; - gst_element_class_set_details (element_class, &puzzle_details); + gst_element_class_set_details_simple (element_class, "A simple puzzle", + "Filter/Effect/Video/Games", + "A simple puzzle, use arrow keys and space to restart/solve", + "Benjamin Otte "); for (i = 0; i < gst_video_format_count; i++) { f = g_new0 (GstVideofilterFormat, 1); diff --git a/gst/h264parse/gsth264parse.c b/gst/h264parse/gsth264parse.c index 66458ae588..806c5ab5a2 100644 --- a/gst/h264parse/gsth264parse.c +++ b/gst/h264parse/gsth264parse.c @@ -46,13 +46,6 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_DEBUG_CATEGORY_STATIC (h264_parse_debug); #define GST_CAT_DEFAULT h264_parse_debug -static const GstElementDetails gst_h264_parse_details = -GST_ELEMENT_DETAILS ("H264Parse", - "Codec/Parser/Video", - "Parses raw h264 stream", - "Michal Benes ," - "Wim Taymans "); - #define DEFAULT_SPLIT_PACKETIZED FALSE #define DEFAULT_ACCESS_UNIT FALSE #define DEFAULT_OUTPUT_FORMAT GST_H264_PARSE_FORMAT_INPUT @@ -896,7 +889,11 @@ gst_h264_parse_base_init (gpointer g_class) gst_static_pad_template_get (&srctemplate)); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (gstelement_class, &gst_h264_parse_details); + gst_element_class_set_details_simple (gstelement_class, "H264Parse", + "Codec/Parser/Video", + "Parses raw h264 stream", + "Michal Benes ," + "Wim Taymans "); GST_DEBUG_CATEGORY_INIT (h264_parse_debug, "h264parse", 0, "h264 parser"); } diff --git a/gst/hdvparse/gsthdvparse.c b/gst/hdvparse/gsthdvparse.c index 03b77747de..9a610f7cb7 100644 --- a/gst/hdvparse/gsthdvparse.c +++ b/gst/hdvparse/gsthdvparse.c @@ -113,19 +113,16 @@ static GstCaps *gst_hdvparse_transform_caps (GstBaseTransform * trans, static void gst_hdvparse_base_init (gpointer klass) { - static GstElementDetails element_details = { - "HDVParser", - "Data/Parser", - "HDV private stream Parser", - "Edward Hervey " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); 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, "HDVParser", + "Data/Parser", + "HDV private stream Parser", "Edward Hervey "); } /* initialize the HDVParse's class */ diff --git a/gst/invtelecine/gstinvtelecine.c b/gst/invtelecine/gstinvtelecine.c index be9d56a455..753957f10d 100644 --- a/gst/invtelecine/gstinvtelecine.c +++ b/gst/invtelecine/gstinvtelecine.c @@ -144,14 +144,13 @@ gst_invtelecine_get_type (void) static void gst_invtelecine_base_init (gpointer g_class) { - static const GstElementDetails invtelecine_details = - GST_ELEMENT_DETAILS ("H.264 Decoder", + + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); + + gst_element_class_set_details_simple (element_class, "H.264 Decoder", "Codec/Decoder/Video", "Decode H.264/MPEG-4 AVC video streams", "Entropy Wave "); - GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - - gst_element_class_set_details (element_class, &invtelecine_details); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_invtelecine_sink_template)); diff --git a/gst/legacyresample/gstlegacyresample.c b/gst/legacyresample/gstlegacyresample.c index cbcd6fddc2..95c924eae3 100644 --- a/gst/legacyresample/gstlegacyresample.c +++ b/gst/legacyresample/gstlegacyresample.c @@ -51,13 +51,6 @@ GST_DEBUG_CATEGORY_STATIC (legacyresample_debug); #define GST_CAT_DEFAULT legacyresample_debug -/* elementfactory information */ -static const GstElementDetails gst_legacyresample_details = -GST_ELEMENT_DETAILS ("Audio scaler", - "Filter/Converter/Audio", - "Resample audio", - "David Schleef "); - #define DEFAULT_FILTERLEN 16 enum @@ -147,7 +140,9 @@ gst_legacyresample_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&gst_legacyresample_sink_template)); - gst_element_class_set_details (gstelement_class, &gst_legacyresample_details); + gst_element_class_set_details_simple (gstelement_class, "Audio scaler", + "Filter/Converter/Audio", + "Resample audio", "David Schleef "); } static void diff --git a/gst/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c index 5edd9f0a9a..151aaa4951 100644 --- a/gst/librfb/gstrfbsrc.c +++ b/gst/librfb/gstrfbsrc.c @@ -55,14 +55,6 @@ GST_DEBUG_CATEGORY_STATIC (rfbsrc_debug); GST_DEBUG_CATEGORY (rfbdecoder_debug); #define GST_CAT_DEFAULT rfbsrc_debug -static const GstElementDetails gst_rfb_src_details = -GST_ELEMENT_DETAILS ("Rfb source", - "Source/Video", - "Creates a rfb video stream", - "David A. Schleef , " - "Andre Moreira Magalhaes , " - "Thijs Vermeir "); - static GstStaticPadTemplate gst_rfb_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -102,7 +94,12 @@ gst_rfb_src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_rfb_src_template)); - gst_element_class_set_details (element_class, &gst_rfb_src_details); + gst_element_class_set_details_simple (element_class, "Rfb source", + "Source/Video", + "Creates a rfb video stream", + "David A. Schleef , " + "Andre Moreira Magalhaes , " + "Thijs Vermeir "); } static void diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c index 25fa406395..cfd8055f5a 100644 --- a/gst/liveadder/liveadder.c +++ b/gst/liveadder/liveadder.c @@ -53,14 +53,6 @@ GST_DEBUG_CATEGORY_STATIC (live_adder_debug); #define GST_CAT_DEFAULT (live_adder_debug) -/* elementfactory information */ -static const GstElementDetails gst_live_adder_details = -GST_ELEMENT_DETAILS ("Live Adder element", - "Generic/Audio", - "Mixes live/discontinuous audio streams", - "Olivier Crete "); - - static GstStaticPadTemplate gst_live_adder_sink_template = GST_STATIC_PAD_TEMPLATE ("sink%d", GST_PAD_SINK, @@ -181,7 +173,10 @@ gst_live_adder_class_init (GstLiveAdderClass * klass) gst_static_pad_template_get (&gst_live_adder_src_template)); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&gst_live_adder_sink_template)); - gst_element_class_set_details (gstelement_class, &gst_live_adder_details); + gst_element_class_set_details_simple (gstelement_class, "Live Adder element", + "Generic/Audio", + "Mixes live/discontinuous audio streams", + "Olivier Crete "); parent_class = g_type_class_peek_parent (klass); diff --git a/gst/mixmatrix/mixmatrix.c b/gst/mixmatrix/mixmatrix.c index 93ca2ab8fb..f156da1a2d 100644 --- a/gst/mixmatrix/mixmatrix.c +++ b/gst/mixmatrix/mixmatrix.c @@ -67,13 +67,6 @@ struct _GstMixMatrixClass void (*resize) (GstMixMatrix * mix); }; -/* elementfactory information */ -static const GstElementDetails mixmatrix_details = -GST_ELEMENT_DETAILS ("Mixing Matrix", - "Filter/Editor/Audio", - "Mix N audio channels together into M channels", - "Erik Walthinsen "); - enum { /* FILL ME */ @@ -122,6 +115,7 @@ static GstPadLinkReturn gst_mixmatrix_connect (GstPad * pad, static void gst_mixmatrix_loop (GstElement * element); static guint gst_mixmatrix_signals[LAST_SIGNAL] = { 0 }; + static GstElementClass *parent_class = NULL; GType @@ -158,7 +152,10 @@ gst_mixmatrix_base_init (GstMixMatrixClass * klass) gst_static_pad_template_get (&mixmatrix_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&mixmatrix_src_template)); - gst_element_class_set_details (element_class, &mixmatrix_details); + gst_element_class_set_details_simple (element_class, "Mixing Matrix", + "Filter/Editor/Audio", + "Mix N audio channels together into M channels", + "Erik Walthinsen "); } static void diff --git a/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c index 64089567e5..db6c7a41bf 100644 --- a/gst/mpeg1sys/gstmpeg1systemencode.c +++ b/gst/mpeg1sys/gstmpeg1systemencode.c @@ -28,15 +28,6 @@ #include "gstmpeg1systemencode.h" #include "main.h" -/*#define GST_DEBUG (b...) g_print (##b) */ - -/* elementfactory information */ -static const GstElementDetails system_encode_details = -GST_ELEMENT_DETAILS ("MPEG-1 muxer", - "Codec/Muxer", - "Multiplexes MPEG-1 Streams", - "Wim Taymans "); - /* GstMPEG1SystemEncode signals and args */ enum { @@ -125,7 +116,9 @@ gst_system_encode_base_init (GstMPEG1SystemEncodeClass * klass) gst_static_pad_template_get (&audio_sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&video_sink_factory)); - gst_element_class_set_details (element_class, &system_encode_details); + gst_element_class_set_details_simple (element_class, "MPEG-1 muxer", + "Codec/Muxer", + "Multiplexes MPEG-1 Streams", "Wim Taymans "); } static void diff --git a/gst/mpeg4videoparse/mpeg4videoparse.c b/gst/mpeg4videoparse/mpeg4videoparse.c index ceafd6f726..bfcf845161 100644 --- a/gst/mpeg4videoparse/mpeg4videoparse.c +++ b/gst/mpeg4videoparse/mpeg4videoparse.c @@ -29,13 +29,6 @@ GST_DEBUG_CATEGORY_STATIC (mpeg4v_parse_debug); #define GST_CAT_DEFAULT mpeg4v_parse_debug -/* elementfactory information */ -static GstElementDetails mpeg4vparse_details = -GST_ELEMENT_DETAILS ("MPEG 4 video elementary stream parser", - "Codec/Parser/Video", - "Parses MPEG-4 Part 2 elementary video streams", - "Julien Moutte "); - static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -859,7 +852,10 @@ gst_mpeg4vparse_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &mpeg4vparse_details); + gst_element_class_set_details_simple (element_class, + "MPEG 4 video elementary stream parser", "Codec/Parser/Video", + "Parses MPEG-4 Part 2 elementary video streams", + "Julien Moutte "); } static void diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c index d80995ab7c..0b4f242e07 100644 --- a/gst/mpegdemux/gstmpegdemux.c +++ b/gst/mpegdemux/gstmpegdemux.c @@ -77,14 +77,6 @@ typedef enum GST_DEBUG_CATEGORY_STATIC (gstflupsdemux_debug); #define GST_CAT_DEFAULT (gstflupsdemux_debug) -/* elementfactory information */ -static GstElementDetails flups_demux_details = { - "The Fluendo MPEG Program Stream Demuxer", - "Codec/Demuxer", - "Demultiplexes MPEG Program Streams", - "Wim Taymans " -}; - #define GST_TYPE_FLUPS_DEMUX_SYNC (gst_flups_demux_sync_get_type ()) GType gst_flups_demux_sync_get_type (void) @@ -241,7 +233,9 @@ gst_flups_demux_base_init (GstFluPSDemuxClass * klass) gst_element_class_add_pad_template (element_class, klass->private_template); gst_element_class_add_pad_template (element_class, klass->sink_template); - gst_element_class_set_details (element_class, &flups_demux_details); + gst_element_class_set_details_simple (element_class, + "The Fluendo MPEG Program Stream Demuxer", "Codec/Demuxer", + "Demultiplexes MPEG Program Streams", "Wim Taymans "); } static void diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c index eb5a05a10f..9578f784d4 100644 --- a/gst/mpegdemux/gstmpegtsdemux.c +++ b/gst/mpegdemux/gstmpegtsdemux.c @@ -76,13 +76,6 @@ GST_DEBUG_CATEGORY_STATIC (gstmpegtsdemux_debug); #define FORCE_INLINE #endif -static GstElementDetails mpegts_demux_details = { - "The Fluendo MPEG Transport stream demuxer", - "Codec/Demuxer", - "Demultiplexes MPEG2 Transport Streams", - "Wim Taymans " -}; - /* MPEG2Demux signals and args */ enum { @@ -257,7 +250,9 @@ gst_mpegts_demux_base_init (GstMpegTSDemuxClass * klass) gst_element_class_add_pad_template (element_class, klass->private_template); gst_element_class_add_pad_template (element_class, klass->sink_template); - gst_element_class_set_details (element_class, &mpegts_demux_details); + gst_element_class_set_details_simple (element_class, + "The Fluendo MPEG Transport stream demuxer", "Codec/Demuxer", + "Demultiplexes MPEG2 Transport Streams", "Wim Taymans "); } static void @@ -1046,8 +1041,8 @@ gst_mpegts_demux_data_cb (GstPESFilter * filter, gboolean first, * to drop. */ if (stream->PMT_pid <= MPEGTS_MAX_PID && demux->streams[stream->PMT_pid] && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID] - && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]-> - discont_PCR) { + && demux->streams[demux->streams[stream->PMT_pid]->PMT. + PCR_PID]->discont_PCR) { GST_WARNING_OBJECT (demux, "middle of discont, dropping"); goto bad_timestamp; } @@ -1069,8 +1064,8 @@ gst_mpegts_demux_data_cb (GstPESFilter * filter, gboolean first, */ if (stream->PMT_pid <= MPEGTS_MAX_PID && demux->streams[stream->PMT_pid] && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID] - && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]-> - last_PCR > 0) { + && demux->streams[demux->streams[stream->PMT_pid]->PMT. + PCR_PID]->last_PCR > 0) { GST_DEBUG_OBJECT (demux, "timestamps wrapped before noticed in PCR"); time = MPEGTIME_TO_GSTTIME (pts) + stream->base_time + MPEGTIME_TO_GSTTIME ((guint64) (1) << 33); diff --git a/gst/mpegdemux/mpegtsparse.c b/gst/mpegdemux/mpegtsparse.c index beacc451f2..36608fb200 100644 --- a/gst/mpegdemux/mpegtsparse.c +++ b/gst/mpegdemux/mpegtsparse.c @@ -82,13 +82,6 @@ static GQuark QUARK_PCR_PID; static GQuark QUARK_STREAMS; static GQuark QUARK_STREAM_TYPE; -static GstElementDetails mpegts_parse_details = -GST_ELEMENT_DETAILS ("MPEG transport stream parser", - "Codec/Parser", - "Parses MPEG2 transport streams", - "Alessandro Decina \n" - "Zaheer Abbas Merali "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -228,7 +221,11 @@ mpegts_parse_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&program_template)); - gst_element_class_set_details (element_class, &mpegts_parse_details); + gst_element_class_set_details_simple (element_class, + "MPEG transport stream parser", "Codec/Parser", + "Parses MPEG2 transport streams", + "Alessandro Decina , " + "Zaheer Abbas Merali "); } static void diff --git a/gst/mpegpsmux/mpegpsmux.c b/gst/mpegpsmux/mpegpsmux.c index 59c19aa5bb..70f0213e04 100644 --- a/gst/mpegpsmux/mpegpsmux.c +++ b/gst/mpegpsmux/mpegpsmux.c @@ -107,12 +107,7 @@ GST_BOILERPLATE (MpegPsMux, mpegpsmux, GstElement, GST_TYPE_ELEMENT); static void mpegpsmux_base_init (gpointer g_class) { - const GstElementDetails mpegpsmux_details = { - "MPEG Program Stream Muxer", - "Codec/Muxer", - "Multiplexes media streams into an MPEG Program Stream", - "Lin YANG " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -120,7 +115,10 @@ mpegpsmux_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&mpegpsmux_src_factory)); - gst_element_class_set_details (element_class, &mpegpsmux_details); + gst_element_class_set_details_simple (element_class, + "MPEG Program Stream Muxer", "Codec/Muxer", + "Multiplexes media streams into an MPEG Program Stream", + "Lin YANG "); } static void diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c index cb630848df..08148e1d73 100644 --- a/gst/mpegtsmux/mpegtsmux.c +++ b/gst/mpegtsmux/mpegtsmux.c @@ -155,12 +155,7 @@ GST_BOILERPLATE (MpegTsMux, mpegtsmux, GstElement, GST_TYPE_ELEMENT); static void mpegtsmux_base_init (gpointer g_class) { - const GstElementDetails mpegtsmux_details = { - "MPEG Transport Stream Muxer", - "Codec/Muxer", - "Multiplexes media streams into an MPEG Transport Stream", - "Fluendo " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, @@ -168,7 +163,10 @@ mpegtsmux_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&mpegtsmux_src_factory)); - gst_element_class_set_details (element_class, &mpegtsmux_details); + gst_element_class_set_details_simple (element_class, + "MPEG Transport Stream Muxer", "Codec/Muxer", + "Multiplexes media streams into an MPEG Transport Stream", + "Fluendo "); } static void diff --git a/gst/mpegvideoparse/mpegvideoparse.c b/gst/mpegvideoparse/mpegvideoparse.c index 43ffb49444..442183813a 100644 --- a/gst/mpegvideoparse/mpegvideoparse.c +++ b/gst/mpegvideoparse/mpegvideoparse.c @@ -44,14 +44,6 @@ GST_DEBUG_CATEGORY_STATIC (mpv_parse_debug); #define GST_CAT_DEFAULT mpv_parse_debug -/* elementfactory information */ -static GstElementDetails mpegvideoparse_details = -GST_ELEMENT_DETAILS ("MPEG video elementary stream parser", - "Codec/Parser/Video", - "Parses and frames MPEG-1 and MPEG-2 elementary video streams", - "Wim Taymans \n" - "Jan Schmidt "); - static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -140,7 +132,12 @@ gst_mpegvideoparse_base_init (MpegVideoParseClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &mpegvideoparse_details); + gst_element_class_set_details_simple (element_class, + "MPEG video elementary stream parser", + "Codec/Parser/Video", + "Parses and frames MPEG-1 and MPEG-2 elementary video streams", + "Wim Taymans , " + "Jan Schmidt "); } static void diff --git a/gst/mve/gstmvedemux.c b/gst/mve/gstmvedemux.c index 76acc2dbcb..816dc543b5 100644 --- a/gst/mve/gstmvedemux.c +++ b/gst/mve/gstmvedemux.c @@ -1089,12 +1089,7 @@ gst_mve_demux_dispose (GObject * obj) static void gst_mve_demux_base_init (GstMveDemuxClass * klass) { - static const GstElementDetails mve_demux_details = { - "MVE Demuxer", - "Codec/Demuxer", - "Demultiplex an Interplay movie (MVE) stream into audio and video", - "Jens Granseuer " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_pad_template (element_class, @@ -1103,7 +1098,10 @@ gst_mve_demux_base_init (GstMveDemuxClass * klass) gst_static_pad_template_get (&vidsrc_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&audsrc_template)); - gst_element_class_set_details (element_class, &mve_demux_details); + gst_element_class_set_details_simple (element_class, "MVE Demuxer", + "Codec/Demuxer", + "Demultiplex an Interplay movie (MVE) stream into audio and video", + "Jens Granseuer "); } static void diff --git a/gst/mve/gstmvemux.c b/gst/mve/gstmvemux.c index 5282f8100c..e54c4a1533 100644 --- a/gst/mve/gstmvemux.c +++ b/gst/mve/gstmvemux.c @@ -1353,11 +1353,6 @@ gst_mve_mux_release_pad (GstElement * element, GstPad * pad) static void gst_mve_mux_base_init (GstMveMuxClass * klass) { - static const GstElementDetails gst_mve_mux_details = - GST_ELEMENT_DETAILS ("MVE Multiplexer", - "Codec/Muxer", - "Muxes audio and video into an MVE stream", - "Jens Granseuer "); GstElementClass *element_class = GST_ELEMENT_CLASS (klass); @@ -1368,7 +1363,10 @@ gst_mve_mux_base_init (GstMveMuxClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&video_sink_factory)); - gst_element_class_set_details (element_class, &gst_mve_mux_details); + gst_element_class_set_details_simple (element_class, "MVE Multiplexer", + "Codec/Muxer", + "Muxes audio and video into an MVE stream", + "Jens Granseuer "); } static void diff --git a/gst/nsf/gstnsf.c b/gst/nsf/gstnsf.c index 666aaf4908..11e2a86ab0 100644 --- a/gst/nsf/gstnsf.c +++ b/gst/nsf/gstnsf.c @@ -29,12 +29,6 @@ #define GST_CAT_DEFAULT nsfdec_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -static const GstElementDetails gst_nsfdec_details = -GST_ELEMENT_DETAILS ("Nsf decoder", - "Codec/Decoder/Audio", - "Using nosefart to decode NSF audio tunes", - "Johan Dahlin "); - /* Nsfdec signals and args */ enum { @@ -142,7 +136,10 @@ gst_nsfdec_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_nsfdec_details); + gst_element_class_set_details_simple (element_class, "Nsf decoder", + "Codec/Decoder/Audio", + "Using nosefart to decode NSF audio tunes", + "Johan Dahlin "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_templ)); diff --git a/gst/nuvdemux/gstnuvdemux.c b/gst/nuvdemux/gstnuvdemux.c index 4e1ef5a39a..70e1e30a83 100644 --- a/gst/nuvdemux/gstnuvdemux.c +++ b/gst/nuvdemux/gstnuvdemux.c @@ -60,13 +60,6 @@ GST_DEBUG_CATEGORY_STATIC (nuvdemux_debug); GST_DEBUG_CATEGORY_EXTERN (GST_CAT_EVENT); -static const GstElementDetails gst_nuv_demux_details = -GST_ELEMENT_DETAILS ("Nuv demuxer", - "Codec/Demuxer", - "Demultiplex a MythTV NuppleVideo .nuv file into audio and video", - "Renato Araujo Oliveira Filho ," - "Rosfran Borges "); - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -139,7 +132,11 @@ gst_nuv_demux_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &gst_nuv_demux_details); + gst_element_class_set_details_simple (element_class, "Nuv demuxer", + "Codec/Demuxer", + "Demultiplex a MythTV NuppleVideo .nuv file into audio and video", + "Renato Araujo Oliveira Filho ," + "Rosfran Borges "); } static void diff --git a/gst/overlay/gstoverlay.c b/gst/overlay/gstoverlay.c index 2c6345a97e..c900a6bd9a 100644 --- a/gst/overlay/gstoverlay.c +++ b/gst/overlay/gstoverlay.c @@ -24,13 +24,6 @@ #include "gstoverlay.h" #include -/* elementfactory information */ -static const GstElementDetails overlay_details = -GST_ELEMENT_DETAILS ("Video overlay", - "Filter/Editor/Video", - "Overlay multiple video streams", - "David Schleef "); - static GstStaticPadTemplate overlay_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -125,7 +118,9 @@ gst_overlay_base_init (GstOverlayClass * klass) gst_static_pad_template_get (&overlay_sink3_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&overlay_src_factory)); - gst_element_class_set_details (element_class, &overlay_details); + gst_element_class_set_details_simple (element_class, "Video overlay", + "Filter/Editor/Video", + "Overlay multiple video streams", "David Schleef "); } static void diff --git a/gst/passthrough/gstpassthrough.c b/gst/passthrough/gstpassthrough.c index 5ccfe1aa66..c0f009812f 100644 --- a/gst/passthrough/gstpassthrough.c +++ b/gst/passthrough/gstpassthrough.c @@ -29,13 +29,6 @@ #define PASSTHRU_BUF_SIZE 4096 #define PASSTHRU_NUM_BUFS 4 -/* elementfactory information */ -static const GstElementDetails passthrough_details = -GST_ELEMENT_DETAILS ("Passthrough", - "Filter/Effect/Audio", - "Transparent filter for audio/raw (boilerplate for effects)", - "Thomas , " "Andy Wingo "); - enum { /* FILL ME */ @@ -169,7 +162,10 @@ passthrough_base_init (GstPassthroughClass * klass) gst_static_pad_template_get (&passthrough_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&passthrough_sink_template)); - gst_element_class_set_details (element_class, &passthrough_details); + gst_element_class_set_details_simple (element_class, "Passthrough", + "Filter/Effect/Audio", + "Transparent filter for audio/raw (boilerplate for effects)", + "Thomas , " "Andy Wingo "); } static void diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c index 6e20212694..96ab3f20e0 100644 --- a/gst/pcapparse/gstpcapparse.c +++ b/gst/pcapparse/gstpcapparse.c @@ -95,19 +95,16 @@ static void gst_pcap_parse_base_init (gpointer gclass) { GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); - static GstElementDetails element_details = { - "PCapParse", - "Raw/Parser", - "Parses a raw pcap stream", - "Ole André Vadla Ravnås " - }; gst_element_class_add_pad_template (element_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, &element_details); + gst_element_class_set_details_simple (element_class, "PCapParse", + "Raw/Parser", + "Parses a raw pcap stream", + "Ole André Vadla Ravnås "); } static void diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c index 91eae05cc5..f754b1580a 100644 --- a/gst/playondemand/gstplayondemand.c +++ b/gst/playondemand/gstplayondemand.c @@ -40,14 +40,6 @@ #define GST_POD_BUFPOOL_SIZE 4096 #define GST_POD_BUFPOOL_NUM 6 - -static const GstElementDetails play_on_demand_details = -GST_ELEMENT_DETAILS ("Play On Demand", - "Filter/Editor/Audio", - "Schedule a stream to play at specific times, or when a signal is received", - "Leif Morgan Johnson "); - - static GstStaticPadTemplate play_on_demand_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -152,7 +144,10 @@ play_on_demand_base_init (GstPlayOnDemandClass * klass) gst_static_pad_template_get (&play_on_demand_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&play_on_demand_sink_template)); - gst_element_class_set_details (element_class, &play_on_demand_details); + gst_element_class_set_details_simple (element_class, "Play On Demand", + "Filter/Editor/Audio", + "Schedule a stream to play at specific times, or when a signal is received", + "Leif Morgan Johnson "); } static void diff --git a/gst/qtmux/gstqtmoovrecover.c b/gst/qtmux/gstqtmoovrecover.c index 333ab6a8d3..03bee52884 100644 --- a/gst/qtmux/gstqtmoovrecover.c +++ b/gst/qtmux/gstqtmoovrecover.c @@ -71,11 +71,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_qt_moov_recover_debug); #define GST_CAT_DEFAULT gst_qt_moov_recover_debug -static GstElementDetails gst_qt_moov_recover_details = -GST_ELEMENT_DETAILS ("QT Moov Recover", - "Util", "Recovers unfinished qtmux files", - "Thiago Santos "); - /* QTMoovRecover signals and args */ enum { @@ -113,7 +108,9 @@ gst_qt_moov_recover_base_init (gpointer g_class) #if 0 GstQTMoovRecoverClass *klass = (GstQTMoovRecoverClass *) g_class; #endif - gst_element_class_set_details (element_class, &gst_qt_moov_recover_details); + gst_element_class_set_details_simple (element_class, "QT Moov Recover", + "Util", "Recovers unfinished qtmux files", + "Thiago Santos "); } static void diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c index 6035c61c82..9e00957c16 100644 --- a/gst/qtmux/gstqtmux.c +++ b/gst/qtmux/gstqtmux.c @@ -155,8 +155,8 @@ gst_qt_mux_base_init (gpointer g_class) GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstQTMuxClass *klass = (GstQTMuxClass *) g_class; GstQTMuxClassParams *params; - GstElementDetails details; GstPadTemplate *videosinktempl, *audiosinktempl, *srctempl; + gchar *longname, *description; params = (GstQTMuxClassParams *) g_type_get_qdata (G_OBJECT_CLASS_TYPE (g_class), @@ -164,16 +164,14 @@ gst_qt_mux_base_init (gpointer g_class) g_assert (params != NULL); /* construct the element details struct */ - details.longname = g_strdup_printf ("%s Muxer", params->prop->long_name); - details.klass = g_strdup ("Codec/Muxer"); - details.description = - g_strdup_printf ("Multiplex audio and video into a %s file", + longname = g_strdup_printf ("%s Muxer", params->prop->long_name); + description = g_strdup_printf ("Multiplex audio and video into a %s file", params->prop->long_name); - details.author = "Thiago Sousa Santos "; - gst_element_class_set_details (element_class, &details); - g_free (details.longname); - g_free (details.klass); - g_free (details.description); + gst_element_class_set_details_simple (element_class, longname, + "Codec/Muxer", description, + "Thiago Sousa Santos "); + g_free (longname); + g_free (description); /* pad templates */ srctempl = gst_pad_template_new ("src", GST_PAD_SRC, diff --git a/gst/real/gstrealaudiodec.c b/gst/real/gstrealaudiodec.c index 7ccc1db772..b3f2ad52e2 100644 --- a/gst/real/gstrealaudiodec.c +++ b/gst/real/gstrealaudiodec.c @@ -31,11 +31,6 @@ GST_DEBUG_CATEGORY_STATIC (real_audio_dec_debug); #define GST_CAT_DEFAULT real_audio_dec_debug -static GstElementDetails real_audio_dec_details = -GST_ELEMENT_DETAILS ("RealAudio decoder", - "Codec/Decoder/Audio", "Decoder for RealAudio streams", - "Lutz Mueller "); - static GstStaticPadTemplate snk_t = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("audio/x-pn-realaudio, " @@ -568,7 +563,9 @@ gst_real_audio_dec_base_init (gpointer g_class) gst_element_class_add_pad_template (ec, gst_static_pad_template_get (&snk_t)); gst_element_class_add_pad_template (ec, gst_static_pad_template_get (&src_t)); - gst_element_class_set_details (ec, &real_audio_dec_details); + gst_element_class_set_details_simple (ec, "RealAudio decoder", + "Codec/Decoder/Audio", "Decoder for RealAudio streams", + "Lutz Mueller "); } static GstStateChangeReturn diff --git a/gst/real/gstrealvideodec.c b/gst/real/gstrealvideodec.c index 313a99f2a9..4485a312f2 100644 --- a/gst/real/gstrealvideodec.c +++ b/gst/real/gstrealvideodec.c @@ -31,11 +31,6 @@ GST_DEBUG_CATEGORY_STATIC (realvideode_debug); #define GST_CAT_DEFAULT realvideode_debug -static GstElementDetails realvideode_details = -GST_ELEMENT_DETAILS ("RealVideo decoder", - "Codec/Decoder/Video", "Decoder for RealVideo streams", - "Lutz Mueller "); - static GstStaticPadTemplate snk_t = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-pn-realvideo, " "rmversion = (int) [ 2, 4 ]")); @@ -635,7 +630,9 @@ gst_real_video_dec_base_init (gpointer g_class) gst_element_class_add_pad_template (ec, gst_static_pad_template_get (&snk_t)); gst_element_class_add_pad_template (ec, gst_static_pad_template_get (&src_t)); - gst_element_class_set_details (ec, &realvideode_details); + gst_element_class_set_details_simple (ec, "RealVideo decoder", + "Codec/Decoder/Video", "Decoder for RealVideo streams", + "Lutz Mueller "); } static void diff --git a/gst/rtjpeg/gstrtjpegdec.c b/gst/rtjpeg/gstrtjpegdec.c index a11808f8af..66f91f7e78 100644 --- a/gst/rtjpeg/gstrtjpegdec.c +++ b/gst/rtjpeg/gstrtjpegdec.c @@ -23,15 +23,6 @@ #endif #include "gstrtjpegdec.h" - - -/* elementfactory information */ -static const GstElementDetails gst_rtjpegdec_details = -GST_ELEMENT_DETAILS ("RTjpeg video decoder", - "Codec/Decoder/Video", - "Decodes video in RTjpeg format", - "Erik Walthinsen "); - /* GstRTJpegDec signals and args */ enum { @@ -86,7 +77,9 @@ gst_rtjpegdec_base_init (GstRTJpegDecClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &gst_rtjpegdec_details); + gst_element_class_set_details_simple (element_class, "RTjpeg video decoder", + "Codec/Decoder/Video", + "Decodes video in RTjpeg format", "Erik Walthinsen "); } static void diff --git a/gst/rtjpeg/gstrtjpegenc.c b/gst/rtjpeg/gstrtjpegenc.c index f7d76a57ec..50a4a0b2ef 100644 --- a/gst/rtjpeg/gstrtjpegenc.c +++ b/gst/rtjpeg/gstrtjpegenc.c @@ -23,13 +23,6 @@ #endif #include "gstrtjpegenc.h" -/* elementfactory information */ -static const GstElementDetails gst_rtjpegenc_details = -GST_ELEMENT_DETAILS ("RTjpeg video encoder", - "Codec/Encoder/Video", - "Encodes video in RTjpeg format", - "Erik Walthinsen "); - /* GstRTJpegEnc signals and args */ enum { @@ -84,7 +77,9 @@ gst_rtjpegenc_base_init (GstRTJpegEncClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &gst_rtjpegenc_details); + gst_element_class_set_details_simple (element_class, "RTjpeg video encoder", + "Codec/Encoder/Video", + "Encodes video in RTjpeg format", "Erik Walthinsen "); } static void diff --git a/gst/rtpmux/gstrtpdtmfmux.c b/gst/rtpmux/gstrtpdtmfmux.c index 9622c2640a..480d89d448 100644 --- a/gst/rtpmux/gstrtpdtmfmux.c +++ b/gst/rtpmux/gstrtpdtmfmux.c @@ -71,13 +71,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtp_dtmf_mux_debug); #define GST_CAT_DEFAULT gst_rtp_dtmf_mux_debug -/* elementfactory information */ -static const GstElementDetails gst_rtp_dtmf_mux_details = -GST_ELEMENT_DETAILS ("RTP muxer", - "Codec/Muxer", - "mixes RTP DTMF streams into other RTP streams", - "Zeeshan Ali "); - enum { SIGNAL_LOCKING_STREAM, @@ -106,7 +99,10 @@ gst_rtp_dtmf_mux_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_rtp_dtmf_mux_details); + gst_element_class_set_details_simple (element_class, "RTP muxer", + "Codec/Muxer", + "mixes RTP DTMF streams into other RTP streams", + "Zeeshan Ali "); } static void diff --git a/gst/rtpmux/gstrtpmux.c b/gst/rtpmux/gstrtpmux.c index 77858895be..e5f49fc53e 100644 --- a/gst/rtpmux/gstrtpmux.c +++ b/gst/rtpmux/gstrtpmux.c @@ -43,13 +43,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtp_mux_debug); #define GST_CAT_DEFAULT gst_rtp_mux_debug -/* elementfactory information */ -static const GstElementDetails gst_rtp_mux_details = -GST_ELEMENT_DETAILS ("RTP muxer", - "Codec/Muxer", - "multiplex N rtp streams into one", - "Zeeshan Ali "); - enum { ARG_0, @@ -111,7 +104,9 @@ gst_rtp_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_rtp_mux_details); + gst_element_class_set_details_simple (element_class, "RTP muxer", + "Codec/Muxer", + "multiplex N rtp streams into one", "Zeeshan Ali "); } static void diff --git a/gst/scaletempo/gstscaletempo.c b/gst/scaletempo/gstscaletempo.c index 7d72dba5cd..53f454b183 100644 --- a/gst/scaletempo/gstscaletempo.c +++ b/gst/scaletempo/gstscaletempo.c @@ -676,19 +676,17 @@ gst_scaletempo_set_property (GObject * object, static void gst_scaletempo_base_init (gpointer klass) { - static GstElementDetails element_details = { - "Scaletempo", - "Filter/Effect/Rate", - "Sync audio tempo with playback rate", - "Rov Juvano " - }; + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); 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, "Scaletempo", + "Filter/Effect/Rate", + "Sync audio tempo with playback rate", + "Rov Juvano "); } static void diff --git a/gst/sdp/gstsdpdemux.c b/gst/sdp/gstsdpdemux.c index 3c543d0a11..4470a6ba60 100644 --- a/gst/sdp/gstsdpdemux.c +++ b/gst/sdp/gstsdpdemux.c @@ -84,13 +84,6 @@ GST_DEBUG_CATEGORY_STATIC (sdpdemux_debug); #define GST_CAT_DEFAULT (sdpdemux_debug) -/* elementfactory information */ -static const GstElementDetails gst_sdp_demux_details = -GST_ELEMENT_DETAILS ("SDP session setup", - "Codec/Demuxer/Network/RTP", - "Receive data over the network via SDP", - "Wim Taymans "); - static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -162,7 +155,10 @@ gst_sdp_demux_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_sdp_demux_details); + gst_element_class_set_details_simple (element_class, "SDP session setup", + "Codec/Demuxer/Network/RTP", + "Receive data over the network via SDP", + "Wim Taymans "); } static void @@ -387,12 +383,12 @@ is_multicast_address (const gchar * host_name) for (ai = res; !ret && ai; ai = ai->ai_next) { if (ai->ai_family == AF_INET) ret = - IN_MULTICAST (ntohl (((struct sockaddr_in *) ai->ai_addr)-> - sin_addr.s_addr)); + IN_MULTICAST (ntohl (((struct sockaddr_in *) ai->ai_addr)->sin_addr. + s_addr)); else ret = - IN6_IS_ADDR_MULTICAST (&((struct sockaddr_in6 *) ai-> - ai_addr)->sin6_addr); + IN6_IS_ADDR_MULTICAST (&((struct sockaddr_in6 *) ai->ai_addr)-> + sin6_addr); } freeaddrinfo (res); diff --git a/gst/selector/gstinputselector.c b/gst/selector/gstinputselector.c index e5dc12b707..0670493c74 100644 --- a/gst/selector/gstinputselector.c +++ b/gst/selector/gstinputselector.c @@ -41,14 +41,6 @@ GST_DEBUG_CATEGORY_STATIC (input_selector_debug); #define GST_CAT_DEFAULT input_selector_debug -static const GstElementDetails gst_input_selector_details = -GST_ELEMENT_DETAILS ("Input selector", - "Generic", - "N-to-1 input stream selectoring", - "Julien Moutte \n" - "Jan Schmidt \n" - "Wim Taymans "); - static GstStaticPadTemplate gst_input_selector_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink%d", GST_PAD_SINK, @@ -746,7 +738,11 @@ gst_input_selector_base_init (GstInputSelectorClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &gst_input_selector_details); + gst_element_class_set_details_simple (element_class, "Input selector", + "Generic", "N-to-1 input stream selectoring", + "Julien Moutte , " + "Jan Schmidt , " + "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_input_selector_sink_factory)); gst_element_class_add_pad_template (element_class, diff --git a/gst/selector/gstoutputselector.c b/gst/selector/gstoutputselector.c index e56cced5da..692cf50e4f 100644 --- a/gst/selector/gstoutputselector.c +++ b/gst/selector/gstoutputselector.c @@ -35,12 +35,6 @@ GST_DEBUG_CATEGORY_STATIC (output_selector_debug); #define GST_CAT_DEFAULT output_selector_debug -static const GstElementDetails gst_output_selector_details = -GST_ELEMENT_DETAILS ("Output selector", - "Generic", - "1-to-N output stream selectoring", - "Stefan Kost "); - static GstStaticPadTemplate gst_output_selector_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -86,7 +80,10 @@ gst_output_selector_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_output_selector_details); + gst_element_class_set_details_simple (element_class, "Output selector", + "Generic", + "1-to-N output stream selectoring", + "Stefan Kost "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_output_selector_sink_factory)); gst_element_class_add_pad_template (element_class, diff --git a/gst/siren/gstsirendec.c b/gst/siren/gstsirendec.c index 976a7adb56..2e517199f4 100644 --- a/gst/siren/gstsirendec.c +++ b/gst/siren/gstsirendec.c @@ -42,14 +42,6 @@ GST_DEBUG_CATEGORY (sirendec_debug); #define FRAME_DURATION (20 * GST_MSECOND) -/* elementfactory information */ -static const GstElementDetails gst_siren_dec_details = -GST_ELEMENT_DETAILS ("Siren Decoder element", - "Codec/Decoder/Audio ", - "Decode streams encoded with the Siren7 codec into 16bit PCM", - "Youness Alaoui "); - - static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -105,7 +97,10 @@ gst_siren_dec_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (element_class, &gst_siren_dec_details); + gst_element_class_set_details_simple (element_class, "Siren Decoder element", + "Codec/Decoder/Audio ", + "Decode streams encoded with the Siren7 codec into 16bit PCM", + "Youness Alaoui "); } static void diff --git a/gst/siren/gstsirenenc.c b/gst/siren/gstsirenenc.c index 4649503106..561d2689d8 100644 --- a/gst/siren/gstsirenenc.c +++ b/gst/siren/gstsirenenc.c @@ -42,14 +42,6 @@ GST_DEBUG_CATEGORY (sirenenc_debug); #define FRAME_DURATION (20 * GST_MSECOND) -/* elementfactory information */ -static const GstElementDetails gst_siren_enc_details = -GST_ELEMENT_DETAILS ("Siren Encoder element", - "Codec/Encoder/Audio ", - "Encode 16bit PCM streams into the Siren7 codec", - "Youness Alaoui "); - - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -108,7 +100,10 @@ gst_siren_enc_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (element_class, &gst_siren_enc_details); + gst_element_class_set_details_simple (element_class, "Siren Encoder element", + "Codec/Encoder/Audio ", + "Encode 16bit PCM streams into the Siren7 codec", + "Youness Alaoui "); } static void diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c index b1af76a691..a4bd43af1e 100644 --- a/gst/smooth/gstsmooth.c +++ b/gst/smooth/gstsmooth.c @@ -24,14 +24,6 @@ #include "gstsmooth.h" #include -/* elementfactory information */ -static const GstElementDetails smooth_details = -GST_ELEMENT_DETAILS ("Smooth effect", - "Filter/Effect/Video", - "Apply a smooth filter to an image", - "Wim Taymans "); - - /* Smooth signals and args */ enum { @@ -114,7 +106,10 @@ gst_smooth_base_init (GstSmoothClass * klass) gst_static_pad_template_get (&gst_smooth_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_smooth_src_template)); - gst_element_class_set_details (element_class, &smooth_details); + gst_element_class_set_details_simple (element_class, "Smooth effect", + "Filter/Effect/Video", + "Apply a smooth filter to an image", + "Wim Taymans "); } static void diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c index 3a2a23b0cc..dbcd1a3553 100644 --- a/gst/smoothwave/gstsmoothwave.c +++ b/gst/smoothwave/gstsmoothwave.c @@ -29,13 +29,6 @@ #include "gstsmoothwave.h" -static const GstElementDetails gst_smoothwave_details = -GST_ELEMENT_DETAILS ("Smooth waveform", - "Visualization", - "Fading grayscale waveform display", - "Erik Walthinsen "); - - /* SmoothWave signals and args */ enum { @@ -127,7 +120,10 @@ gst_smoothwave_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_smoothwave_details); + gst_element_class_set_details_simple (element_class, "Smooth waveform", + "Visualization", + "Fading grayscale waveform display", + "Erik Walthinsen "); } static void diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c index 13466cb6ea..c212f2e68c 100644 --- a/gst/speed/gstspeed.c +++ b/gst/speed/gstspeed.c @@ -52,14 +52,6 @@ GST_DEBUG_CATEGORY_STATIC (speed_debug); #define GST_CAT_DEFAULT speed_debug -/* elementfactory information */ -static const GstElementDetails speed_details = GST_ELEMENT_DETAILS ("Speed", - "Filter/Effect/Audio", - "Set speed/pitch on audio/raw streams (resampler)", - "Andy Wingo , " - "Tim-Philipp Müller "); - - enum { ARG_0, @@ -463,13 +455,18 @@ speed_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &speed_details); + gst_element_class_set_details_simple (element_class, "Speed", + "Filter/Effect/Audio", + "Set speed/pitch on audio/raw streams (resampler)", + "Andy Wingo , " + "Tim-Philipp Müller "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_speed_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_speed_sink_template)); } + static void speed_class_init (GstSpeedClass * klass) { diff --git a/gst/stereo/gststereo.c b/gst/stereo/gststereo.c index 2dafc75f90..e782f93ce3 100644 --- a/gst/stereo/gststereo.c +++ b/gst/stereo/gststereo.c @@ -45,15 +45,6 @@ #include #include - -/* elementfactory information */ -static const GstElementDetails stereo_details = -GST_ELEMENT_DETAILS ("Stereo effect", - "Filter/Effect/Audio", - "Muck with the stereo signal to enhance its 'stereo-ness'", - "Erik Walthinsen "); - - #define ALLOWED_CAPS \ "audio/x-raw-int," \ " depth = (int) 16, " \ @@ -95,7 +86,10 @@ gst_stereo_base_init (gpointer g_class) GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstCaps *caps; - gst_element_class_set_details (element_class, &stereo_details); + gst_element_class_set_details_simple (element_class, "Stereo effect", + "Filter/Effect/Audio", + "Muck with the stereo signal to enhance its 'stereo-ness'", + "Erik Walthinsen "); caps = gst_caps_from_string (ALLOWED_CAPS); gst_audio_filter_class_add_pad_templates (GST_AUDIO_FILTER_CLASS (g_class), diff --git a/gst/tta/gstttadec.c b/gst/tta/gstttadec.c index 880bc73674..7fdea3c2e4 100644 --- a/gst/tta/gstttadec.c +++ b/gst/tta/gstttadec.c @@ -171,18 +171,16 @@ gst_tta_dec_get_type (void) static void gst_tta_dec_base_init (GstTtaDecClass * klass) { - static const GstElementDetails plugin_details = - GST_ELEMENT_DETAILS ("TTA audio decoder", - "Codec/Decoder/Audio", - "Decode TTA audio data", - "Arwed v. Merkatz "); + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_pad_template (element_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, &plugin_details); + gst_element_class_set_details_simple (element_class, "TTA audio decoder", + "Codec/Decoder/Audio", + "Decode TTA audio data", "Arwed v. Merkatz "); } static void diff --git a/gst/tta/gstttaparse.c b/gst/tta/gstttaparse.c index c9efbe5642..82187a00a0 100644 --- a/gst/tta/gstttaparse.c +++ b/gst/tta/gstttaparse.c @@ -85,18 +85,16 @@ gst_tta_parse_get_type (void) static void gst_tta_parse_base_init (GstTtaParseClass * klass) { - static const GstElementDetails plugin_details = - GST_ELEMENT_DETAILS ("TTA file parser", - "Codec/Demuxer/Audio", - "Parses TTA files", - "Arwed v. Merkatz "); + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gst_element_class_add_pad_template (element_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, &plugin_details); + gst_element_class_set_details_simple (element_class, "TTA file parser", + "Codec/Demuxer/Audio", + "Parses TTA files", "Arwed v. Merkatz "); } static void diff --git a/gst/valve/gstvalve.c b/gst/valve/gstvalve.c index 702b3e56b7..3fc19089fd 100644 --- a/gst/valve/gstvalve.c +++ b/gst/valve/gstvalve.c @@ -45,14 +45,6 @@ GST_DEBUG_CATEGORY (valve_debug); #define GST_CAT_DEFAULT (valve_debug) -/* elementfactory information */ -static const GstElementDetails gst_valve_details = -GST_ELEMENT_DETAILS ("Valve element", - "Filter", - "This element drops all packets when drop is TRUE", - "Olivier Crete "); - - static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -109,7 +101,10 @@ gst_valve_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sinktemplate)); - gst_element_class_set_details (element_class, &gst_valve_details); + gst_element_class_set_details_simple (element_class, "Valve element", + "Filter", + "This element drops all packets when drop is TRUE", + "Olivier Crete "); } static void diff --git a/gst/vbidec/gstvbidec.c b/gst/vbidec/gstvbidec.c index 412d1ce2a9..95b670e740 100644 --- a/gst/vbidec/gstvbidec.c +++ b/gst/vbidec/gstvbidec.c @@ -63,13 +63,6 @@ struct _GstVBIDecClass GType gst_vbidec_get_type (void); -/* elementfactory information */ -static const GstElementDetails gst_vbidec_details = -GST_ELEMENT_DETAILS ("VBI decoder", - "Codec/Decoder/Video", - "Decodes closed captions and XDS data from VBI data", - "David I. Lehn "); - /* VBIDec signals and args */ enum { @@ -168,13 +161,17 @@ gst_vbidec_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_vbidec_details); + gst_element_class_set_details_simple (element_class, "VBI decoder", + "Codec/Decoder/Video", + "Decodes closed captions and XDS data from VBI data", + "David I. Lehn "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_vbidec_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_vbidec_sink_template)); } + static void gst_vbidec_class_init (GstVBIDecClass * klass) { diff --git a/gst/videodrop/gstvideodrop.c b/gst/videodrop/gstvideodrop.c index 9d6c33557d..8cfc596336 100644 --- a/gst/videodrop/gstvideodrop.c +++ b/gst/videodrop/gstvideodrop.c @@ -24,13 +24,6 @@ #include #include -/* elementfactory information */ -static const GstElementDetails videodrop_details = -GST_ELEMENT_DETAILS ("Frame dropper", - "Filter/Effect/Video", - "Re-FPS'es video by dropping frames", - "Ronald Bultje "); - /* GstVideodrop signals and args */ enum { @@ -108,13 +101,17 @@ gst_videodrop_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &videodrop_details); + gst_element_class_set_details_simple (element_class, "Frame dropper", + "Filter/Effect/Video", + "Re-FPS'es video by dropping frames", + "Ronald Bultje "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_videodrop_sink_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_videodrop_src_template)); } + static void gst_videodrop_class_init (GstVideodropClass * klass) { diff --git a/gst/videomeasure/gstvideomeasure_collector.c b/gst/videomeasure/gstvideomeasure_collector.c index 5e87f17833..28c95ae547 100644 --- a/gst/videomeasure/gstvideomeasure_collector.c +++ b/gst/videomeasure/gstvideomeasure_collector.c @@ -54,12 +54,6 @@ enum GST_DEBUG_CATEGORY_STATIC (measure_collector_debug); #define GST_CAT_DEFAULT measure_collector_debug -static const GstElementDetails measure_collector_details = -GST_ELEMENT_DETAILS ("Video measure collector", - "Filter/Effect/Video", - "Collect measurements from a measuring element", - "Руслан Ижбулатов "); - static GstStaticPadTemplate gst_measure_collector_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -327,7 +321,10 @@ gst_measure_collector_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &measure_collector_details); + gst_element_class_set_details_simple (element_class, + "Video measure collector", "Filter/Effect/Video", + "Collect measurements from a measuring element", + "Руслан Ижбулатов "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_measure_collector_sink_template)); diff --git a/gst/videosignal/gstvideoanalyse.c b/gst/videosignal/gstvideoanalyse.c index 8f4ef6c6df..2d59b31258 100644 --- a/gst/videosignal/gstvideoanalyse.c +++ b/gst/videosignal/gstvideoanalyse.c @@ -104,12 +104,6 @@ enum GST_DEBUG_CATEGORY_STATIC (video_analyse_debug); #define GST_CAT_DEFAULT video_analyse_debug -static const GstElementDetails video_analyse_details = -GST_ELEMENT_DETAILS ("Video analyser", - "Filter/Effect/Video", - "Analyse video signal", - "Wim Taymans "); - static GstStaticPadTemplate gst_video_analyse_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -281,7 +275,9 @@ gst_video_analyse_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &video_analyse_details); + gst_element_class_set_details_simple (element_class, "Video analyser", + "Filter/Effect/Video", + "Analyse video signal", "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_video_analyse_sink_template)); diff --git a/gst/videosignal/gstvideodetect.c b/gst/videosignal/gstvideodetect.c index f97ae205c1..fb64e6627e 100644 --- a/gst/videosignal/gstvideodetect.c +++ b/gst/videosignal/gstvideodetect.c @@ -142,12 +142,6 @@ enum GST_DEBUG_CATEGORY_STATIC (video_detect_debug); #define GST_CAT_DEFAULT video_detect_debug -static const GstElementDetails video_detect_details = -GST_ELEMENT_DETAILS ("Video detecter", - "Filter/Effect/Video", - "Detect patterns in a video signal", - "Wim Taymans "); - static GstStaticPadTemplate gst_video_detect_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -440,7 +434,9 @@ gst_video_detect_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &video_detect_details); + gst_element_class_set_details_simple (element_class, "Video detecter", + "Filter/Effect/Video", + "Detect patterns in a video signal", "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_video_detect_sink_template)); diff --git a/gst/videosignal/gstvideomark.c b/gst/videosignal/gstvideomark.c index 3e73d85940..46b4c1f776 100644 --- a/gst/videosignal/gstvideomark.c +++ b/gst/videosignal/gstvideomark.c @@ -83,12 +83,6 @@ enum GST_DEBUG_CATEGORY_STATIC (video_mark_debug); #define GST_CAT_DEFAULT video_mark_debug -static const GstElementDetails video_mark_details = -GST_ELEMENT_DETAILS ("Video marker", - "Filter/Effect/Video", - "Marks a video signal with a pattern", - "Wim Taymans "); - static GstStaticPadTemplate gst_video_mark_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -327,7 +321,9 @@ gst_video_mark_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &video_mark_details); + gst_element_class_set_details_simple (element_class, "Video marker", + "Filter/Effect/Video", + "Marks a video signal with a pattern", "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_video_mark_sink_template)); diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c index bbf1b3a3e0..f2332c7c81 100644 --- a/gst/vmnc/vmncdec.c +++ b/gst/vmnc/vmncdec.c @@ -134,12 +134,6 @@ typedef struct GstElementClass parent_class; } GstVMncDecClass; -static const GstElementDetails vmnc_dec_details = -GST_ELEMENT_DETAILS ("VMnc video decoder", - "Codec/Decoder/Video", - "Decode VmWare video to raw (RGB) video", - "Michael Smith "); - static GstStaticPadTemplate vmnc_dec_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -177,7 +171,10 @@ gst_vmnc_dec_base_init (gpointer g_class) gst_static_pad_template_get (&vmnc_dec_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&vmnc_dec_sink_factory)); - gst_element_class_set_details (element_class, &vmnc_dec_details); + gst_element_class_set_details_simple (element_class, "VMnc video decoder", + "Codec/Decoder/Video", + "Decode VmWare video to raw (RGB) video", + "Michael Smith "); } static void diff --git a/sys/acmenc/acmenc.c b/sys/acmenc/acmenc.c index c1da855c4c..558cda7080 100644 --- a/sys/acmenc/acmenc.c +++ b/sys/acmenc/acmenc.c @@ -465,11 +465,11 @@ acmenc_class_init (ACMEncClass * klass) acmenc_base_init (ACMEncClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - GstElementDetails details; ACMEncParams *params; ACMDRIVERDETAILS driverdetails; - gchar *shortname, *longname; + gchar *shortname, *longname, *detail, *description; MMRESULT res; + gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&acmenc_sink_template)); gst_element_class_add_pad_template (element_class, @@ -490,17 +490,17 @@ acmenc_base_init (ACMEncClass * klass) longname = g_utf16_to_utf8 ((gunichar2 *) driverdetails.szLongName, -1, NULL, NULL, NULL); - details.longname = g_strdup_printf ("ACM Encoder: %s", (shortname + detail = g_strdup_printf ("ACM Encoder: %s", (shortname && *shortname) ? shortname : params->name); - details.klass = "Codec/Encoder/Audio"; - details.description = g_strdup_printf ("ACM Encoder: %s", (longname + description = g_strdup_printf ("ACM Encoder: %s", (longname && *longname) ? longname : params->name); - details.author = "Pioneers of the Inevitable "; - gst_element_class_set_details (element_class, &details); + gst_element_class_set_details_simple (element_class, detail, + "Codec/Encoder/Audio", description, + "Pioneers of the Inevitable "); g_free (shortname); g_free (longname); - g_free (details.longname); - g_free (details.description); + g_free (description); + g_free (detail); klass->driverId = params->driverId; } diff --git a/sys/acmmp3dec/acmmp3dec.c b/sys/acmmp3dec/acmmp3dec.c index 3a158f731a..d77dcca292 100644 --- a/sys/acmmp3dec/acmmp3dec.c +++ b/sys/acmmp3dec/acmmp3dec.c @@ -40,12 +40,6 @@ #define GST_CAT_DEFAULT acmmp3dec_debug GST_DEBUG_CATEGORY_STATIC (acmmp3dec_debug); -static const GstElementDetails acmmp3dec_details = -GST_ELEMENT_DETAILS ("ACM MP3 decoder", - "Codec/Decoder/Audio", - "Decode MP3 using ACM decoder", - "Pioneers of the Inevitable , " - "Wim Taymans "); - - GType cdplayer_get_type (void) { @@ -97,8 +89,13 @@ cdplayer_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &cdplayer_details); + gst_element_class_set_details_simple (element_class, "CD Player", + "Generic/Bin", + "Play CD audio through the CD Drive", + "Charles Schmidt , " + "Wim Taymans "); } + static void cdplayer_class_init (CDPlayerClass * klass) { diff --git a/sys/directdraw/gstdirectdrawsink.c b/sys/directdraw/gstdirectdrawsink.c index bb0332f84a..8f73e28d11 100644 --- a/sys/directdraw/gstdirectdrawsink.c +++ b/sys/directdraw/gstdirectdrawsink.c @@ -48,13 +48,6 @@ GST_DEBUG_CATEGORY_STATIC (directdrawsink_debug); #define GST_CAT_DEFAULT directdrawsink_debug -/* elementfactory information */ -static const GstElementDetails gst_directdraw_sink_details = -GST_ELEMENT_DETAILS ("Direct Draw Video Sink", - "Sink/Video", - "Output to a video card via Direct Draw", - "Sebastien Moutte "); - static void gst_directdraw_sink_init_interfaces (GType type); GST_BOILERPLATE_FULL (GstDirectDrawSink, gst_directdraw_sink, GstVideoSink, @@ -387,7 +380,10 @@ gst_directdraw_sink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_directdraw_sink_details); + gst_element_class_set_details_simple (element_class, "Direct Draw Video Sink", + "Sink/Video", + "Output to a video card via Direct Draw", + "Sebastien Moutte "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&directdrawsink_sink_factory)); } @@ -1730,9 +1726,9 @@ gst_directdraw_sink_get_depth (LPDDPIXELFORMAT lpddpfPixelFormat) gint order = 0, binary; binary = - lpddpfPixelFormat->dwRBitMask | lpddpfPixelFormat-> - dwGBitMask | lpddpfPixelFormat->dwBBitMask | lpddpfPixelFormat-> - dwRGBAlphaBitMask; + lpddpfPixelFormat-> + dwRBitMask | lpddpfPixelFormat->dwGBitMask | lpddpfPixelFormat-> + dwBBitMask | lpddpfPixelFormat->dwRGBAlphaBitMask; while (binary != 0) { if ((binary % 2) == 1) order++; diff --git a/sys/directsound/gstdirectsoundsrc.c b/sys/directsound/gstdirectsoundsrc.c index 76a3dcf4be..c6064bb87e 100644 --- a/sys/directsound/gstdirectsoundsrc.c +++ b/sys/directsound/gstdirectsoundsrc.c @@ -63,12 +63,6 @@ GST_DEBUG_CATEGORY_STATIC (directsoundsrc_debug); #define GST_CAT_DEFAULT directsoundsrc_debug -static GstElementDetails gst_directsound_src_details = -GST_ELEMENT_DETAILS ("Direct Sound Audio Src", - "Source/Audio", - "Capture from a soundcard via DIRECTSOUND", - "Joni Valtanen "); - /* defaults here */ #define DEFAULT_DEVICE 0 @@ -157,7 +151,10 @@ gst_directsound_src_base_init (gpointer g_class) GST_DEBUG ("initializing directsoundsrc base\n"); - gst_element_class_set_details (element_class, &gst_directsound_src_details); + gst_element_class_set_details_simple (element_class, "Direct Sound Audio Src", + "Source/Audio", + "Capture from a soundcard via DIRECTSOUND", + "Joni Valtanen "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&directsound_src_src_factory)); diff --git a/sys/dshowdecwrapper/gstdshowaudiodec.cpp b/sys/dshowdecwrapper/gstdshowaudiodec.cpp index fae5292dc7..84f45277b1 100644 --- a/sys/dshowdecwrapper/gstdshowaudiodec.cpp +++ b/sys/dshowdecwrapper/gstdshowaudiodec.cpp @@ -310,23 +310,19 @@ HRESULT AudioFakeSink::CheckMediaType(const CMediaType *pmt) static void gst_dshowaudiodec_base_init (gpointer klass) { - GstDshowAudioDecClass *audiodec_class = (GstDshowAudioDecClass *)klass; + GstDshowAudioDecClass *audiodec_class = (GstDshowAudioDecClass *) klass; GstPadTemplate *src, *sink; GstCaps *srccaps, *sinkcaps; GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - GstElementDetails details; + char *description; audiodec_class->entry = tmp; - details.longname = g_strdup_printf ("DirectShow %s Decoder Wrapper", - tmp->element_longname); - details.klass = g_strdup ("Codec/Decoder/Audio"); - details.description = g_strdup_printf ("DirectShow %s Decoder Wrapper", - tmp->element_longname); - details.author = "Sebastien Moutte "; - gst_element_class_set_details (element_class, &details); - g_free (details.longname); - g_free (details.klass); - g_free (details.description); + description = g_strdup_printf ("DirectShow %s Decoder Wrapper", + tmp->element_description); + gst_element_class_set_details_simple (element_class, description, + "Codec/Decoder/Audio", description, + "Sebastien Moutte "); + g_free (description); sinkcaps = gst_caps_from_string (tmp->sinkcaps); diff --git a/sys/dshowdecwrapper/gstdshowvideodec.cpp b/sys/dshowdecwrapper/gstdshowvideodec.cpp index fab9291470..c73aa9c52b 100644 --- a/sys/dshowdecwrapper/gstdshowvideodec.cpp +++ b/sys/dshowdecwrapper/gstdshowvideodec.cpp @@ -365,24 +365,20 @@ HRESULT VideoFakeSink::CheckMediaType(const CMediaType *pmt) static void gst_dshowvideodec_base_init (gpointer klass) { - GstDshowVideoDecClass *videodec_class = (GstDshowVideoDecClass *)klass; + GstDshowVideoDecClass *videodec_class = (GstDshowVideoDecClass *) klass; GstPadTemplate *src, *sink; GstCaps *srccaps, *sinkcaps; GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - GstElementDetails details; + char *description; videodec_class->entry = tmp; - details.longname = g_strdup_printf ("DirectShow %s Decoder Wrapper", + description = g_strdup_printf ("DirectShow %s Decoder Wrapper", tmp->element_longname); - details.klass = g_strdup ("Codec/Decoder/Video"); - details.description = g_strdup_printf ("DirectShow %s Decoder Wrapper", - tmp->element_longname); - details.author = "Sebastien Moutte "; - gst_element_class_set_details (element_class, &details); - g_free (details.longname); - g_free (details.klass); - g_free (details.description); + gst_element_class_set_details_simple (element_class, description, + "Codec/Decoder/Video", description, + "Sebastien Moutte "); + g_free (description); sinkcaps = gst_caps_from_string (tmp->sinkcaps); gst_caps_set_simple (sinkcaps, diff --git a/sys/dshowsrcwrapper/gstdshowaudiosrc.cpp b/sys/dshowsrcwrapper/gstdshowaudiosrc.cpp index bdf3c47b3d..e7fbadaab7 100644 --- a/sys/dshowsrcwrapper/gstdshowaudiosrc.cpp +++ b/sys/dshowsrcwrapper/gstdshowaudiosrc.cpp @@ -25,12 +25,6 @@ #include "gstdshowaudiosrc.h" -static const GstElementDetails gst_dshowaudiosrc_details = -GST_ELEMENT_DETAILS ("Directshow audio capture source", - "Source/Audio", - "Receive data from a directshow audio capture graph", - "Sebastien Moutte "); - GST_DEBUG_CATEGORY_STATIC (dshowaudiosrc_debug); #define GST_CAT_DEFAULT dshowaudiosrc_debug @@ -127,7 +121,10 @@ gst_dshowaudiosrc_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_dshowaudiosrc_details); + gst_element_class_set_details_simple (element_class, + "Directshow audio capture source", "Source/Audio", + "Receive data from a directshow audio capture graph", + "Sebastien Moutte "); } static void diff --git a/sys/dshowsrcwrapper/gstdshowvideosrc.cpp b/sys/dshowsrcwrapper/gstdshowvideosrc.cpp index ef722c2180..fd28ca6573 100644 --- a/sys/dshowsrcwrapper/gstdshowvideosrc.cpp +++ b/sys/dshowsrcwrapper/gstdshowvideosrc.cpp @@ -28,12 +28,6 @@ #include -static const GstElementDetails gst_dshowvideosrc_details = -GST_ELEMENT_DETAILS ("DirectShow video capture source", - "Source/Video", - "Receive data from a directshow video capture graph", - "Sebastien Moutte "); - GST_DEBUG_CATEGORY_STATIC (dshowvideosrc_debug); #define GST_CAT_DEFAULT dshowvideosrc_debug @@ -134,7 +128,10 @@ gst_dshowvideosrc_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_dshowvideosrc_details); + gst_element_class_set_details_simple (element_class, + "DirectShow video capture source", "Source/Video", + "Receive data from a directshow video capture graph", + "Sebastien Moutte "); } static void diff --git a/sys/dshowvideosink/dshowvideosink.cpp b/sys/dshowvideosink/dshowvideosink.cpp index bbde078f45..ab9aecd0d9 100644 --- a/sys/dshowvideosink/dshowvideosink.cpp +++ b/sys/dshowvideosink/dshowvideosink.cpp @@ -28,13 +28,7 @@ #include "windows.h" -#define WM_GRAPH_NOTIFY WM_APP + 1 /* Private message */ - -static const GstElementDetails gst_dshowvideosink_details = -GST_ELEMENT_DETAILS ("DirectShow video sink", - "Sink/Video", - "Display data using a DirectShow video renderer", - "Pioneers of the Inevitable "); +#define WM_GRAPH_NOTIFY WM_APP + 1 GST_DEBUG_CATEGORY (dshowvideosink_debug); #define GST_CAT_DEFAULT dshowvideosink_debug @@ -145,7 +139,10 @@ gst_dshowvideosink_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element_class, &gst_dshowvideosink_details); + gst_element_class_set_details_simple (element_class, "DirectShow video sink", + "Sink/Video", + "Display data using a DirectShow video renderer", + "Pioneers of the Inevitable "); } static void diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c index ab4203d47f..5118146eb1 100644 --- a/sys/dvb/dvbbasebin.c +++ b/sys/dvb/dvbbasebin.c @@ -33,11 +33,6 @@ GST_DEBUG_CATEGORY_STATIC (dvb_base_bin_debug); #define GST_CAT_DEFAULT dvb_base_bin_debug -static GstElementDetails dvb_base_bin_details = GST_ELEMENT_DETAILS ("DVB bin", - "Source/Bin/Video", - "Access descramble and split DVB streams", - "Alessandro Decina "); - static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src%d", GST_PAD_SRC, GST_PAD_REQUEST, @@ -208,7 +203,10 @@ dvb_base_bin_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &dvb_base_bin_details); + gst_element_class_set_details_simple (element_class, "DVB bin", + "Source/Bin/Video", + "Access descramble and split DVB streams", + "Alessandro Decina "); } static void diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c index ba96073e0d..a9cda667eb 100644 --- a/sys/dvb/gstdvbsrc.c +++ b/sys/dvb/gstdvbsrc.c @@ -68,15 +68,6 @@ GST_DEBUG_CATEGORY_STATIC (gstdvbsrc_debug); #define LOF1 (9750*1000UL) #define LOF2 (10600*1000UL) - -static GstElementDetails dvbsrc_details = { - "DVB Source", - "Source/Video", - "Digital Video Broadcast Source", - "P2P-VCR, C-Lab, University of Paderborn\n" - "Zaheer Abbas Merali " -}; - /* Arguments */ enum { @@ -305,7 +296,11 @@ gst_dvbsrc_base_init (gpointer gclass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&ts_src_factory)); - gst_element_class_set_details (element_class, &dvbsrc_details); + gst_element_class_set_details_simple (element_class, "DVB Source", + "Source/Video", + "Digital Video Broadcast Source", + "P2P-VCR, C-Lab, University of Paderborn," + "Zaheer Abbas Merali "); } diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c index 284ced261b..d7bd6881d7 100644 --- a/sys/dxr3/dxr3audiosink.c +++ b/sys/dxr3/dxr3audiosink.c @@ -45,16 +45,6 @@ the original AC3 stream. The result is expressed as MPEG2. */ #define TIME_FOR_BYTES(bytes) (((bytes) * 90) / 48) - -/* ElementFactory information. */ -static GstElementDetails dxr3audiosink_details = { - "dxr3/Hollywood+ mpeg decoder board audio plugin", - "Audio/Sink", - "Feeds audio to Sigma Designs em8300 based boards", - "Martin Soto " -}; - - /* Dxr3AudioSink signals and args */ enum { @@ -162,7 +152,10 @@ dxr3audiosink_base_init (Dxr3AudioSinkClass * klass) gst_static_pad_template_get (&dxr3audiosink_pcm_sink_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&dxr3audiosink_ac3_sink_factory)); - gst_element_class_set_details (element_class, &dxr3audiosink_details); + gst_element_class_set_details_simple (element_class, + "dxr3/Hollywood+ mpeg decoder board audio plugin", "Audio/Sink", + "Feeds audio to Sigma Designs em8300 based boards", + "Martin Soto "); } static void diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c index 0b220f8c71..0ea9243909 100644 --- a/sys/dxr3/dxr3spusink.c +++ b/sys/dxr3/dxr3spusink.c @@ -38,16 +38,6 @@ #include "dxr3common.h" - -/* ElementFactory information. */ -static GstElementDetails dxr3spusink_details = { - "dxr3/Hollywood+ mpeg decoder board subpicture element", - "Sink/Video", - "Feeds subpicture information to Sigma Designs em8300 based boards", - "Martin Soto " -}; - - /* Dxr3SpuSink signals and args */ enum { @@ -138,7 +128,10 @@ dxr3spusink_base_init (Dxr3SpuSinkClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&dxr3spusink_sink_factory)); - gst_element_class_set_details (element_class, &dxr3spusink_details); + gst_element_class_set_details_simple (element_class, + "dxr3/Hollywood+ mpeg decoder board subpicture element", "Sink/Video", + "Feeds subpicture information to Sigma Designs em8300 based boards", + "Martin Soto "); } static void diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c index 475cfbdd76..2f86f0681f 100644 --- a/sys/dxr3/dxr3videosink.c +++ b/sys/dxr3/dxr3videosink.c @@ -38,16 +38,6 @@ #include "dxr3common.h" - -/* ElementFactory information. */ -static GstElementDetails dxr3videosink_details = { - "dxr3/Hollywood+ mpeg decoder board video element", - "Sink/Video", - "Feeds MPEG2 video to Sigma Designs em8300 based boards", - "Martin Soto " -}; - - /* Dxr3VideoSink signals and args */ enum { @@ -163,7 +153,10 @@ dxr3videosink_base_init (Dxr3VideoSinkClass * klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&dxr3videosink_sink_factory)); - gst_element_class_set_details (element_class, &dxr3videosink_details); + gst_element_class_set_details_simple (element_class, + "dxr3/Hollywood+ mpeg decoder board video element", "Sink/Video", + "Feeds MPEG2 video to Sigma Designs em8300 based boards", + "Martin Soto "); } static void diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c index 6975f55db9..989d48f152 100644 --- a/sys/fbdev/gstfbdevsink.c +++ b/sys/fbdev/gstfbdevsink.c @@ -39,13 +39,6 @@ #include "gstfbdevsink.h" -/* elementfactory information */ -static const GstElementDetails gst_fbdevsink_details = -GST_ELEMENT_DETAILS ("fbdev video sink", - "Sink/Video", - "A linux framebuffer videosink", - "Sean D'Epagnier "); - enum { ARG_0, @@ -97,7 +90,9 @@ gst_fbdevsink_base_init (gpointer g_class) GST_STATIC_CAPS (GST_FBDEV_TEMPLATE_CAPS) ); - gst_element_class_set_details (element_class, &gst_fbdevsink_details); + gst_element_class_set_details_simple (element_class, "fbdev video sink", + "Sink/Video", + "A linux framebuffer videosink", "Sean D'Epagnier "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); } diff --git a/sys/osxvideo/osxvideosrc.c b/sys/osxvideo/osxvideosrc.c index f70fb588a2..83a92cded0 100644 --- a/sys/osxvideo/osxvideosrc.c +++ b/sys/osxvideo/osxvideosrc.c @@ -634,13 +634,6 @@ gst_osx_video_src_init_interfaces (GType type) static void gst_osx_video_src_base_init (gpointer gclass) { - static GstElementDetails element_details = { - "Video Source (OSX)", - "Source/Video", - "Reads raw frames from a capture device on OS X", - "Ole Andre Vadla Ravnaas , " - "Ali Sabil " - }; GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); @@ -649,7 +642,11 @@ gst_osx_video_src_base_init (gpointer gclass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "Video Source (OSX)", + "Source/Video", + "Reads raw frames from a capture device on OS X", + "Ole Andre Vadla Ravnaas , " + "Ali Sabil "); } static void diff --git a/sys/qcam/gstqcamsrc.c b/sys/qcam/gstqcamsrc.c index e757b6c866..76229ac766 100644 --- a/sys/qcam/gstqcamsrc.c +++ b/sys/qcam/gstqcamsrc.c @@ -33,13 +33,6 @@ #include "qcamip.h" -/* elementfactory information */ -static const GstElementDetails gst_qcamsrc_details = -GST_ELEMENT_DETAILS ("QCam Source", - "Source/Video", - "Read from a QuickCam device", - "Wim Taymans "); - #define AE_NONE 3 #define DEF_WIDTH 320 @@ -149,6 +142,7 @@ gst_qcamsrc_get_type (void) } return qcamsrc_type; } + static void gst_qcamsrc_base_init (gpointer g_class) { @@ -156,8 +150,11 @@ gst_qcamsrc_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_qcamsrc_src_factory)); - gst_element_class_set_details (element_class, &gst_qcamsrc_details); + gst_element_class_set_details_simple (element_class, "QCam Source", + "Source/Video", + "Read from a QuickCam device", "Wim Taymans "); } + static void gst_qcamsrc_class_init (GstQCamSrcClass * klass) { diff --git a/sys/qtwrapper/audiodecoders.c b/sys/qtwrapper/audiodecoders.c index e041286b72..bd8e735291 100644 --- a/sys/qtwrapper/audiodecoders.c +++ b/sys/qtwrapper/audiodecoders.c @@ -934,10 +934,10 @@ qtwrapper_audio_decoder_sink_event (GstPad * pad, GstEvent * event) static void qtwrapper_audio_decoder_base_init (QTWrapperAudioDecoderClass * klass) { - GstElementDetails details; GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gchar *name = NULL; gchar *info = NULL; + char *longname, *description; ComponentDescription desc; QTWrapperAudioDecoderParams *params; @@ -949,19 +949,19 @@ qtwrapper_audio_decoder_base_init (QTWrapperAudioDecoderClass * klass) get_name_info_from_component (params->component, &desc, &name, &info); /* Fill in details */ - details.longname = g_strdup_printf ("QTWrapper SCAudio Audio Decoder : %s", + longname = + g_strdup_printf ("QTWrapper SCAudio Audio Decoder : %s", GST_STR_NULL (name)); - details.klass = "Codec/Decoder/Audio"; - details.description = + description = g_strdup_printf ("QTWrapper SCAudio wrapper for decoder: %s", GST_STR_NULL (info)); - details.author = + gst_element_class_set_details_simple (element_class, + longname "Codec/Decoder/Audio", description, "Fluendo , " - "Pioneers of the Inevitable "; - gst_element_class_set_details (element_class, &details); + "Pioneers of the Inevitable "); - g_free (details.longname); - g_free (details.description); + g_free (longname); + g_free (description); g_free (name); g_free (info); diff --git a/sys/qtwrapper/videodecoders.c b/sys/qtwrapper/videodecoders.c index a9c1c88462..b2e58e9685 100644 --- a/sys/qtwrapper/videodecoders.c +++ b/sys/qtwrapper/videodecoders.c @@ -138,10 +138,10 @@ static void decompressCb (void *decompressionTrackingRefCon, static void qtwrapper_video_decoder_base_init (QTWrapperVideoDecoderClass * klass) { - GstElementDetails details; GstElementClass *element_class = GST_ELEMENT_CLASS (klass); gchar *name = NULL; gchar *info = NULL; + char *longname, *description; ComponentDescription desc; QTWrapperVideoDecoderParams *params; @@ -153,19 +153,17 @@ qtwrapper_video_decoder_base_init (QTWrapperVideoDecoderClass * klass) get_name_info_from_component (params->component, &desc, &name, &info); /* Fill in details */ - details.longname = + longname = g_strdup_printf ("QTWrapper Video Decoder : %s", GST_STR_NULL (name)); - details.klass = "Codec/Decoder/Video"; - details.description = + description = g_strdup_printf ("QTWrapper SCAudio wrapper for decoder: %s", GST_STR_NULL (info)); - details.author = + gst_element_class_set_details_simple (element_class, longname, + "Codec/Decoder/Video", description, "Fluendo , " - "Pioneers of the Inevitable "; - gst_element_class_set_details (element_class, &details); - - g_free (details.longname); - g_free (details.description); + "Pioneers of the Inevitable "); + g_free (longname); + g_free (description); g_free (name); g_free (info); diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c index a96efd70b0..938b1b19e1 100644 --- a/sys/vcd/vcdsrc.c +++ b/sys/vcd/vcdsrc.c @@ -36,12 +36,6 @@ #include "vcdsrc.h" -static const GstElementDetails gst_vcdsrc_details = -GST_ELEMENT_DETAILS ("VCD Source", - "Source/File", - "Asynchronous read from VCD disk", - "Erik Walthinsen "); - /* VCDSrc signals and args */ enum { @@ -99,7 +93,9 @@ gst_vcdsrc_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_vcdsrc_details); + gst_element_class_set_details_simple (element_class, "VCD Source", + "Source/File", + "Asynchronous read from VCD disk", "Erik Walthinsen "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&srctemplate)); diff --git a/sys/wasapi/gstwasapisink.c b/sys/wasapi/gstwasapisink.c index f26e56d6d4..3a3d9e906c 100644 --- a/sys/wasapi/gstwasapisink.c +++ b/sys/wasapi/gstwasapisink.c @@ -64,16 +64,13 @@ static void gst_wasapi_sink_base_init (gpointer gclass) { GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); - static GstElementDetails element_details = { - "WasapiSrc", - "Sink/Audio", - "Stream audio to an audio capture device through WASAPI", - "Ole André Vadla Ravnås " - }; 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, "WasapiSrc", + "Sink/Audio", + "Stream audio to an audio capture device through WASAPI", + "Ole André Vadla Ravnås "); } static void diff --git a/sys/wasapi/gstwasapisrc.c b/sys/wasapi/gstwasapisrc.c index 0a0edd2b7e..7d04d0518e 100644 --- a/sys/wasapi/gstwasapisrc.c +++ b/sys/wasapi/gstwasapisrc.c @@ -68,16 +68,13 @@ static void gst_wasapi_src_base_init (gpointer gclass) { GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); - static GstElementDetails element_details = { - "WasapiSrc", - "Source/Audio", - "Stream audio from an audio capture device through WASAPI", - "Ole André Vadla Ravnås " - }; gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details_simple (element_class, "WasapiSrc", + "Source/Audio", + "Stream audio from an audio capture device through WASAPI", + "Ole André Vadla Ravnås "); } static void diff --git a/sys/winks/gstksvideosrc.c b/sys/winks/gstksvideosrc.c index ed1916226d..e9053f15ef 100644 --- a/sys/winks/gstksvideosrc.c +++ b/sys/winks/gstksvideosrc.c @@ -154,15 +154,12 @@ static void gst_ks_video_src_base_init (gpointer gclass) { GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); - static GstElementDetails element_details = { - "KsVideoSrc", - "Source/Video", - "Stream data from a video capture device through Windows kernel streaming", - "Ole André Vadla Ravnås \n" - "Haakon Sporsheim " - }; - gst_element_class_set_details (element_class, &element_details); + gst_element_class_set_details (element_class, "KsVideoSrc", + "Source/Video", + "Stream data from a video capture device through Windows kernel streaming", + "Ole André Vadla Ravnås , " + "Haakon Sporsheim "); gst_element_class_add_pad_template (element_class, gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, diff --git a/sys/winscreencap/gstdx9screencapsrc.c b/sys/winscreencap/gstdx9screencapsrc.c index c14f8d9428..83bcea2776 100644 --- a/sys/winscreencap/gstdx9screencapsrc.c +++ b/sys/winscreencap/gstdx9screencapsrc.c @@ -48,13 +48,6 @@ GST_DEBUG_CATEGORY_STATIC (dx9screencapsrc_debug); -static const GstElementDetails gst_dx9screencapsrc_details = { - "DirectX 9 screen capture source", - "Source/Video", - "Captures screen", - "Haakon Sporsheim " -}; - #define GST_VIDEO_ALPHA_MASK_15_INT 0x8000 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", @@ -111,7 +104,9 @@ gst_dx9screencapsrc_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_dx9screencapsrc_details); + gst_element_class_set_details_simple (element_class, + "DirectX 9 screen capture source", "Source/Video", "Captures screen", + "Haakon Sporsheim "); } static void @@ -461,9 +456,10 @@ gst_dx9screencapsrc_start (GstBaseSrc * bsrc) if (FAILED (res)) return FALSE; - return SUCCEEDED (IDirect3DDevice9_CreateOffscreenPlainSurface (src-> - d3d9_device, src->disp_mode.Width, src->disp_mode.Height, - D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &src->surface, NULL)); + return + SUCCEEDED (IDirect3DDevice9_CreateOffscreenPlainSurface (src->d3d9_device, + src->disp_mode.Width, src->disp_mode.Height, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &src->surface, NULL)); } static gboolean diff --git a/sys/winscreencap/gstgdiscreencapsrc.c b/sys/winscreencap/gstgdiscreencapsrc.c index b0109fbd96..3ead8a9a47 100644 --- a/sys/winscreencap/gstgdiscreencapsrc.c +++ b/sys/winscreencap/gstgdiscreencapsrc.c @@ -51,13 +51,6 @@ GST_DEBUG_CATEGORY_STATIC (gdiscreencapsrc_debug); -static const GstElementDetails gst_gdiscreencapsrc_details = { - "GDI screen capture source", - "Source/Video", - "Captures screen", - "Haakon Sporsheim " -}; - static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS (GST_VIDEO_CAPS_BGR)); @@ -106,7 +99,9 @@ gst_gdiscreencapsrc_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_template)); - gst_element_class_set_details (element_class, &gst_gdiscreencapsrc_details); + gst_element_class_set_details_simple (element_class, + "GDI screen capture source", "Source/Video", "Captures screen", + "Haakon Sporsheim "); } static void