diff options
author | Benjamin Otte <otte@redhat.com> | 2010-03-16 15:45:23 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2010-03-16 17:41:50 +0100 |
commit | 5e21fa5e0e21d112a7e1c6fbed35d8669d37d061 (patch) | |
tree | 5badbb558ed6fba1e6717bd83431699b1ab00cfc | |
parent | 6cc138436c3d8443249797bf2889b657ff491aa9 (diff) |
gst_element_class_set_details => gst_element_class_set_details_simple
Also change my email from the old university one to the current one.
59 files changed, 234 insertions, 433 deletions
diff --git a/ext/alsa/gstalsamixer.c b/ext/alsa/gstalsamixer.c index 1c5d81847..74bc2e73b 100644 --- a/ext/alsa/gstalsamixer.c +++ b/ext/alsa/gstalsamixer.c @@ -741,8 +741,8 @@ gst_alsa_mixer_set_mute (GstAlsaMixer * mixer, GstMixerTrack * track, for (i = 0; i < ((GstMixerTrack *) ctrl_track)->num_channels; i++) { long vol = - mute ? ((GstMixerTrack *) ctrl_track)->min_volume : ctrl_track-> - volumes[i]; + mute ? ((GstMixerTrack *) ctrl_track)-> + min_volume : ctrl_track->volumes[i]; snd_mixer_selem_set_playback_volume (ctrl_track->element, i, vol); } } diff --git a/ext/alsa/gstalsamixerelement.c b/ext/alsa/gstalsamixerelement.c index 57e352639..ec800394f 100644 --- a/ext/alsa/gstalsamixerelement.c +++ b/ext/alsa/gstalsamixerelement.c @@ -35,12 +35,6 @@ enum PROP_DEVICE_NAME }; -static const GstElementDetails gst_alsa_mixer_element_details = -GST_ELEMENT_DETAILS ("Alsa mixer", - "Generic/Audio", - "Control sound input and output levels with ALSA", - "Leif Johnson <leif@ambient.2y.net>"); - static void gst_alsa_mixer_element_init_interfaces (GType type); GST_BOILERPLATE_FULL (GstAlsaMixerElement, gst_alsa_mixer_element, @@ -99,8 +93,10 @@ gst_alsa_mixer_element_init_interfaces (GType type) static void gst_alsa_mixer_element_base_init (gpointer klass) { - gst_element_class_set_details (GST_ELEMENT_CLASS (klass), - &gst_alsa_mixer_element_details); + gst_element_class_set_details_simple (GST_ELEMENT_CLASS (klass), + "Alsa mixer", "Generic/Audio", + "Control sound input and output levels with ALSA", + "Leif Johnson <leif@ambient.2y.net>"); } static void diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c index bc75ca6bb..c20688b76 100644 --- a/ext/alsa/gstalsasink.c +++ b/ext/alsa/gstalsasink.c @@ -53,13 +53,6 @@ #include <gst/gst-i18n-plugin.h> -/* elementfactory information */ -static const GstElementDetails gst_alsasink_details = -GST_ELEMENT_DETAILS ("Audio sink (ALSA)", - "Sink/Audio", - "Output to a sound card via ALSA", - "Wim Taymans <wim@fluendo.com>"); - #define DEFAULT_DEVICE "default" #define DEFAULT_DEVICE_NAME "" #define SPDIF_PERIOD_SIZE 1536 @@ -172,7 +165,9 @@ gst_alsasink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_alsasink_details); + gst_element_class_set_details_simple (element_class, + "Audio sink (ALSA)", "Sink/Audio", + "Output to a sound card via ALSA", "Wim Taymans <wim@fluendo.com>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&alsasink_sink_factory)); diff --git a/ext/alsa/gstalsasrc.c b/ext/alsa/gstalsasrc.c index d01bdc7a7..b6a4e1b31 100644 --- a/ext/alsa/gstalsasrc.c +++ b/ext/alsa/gstalsasrc.c @@ -51,13 +51,6 @@ #include <gst/gst-i18n-plugin.h> -/* elementfactory information */ -static const GstElementDetails gst_alsasrc_details = -GST_ELEMENT_DETAILS ("Audio source (ALSA)", - "Source/Audio", - "Read from a sound card via ALSA", - "Wim Taymans <wim@fluendo.com>"); - #define DEFAULT_PROP_DEVICE "default" #define DEFAULT_PROP_DEVICE_NAME "" @@ -191,7 +184,9 @@ gst_alsasrc_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_alsasrc_details); + gst_element_class_set_details_simple (element_class, + "Audio source (ALSA)", "Source/Audio", + "Read from a sound card via ALSA", "Wim Taymans <wim@fluendo.com>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&alsasrc_src_factory)); diff --git a/ext/cdparanoia/gstcdparanoiasrc.c b/ext/cdparanoia/gstcdparanoiasrc.c index fb710e0d5..5ea182d2a 100644 --- a/ext/cdparanoia/gstcdparanoiasrc.c +++ b/ext/cdparanoia/gstcdparanoiasrc.c @@ -70,12 +70,6 @@ static gboolean gst_cd_paranoia_src_open (GstCddaBaseSrc * src, const gchar * device); static void gst_cd_paranoia_src_close (GstCddaBaseSrc * src); -static const GstElementDetails cdparanoia_details = -GST_ELEMENT_DETAILS ("CD Audio (cdda) Source, Paranoia IV", - "Source/File", - "Read audio from CD in paranoid mode", - "Erik Walthinsen <omega@cse.ogi.edu>, " "Wim Taymans <wim@fluendo.com>"); - /* We use these to serialize calls to paranoia_read() among several * cdparanoiasrc instances. We do this because it's the only reasonably * easy way to find out the calling object from within the paranoia @@ -113,7 +107,10 @@ gst_cd_paranoia_src_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &cdparanoia_details); + gst_element_class_set_details_simple (element_class, + "CD Audio (cdda) Source, Paranoia IV", "Source/File", + "Read audio from CD in paranoid mode", + "Erik Walthinsen <omega@cse.ogi.edu>, Wim Taymans <wim@fluendo.com>"); } static void diff --git a/ext/gnomevfs/gstgnomevfssink.c b/ext/gnomevfs/gstgnomevfssink.c index 431c9fda9..b6d88f24c 100644 --- a/ext/gnomevfs/gstgnomevfssink.c +++ b/ext/gnomevfs/gstgnomevfssink.c @@ -64,12 +64,6 @@ #include <string.h> #include <errno.h> -static const GstElementDetails gst_gnome_vfs_sink_details = -GST_ELEMENT_DETAILS ("GnomeVFS Sink", - "Sink/File", - "Write a stream to a GnomeVFS URI", - "Bastien Nocera <hadess@hadess.net>"); - enum { SIGNAL_ERASE_ASK, @@ -140,7 +134,9 @@ gst_gnome_vfs_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_gnome_vfs_sink_details); + gst_element_class_set_details_simple (element_class, + "GnomeVFS Sink", "Sink/File", + "Write a stream to a GnomeVFS URI", "Bastien Nocera <hadess@hadess.net>"); } static gboolean diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c index cf26b30e5..83de38aa8 100644 --- a/ext/gnomevfs/gstgnomevfssrc.c +++ b/ext/gnomevfs/gstgnomevfssrc.c @@ -95,13 +95,6 @@ GST_DEBUG_CATEGORY_STATIC (gnomevfssrc_debug); #define GST_CAT_DEFAULT gnomevfssrc_debug -static const GstElementDetails gst_gnome_vfs_src_details = -GST_ELEMENT_DETAILS ("GnomeVFS Source", - "Source/File", - "Read from any GnomeVFS-supported file", - "Bastien Nocera <hadess@hadess.net>\n" - "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); - static GStaticMutex count_lock = G_STATIC_MUTEX_INIT; static gint ref_count = 0; static gboolean vfs_owner = FALSE; @@ -185,7 +178,11 @@ gst_gnome_vfs_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_gnome_vfs_src_details); + gst_element_class_set_details_simple (element_class, + "GnomeVFS Source", "Source/File", + "Read from any GnomeVFS-supported file", + "Bastien Nocera <hadess@hadess.net>, " + "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); GST_DEBUG_CATEGORY_INIT (gnomevfssrc_debug, "gnomevfssrc", 0, "Gnome-VFS Source"); diff --git a/ext/libvisual/visual.c b/ext/libvisual/visual.c index 8e0ef0eac..daa396ae3 100644 --- a/ext/libvisual/visual.c +++ b/ext/libvisual/visual.c @@ -180,14 +180,7 @@ gst_visual_class_init (gpointer g_class, gpointer class_data) if (class_data == NULL) { parent_class = g_type_class_peek_parent (g_class); } else { - GstElementDetails details = { - NULL, - "Visualization", - klass->plugin->info->about, - "Benjamin Otte <otte@gnome.org>" - }; - - details.longname = g_strdup_printf ("libvisual %s plugin v.%s", + char *longname = g_strdup_printf ("libvisual %s plugin v.%s", klass->plugin->info->name, klass->plugin->info->version); /* FIXME: improve to only register what plugin supports? */ @@ -195,8 +188,11 @@ gst_visual_class_init (gpointer g_class, gpointer class_data) gst_static_pad_template_get (&src_template)); gst_element_class_add_pad_template (element, gst_static_pad_template_get (&sink_template)); - gst_element_class_set_details (element, &details); - g_free (details.longname); + gst_element_class_set_details_simple (element, + longname, "Visualization", + klass->plugin->info->about, "Benjamin Otte <otte@gnome.org>"); + + g_free (longname); } object->dispose = gst_visual_dispose; @@ -761,8 +757,8 @@ gst_visual_change_state (GstElement * element, GstStateChange transition) switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: visual->actor = - visual_actor_new (GST_VISUAL_GET_CLASS (visual)->plugin->info-> - plugname); + visual_actor_new (GST_VISUAL_GET_CLASS (visual)->plugin-> + info->plugname); visual->video = visual_video_new (); visual->audio = visual_audio_new (); /* can't have a play without actors */ diff --git a/ext/ogg/gstoggaviparse.c b/ext/ogg/gstoggaviparse.c index 4dab7da90..bb210f3e7 100644 --- a/ext/ogg/gstoggaviparse.c +++ b/ext/ogg/gstoggaviparse.c @@ -39,12 +39,6 @@ #include "gstogg.h" -static const GstElementDetails gst_ogg_avi_parse_details = -GST_ELEMENT_DETAILS ("Ogg AVI parser", - "Codec/Parser", - "parse an ogg avi stream into pages (info about ogg: http://xiph.org)", - "Wim Taymans <wim@fluendo.com>"); - GST_DEBUG_CATEGORY_STATIC (gst_ogg_avi_parse_debug); #define GST_CAT_DEFAULT gst_ogg_avi_parse_debug @@ -139,7 +133,10 @@ gst_ogg_avi_parse_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_ogg_avi_parse_details); + gst_element_class_set_details_simple (element_class, + "Ogg AVI parser", "Codec/Parser", + "parse an ogg avi stream into pages (info about ogg: http://xiph.org)", + "Wim Taymans <wim@fluendo.com>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&ogg_avi_parse_sink_template_factory)); diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 96315c04f..96c0ca2e5 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -45,12 +45,6 @@ #include "gstoggdemux.h" -static const GstElementDetails gst_ogg_demux_details = -GST_ELEMENT_DETAILS ("Ogg demuxer", - "Codec/Demuxer", - "demux ogg streams (info about ogg: http://xiph.org)", - "Wim Taymans <wim@fluendo.com>"); - #define CHUNKSIZE (8500) /* this is out of vorbisfile */ #define SKELETON_FISHEAD_SIZE 64 #define SKELETON_FISBONE_MIN_SIZE 52 @@ -1202,7 +1196,10 @@ gst_ogg_demux_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_ogg_demux_details); + gst_element_class_set_details_simple (element_class, + "Ogg demuxer", "Codec/Demuxer", + "demux ogg streams (info about ogg: http://xiph.org)", + "Wim Taymans <wim@fluendo.com>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&ogg_demux_sink_template_factory)); diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index f242020e7..c7faf93d1 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -71,13 +71,6 @@ typedef enum } GstOggFlag; -/* elementfactory information */ -static const GstElementDetails gst_ogg_mux_details = -GST_ELEMENT_DETAILS ("Ogg muxer", - "Codec/Muxer", - "mux ogg streams (info about ogg: http://xiph.org)", - "Wim Taymans <wim@fluendo.com>"); - /* OggMux signals and args */ enum { @@ -176,7 +169,10 @@ gst_ogg_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_ogg_mux_details); + gst_element_class_set_details_simple (element_class, + "Ogg muxer", "Codec/Muxer", + "mux ogg streams (info about ogg: http://xiph.org)", + "Wim Taymans <wim@fluendo.com>"); } static void diff --git a/ext/ogg/gstoggparse.c b/ext/ogg/gstoggparse.c index 66071bd8b..69e1e2e8a 100644 --- a/ext/ogg/gstoggparse.c +++ b/ext/ogg/gstoggparse.c @@ -39,12 +39,6 @@ #include "gstogg.h" #include "gstoggstream.h" -static const GstElementDetails gst_ogg_parse_details = -GST_ELEMENT_DETAILS ("Ogg parser", - "Codec/Parser", - "parse ogg streams into pages (info about ogg: http://xiph.org)", - "Michael Smith <msmith@fluendo.com>"); - GST_DEBUG_CATEGORY_STATIC (gst_ogg_parse_debug); #define GST_CAT_DEFAULT gst_ogg_parse_debug @@ -219,7 +213,10 @@ gst_ogg_parse_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_ogg_parse_details); + gst_element_class_set_details_simple (element_class, + "Ogg parser", "Codec/Parser", + "parse ogg streams into pages (info about ogg: http://xiph.org)", + "Michael Smith <msmith@fluendo.com>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&ogg_parse_sink_template_factory)); diff --git a/ext/ogg/gstogmparse.c b/ext/ogg/gstogmparse.c index b79b5e645..6b054a2d1 100644 --- a/ext/ogg/gstogmparse.c +++ b/ext/ogg/gstogmparse.c @@ -59,24 +59,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_ogm_parse_debug); #define GST_OGM_PARSE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_OGM_PARSE, GstOgmParseClass)) -static const GstElementDetails gst_ogm_audio_parse_details = -GST_ELEMENT_DETAILS ("OGM audio stream parser", - "Codec/Decoder/Audio", - "parse an OGM audio header and stream", - "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); - -static const GstElementDetails gst_ogm_video_parse_details = -GST_ELEMENT_DETAILS ("OGM video stream parser", - "Codec/Decoder/Video", - "parse an OGM video header and stream", - "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); - -static const GstElementDetails gst_ogm_text_parse_details = -GST_ELEMENT_DETAILS ("OGM text stream parser", - "Codec/Decoder/Subtitle", - "parse an OGM text header and stream", - "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); - typedef struct _stream_header_video { gint32 width; @@ -292,7 +274,10 @@ gst_ogm_audio_parse_base_init (GstOgmParseClass * klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstCaps *caps = gst_riff_create_audio_template_caps (); - gst_element_class_set_details (element_class, &gst_ogm_audio_parse_details); + gst_element_class_set_details_simple (element_class, + "OGM audio stream parser", "Codec/Decoder/Audio", + "parse an OGM audio header and stream", + "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory_audio)); @@ -307,7 +292,10 @@ gst_ogm_video_parse_base_init (GstOgmParseClass * klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstCaps *caps = gst_riff_create_video_template_caps (); - gst_element_class_set_details (element_class, &gst_ogm_video_parse_details); + gst_element_class_set_details_simple (element_class, + "OGM video stream parser", "Codec/Decoder/Video", + "parse an OGM video header and stream", + "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory_video)); @@ -322,7 +310,10 @@ gst_ogm_text_parse_base_init (GstOgmParseClass * klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstCaps *caps = gst_caps_new_simple ("text/plain", NULL, NULL); - gst_element_class_set_details (element_class, &gst_ogm_text_parse_details); + gst_element_class_set_details_simple (element_class, + "OGM text stream parser", "Codec/Decoder/Subtitle", + "parse an OGM text header and stream", + "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_factory_text)); diff --git a/ext/theora/gsttheoradec.c b/ext/theora/gsttheoradec.c index a8b42648c..f2c6fa654 100644 --- a/ext/theora/gsttheoradec.c +++ b/ext/theora/gsttheoradec.c @@ -55,13 +55,6 @@ enum ARG_CROP }; -static const GstElementDetails theora_dec_details = -GST_ELEMENT_DETAILS ("Theora video decoder", - "Codec/Decoder/Video", - "decode raw theora streams to raw YUV video", - "Benjamin Otte <in7y118@public.uni-hamburg.de>, " - "Wim Taymans <wim@fluendo.com>"); - static GstStaticPadTemplate theora_dec_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -115,7 +108,10 @@ gst_theora_dec_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", + "Benjamin Otte <otte@gnome.org>, Wim Taymans <wim@fluendo.com>"); } static void diff --git a/ext/theora/gsttheoraenc.c b/ext/theora/gsttheoraenc.c index ced73d186..26c5ea350 100644 --- a/ext/theora/gsttheoraenc.c +++ b/ext/theora/gsttheoraenc.c @@ -152,12 +152,6 @@ granulepos_to_timestamp (GstTheoraEnc * theoraenc, ogg_int64_t granulepos) theoraenc->info.fps_numerator); } -static const GstElementDetails theora_enc_details = -GST_ELEMENT_DETAILS ("Theora video encoder", - "Codec/Encoder/Video", - "encode raw YUV video to a theora stream", - "Wim Taymans <wim@fluendo.com>"); - static GstStaticPadTemplate theora_enc_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -213,7 +207,10 @@ gst_theora_enc_base_init (gpointer g_class) gst_static_pad_template_get (&theora_enc_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&theora_enc_sink_factory)); - gst_element_class_set_details (element_class, &theora_enc_details); + gst_element_class_set_details_simple (element_class, + "Theora video encoder", "Codec/Encoder/Video", + "encode raw YUV video to a theora stream", + "Wim Taymans <wim@fluendo.com>"); } static void diff --git a/ext/theora/gsttheoraparse.c b/ext/theora/gsttheoraparse.c index 8d5d9e2dd..b7e1c716e 100644 --- a/ext/theora/gsttheoraparse.c +++ b/ext/theora/gsttheoraparse.c @@ -65,13 +65,6 @@ #define GST_CAT_DEFAULT theoraparse_debug GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); -static GstElementDetails theora_parse_details = { - "Theora video parser", - "Codec/Parser/Video", - "parse raw theora streams", - "Andy Wingo <wingo@pobox.com>" -}; - static GstStaticPadTemplate theora_parse_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -116,7 +109,9 @@ gst_theora_parse_base_init (gpointer g_class) gst_static_pad_template_get (&theora_parse_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&theora_parse_sink_factory)); - gst_element_class_set_details (element_class, &theora_parse_details); + gst_element_class_set_details_simple (element_class, + "Theora video parser", "Codec/Parser/Video", + "parse raw theora streams", "Andy Wingo <wingo@pobox.com>"); } static void diff --git a/ext/vorbis/gstvorbisdec.c b/ext/vorbis/gstvorbisdec.c index 85f36d092..1e4b50b42 100644 --- a/ext/vorbis/gstvorbisdec.c +++ b/ext/vorbis/gstvorbisdec.c @@ -51,9 +51,6 @@ GST_DEBUG_CATEGORY_EXTERN (vorbisdec_debug); #define GST_CAT_DEFAULT vorbisdec_debug -static const GstElementDetails vorbis_dec_details = - GST_VORBIS_DEC_ELEMENT_DETAILS; - static GstStaticPadTemplate vorbis_dec_src_factory = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, @@ -98,7 +95,10 @@ gst_vorbis_dec_base_init (gpointer g_class) sink_template = gst_static_pad_template_get (&vorbis_dec_sink_factory); gst_element_class_add_pad_template (element_class, sink_template); - gst_element_class_set_details (element_class, &vorbis_dec_details); + gst_element_class_set_details_simple (element_class, + "Vorbis audio decoder", "Codec/Decoder/Audio", + GST_VORBIS_DEC_DESCRIPTION, + "Benjamin Otte <otte@gnome.org>, Chris Lord <chris@openedhand.com>"); } static void diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h index a438fa852..df9093fb5 100644 --- a/ext/vorbis/gstvorbisdeclib.h +++ b/ext/vorbis/gstvorbisdeclib.h @@ -34,11 +34,7 @@ typedef float vorbis_sample_t; typedef ogg_packet ogg_packet_wrapper; -#define GST_VORBIS_DEC_ELEMENT_DETAILS \ -GST_ELEMENT_DETAILS ("Vorbis audio decoder", \ - "Codec/Decoder/Audio", \ - "decode raw vorbis streams to float audio", \ - "Benjamin Otte <in7y118@public.uni-hamburg.de>") +#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to float audio" #define GST_VORBIS_DEC_SRC_CAPS \ GST_STATIC_CAPS ("audio/x-raw-float, " "rate = (int) [ 1, MAX ], " \ @@ -87,12 +83,7 @@ struct _ogg_packet_wrapper { ogg_buffer buf; }; -#define GST_VORBIS_DEC_ELEMENT_DETAILS \ -GST_ELEMENT_DETAILS ("Vorbis audio decoder", \ - "Codec/Decoder/Audio", \ - "decode raw vorbis streams to integer audio", \ - "Benjamin Otte <in7y118@public.uni-hamburg.de>\n" \ - "Chris Lord <chris@openedhand.com>") +#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio" #define GST_VORBIS_DEC_SRC_CAPS \ GST_STATIC_CAPS ("audio/x-raw-int, " \ diff --git a/ext/vorbis/gstvorbisenc.c b/ext/vorbis/gstvorbisenc.c index b09723b22..9cdf484e1 100644 --- a/ext/vorbis/gstvorbisenc.c +++ b/ext/vorbis/gstvorbisenc.c @@ -76,14 +76,6 @@ GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_CAPS ("audio/x-vorbis") ); - -/* elementfactory information */ -static const GstElementDetails vorbisenc_details = -GST_ELEMENT_DETAILS ("Vorbis audio encoder", - "Codec/Encoder/Audio", - "Encodes audio in Vorbis format", - "Monty <monty@xiph.org>, " "Wim Taymans <wim@fluendo.com>"); - enum { ARG_0, @@ -166,7 +158,10 @@ gst_vorbis_enc_base_init (gpointer g_class) sink_template = gst_static_pad_template_get (&vorbis_enc_sink_factory); gst_element_class_add_pad_template (element_class, sink_template); - gst_element_class_set_details (element_class, &vorbisenc_details); + gst_element_class_set_details_simple (element_class, + "Vorbis audio encoder", "Codec/Encoder/Audio", + "Encodes audio in Vorbis format", + "Monty <monty@xiph.org>, " "Wim Taymans <wim@fluendo.com>"); } static void diff --git a/ext/vorbis/gstvorbisparse.c b/ext/vorbis/gstvorbisparse.c index 822b17ab5..53fd7b1b3 100644 --- a/ext/vorbis/gstvorbisparse.c +++ b/ext/vorbis/gstvorbisparse.c @@ -58,13 +58,6 @@ GST_DEBUG_CATEGORY_EXTERN (vorbisparse_debug); #define GST_CAT_DEFAULT vorbisparse_debug -static const GstElementDetails vorbis_parse_details = { - "VorbisParse", - "Codec/Parser/Audio", - "parse raw vorbis streams", - "Thomas Vander Stichele <thomas at apestaart dot org>" -}; - static GstStaticPadTemplate vorbis_parse_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -102,7 +95,10 @@ gst_vorbis_parse_base_init (gpointer g_class) gst_static_pad_template_get (&vorbis_parse_src_factory)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&vorbis_parse_sink_factory)); - gst_element_class_set_details (element_class, &vorbis_parse_details); + gst_element_class_set_details_simple (element_class, + "VorbisParse", "Codec/Parser/Audio", + "parse raw vorbis streams", + "Thomas Vander Stichele <thomas at apestaart dot org>"); } static void diff --git a/ext/vorbis/gstvorbistag.c b/ext/vorbis/gstvorbistag.c index 96368cf40..8a2db410e 100644 --- a/ext/vorbis/gstvorbistag.c +++ b/ext/vorbis/gstvorbistag.c @@ -77,20 +77,15 @@ static GstFlowReturn gst_vorbis_tag_parse_packet (GstVorbisParse * parse, GST_BOILERPLATE_FULL (GstVorbisTag, gst_vorbis_tag, GstVorbisParse, GST_TYPE_VORBIS_PARSE, _do_init); -static GstElementDetails vorbis_tag_details = { - "VorbisTag", - "Formatter/Metadata", - "Retags vorbis streams", - "James Livingston <doclivingston@gmail.com>" -}; - static void gst_vorbis_tag_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &vorbis_tag_details); + gst_element_class_set_details_simple (element_class, + "VorbisTag", "Formatter/Metadata", + "Retags vorbis streams", "James Livingston <doclivingston@gmail.com>"); } static void diff --git a/gst-libs/gst/sdp/gstsdpmessage.c b/gst-libs/gst/sdp/gstsdpmessage.c index 5495abc3a..7784bcee2 100644 --- a/gst-libs/gst/sdp/gstsdpmessage.c +++ b/gst-libs/gst/sdp/gstsdpmessage.c @@ -341,12 +341,12 @@ is_multicast_address (const gchar * host_name, guint * family) 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); if (ret && family) *family = ai->ai_family; } diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index 74db1625b..2b3445aab 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -71,12 +71,6 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); /*** DEFINITIONS **************************************************************/ -static const GstElementDetails audio_convert_details = -GST_ELEMENT_DETAILS ("Audio converter", - "Filter/Converter/Audio", - "Convert audio to different formats", - "Benjamin Otte <in7y118@public.uni-hamburg.de>"); - /* type functions */ static void gst_audio_convert_dispose (GObject * obj); @@ -231,7 +225,9 @@ gst_audio_convert_base_init (gpointer g_class) gst_static_pad_template_get (&gst_audio_convert_src_template)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_audio_convert_sink_template)); - gst_element_class_set_details (element_class, &audio_convert_details); + gst_element_class_set_details_simple (element_class, + "Audio converter", "Filter/Converter/Audio", + "Convert audio to different formats", "Benjamin Otte <otte@gnome.org>"); } static void diff --git a/gst/audiorate/gstaudiorate.c b/gst/audiorate/gstaudiorate.c index 0adf8e18b..c826bdebe 100644 --- a/gst/audiorate/gstaudiorate.c +++ b/gst/audiorate/gstaudiorate.c @@ -69,13 +69,6 @@ #define GST_CAT_DEFAULT audio_rate_debug GST_DEBUG_CATEGORY_STATIC (audio_rate_debug); -/* elementfactory information */ -static const GstElementDetails audio_rate_details = -GST_ELEMENT_DETAILS ("Audio rate adjuster", - "Filter/Effect/Audio", - "Drops/duplicates/adjusts timestamps on audio samples to make a perfect stream", - "Wim Taymans <wim@fluendo.com>"); - /* GstAudioRate signals and args */ enum { @@ -163,7 +156,10 @@ gst_audio_rate_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &audio_rate_details); + gst_element_class_set_details_simple (element_class, + "Audio rate adjuster", "Filter/Effect/Audio", + "Drops/duplicates/adjusts timestamps on audio samples to make a perfect stream", + "Wim Taymans <wim@fluendo.com>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_audio_rate_sink_template)); diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c index 2abd41a26..259d94efd 100644 --- a/gst/audiotestsrc/gstaudiotestsrc.c +++ b/gst/audiotestsrc/gstaudiotestsrc.c @@ -61,12 +61,6 @@ GST_DEBUG_CATEGORY_STATIC (audio_test_src_debug); #define GST_CAT_DEFAULT audio_test_src_debug -static const GstElementDetails gst_audio_test_src_details = -GST_ELEMENT_DETAILS ("Audio test source", - "Source/Audio", - "Creates audio test signals of given frequency and volume", - "Stefan Kost <ensonic@users.sf.net>"); - #define DEFAULT_SAMPLES_PER_BUFFER 1024 #define DEFAULT_WAVE GST_AUDIO_TEST_SRC_WAVE_SINE #define DEFAULT_FREQ 440.0 @@ -179,7 +173,10 @@ gst_audio_test_src_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_audio_test_src_src_template)); - gst_element_class_set_details (element_class, &gst_audio_test_src_details); + gst_element_class_set_details_simple (element_class, + "Audio test source", "Source/Audio", + "Creates audio test signals of given frequency and volume", + "Stefan Kost <ensonic@users.sf.net>"); } static void diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c index 3d49f7f04..447fe91b6 100644 --- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c +++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c @@ -43,14 +43,6 @@ GST_DEBUG_CATEGORY (ffmpegcolorspace_debug); #define GST_CAT_DEFAULT ffmpegcolorspace_debug GST_DEBUG_CATEGORY (ffmpegcolorspace_performance); -/* elementfactory information */ -static const GstElementDetails ffmpegcsp_details = -GST_ELEMENT_DETAILS ("FFMPEG Colorspace converter", - "Filter/Converter/Video", - "Converts video from one colorspace to another", - "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); - - /* Stereo signals and args */ enum { @@ -384,7 +376,10 @@ gst_ffmpegcsp_base_init (GstFFMpegCspClass * klass) gst_element_class_add_pad_template (element_class, srctempl); gst_element_class_add_pad_template (element_class, sinktempl); - gst_element_class_set_details (element_class, &ffmpegcsp_details); + gst_element_class_set_details_simple (element_class, + "FFMPEG Colorspace converter", "Filter/Converter/Video", + "Converts video from one colorspace to another", + "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); } static void diff --git a/gst/gdp/gstgdpdepay.c b/gst/gdp/gstgdpdepay.c index a72cc3032..702e63fed 100644 --- a/gst/gdp/gstgdpdepay.c +++ b/gst/gdp/gstgdpdepay.c @@ -42,13 +42,6 @@ #include "gstgdpdepay.h" -/* elementfactory information */ -static const GstElementDetails gdp_depay_details = -GST_ELEMENT_DETAILS ("GDP Depayloader", - "GDP/Depayloader", - "Depayloads GStreamer Data Protocol buffers", - "Thomas Vander Stichele <thomas at apestaart dot org>"); - enum { PROP_0, @@ -91,7 +84,10 @@ gst_gdp_depay_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gdp_depay_details); + gst_element_class_set_details_simple (element_class, + "GDP Depayloader", "GDP/Depayloader", + "Depayloads GStreamer Data Protocol buffers", + "Thomas Vander Stichele <thomas at apestaart dot org>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gdp_depay_sink_template)); diff --git a/gst/gdp/gstgdppay.c b/gst/gdp/gstgdppay.c index 584e2ea51..ea8595b28 100644 --- a/gst/gdp/gstgdppay.c +++ b/gst/gdp/gstgdppay.c @@ -40,13 +40,6 @@ #include "gstgdppay.h" -/* elementfactory information */ -static const GstElementDetails gdp_pay_details = -GST_ELEMENT_DETAILS ("GDP Payloader", - "GDP/Payloader", - "Payloads GStreamer Data Protocol buffers", - "Thomas Vander Stichele <thomas at apestaart dot org>"); - static GstStaticPadTemplate gdp_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -104,7 +97,10 @@ gst_gdp_pay_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gdp_pay_details); + gst_element_class_set_details_simple (element_class, + "GDP Payloader", "GDP/Payloader", + "Payloads GStreamer Data Protocol buffers", + "Thomas Vander Stichele <thomas at apestaart dot org>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gdp_pay_sink_template)); diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c index 13c136fa8..d30aa0f2a 100644 --- a/gst/playback/gstdecodebin.c +++ b/gst/playback/gstdecodebin.c @@ -187,12 +187,6 @@ static gboolean is_demuxer_element (GstElement * srcelement); static GstElementClass *parent_class; static guint gst_decode_bin_signals[LAST_SIGNAL] = { 0 }; -static const GstElementDetails gst_decode_bin_details = -GST_ELEMENT_DETAILS ("Decoder Bin", - "Generic/Bin/Decoder", - "Autoplug and decode to raw media", - "Wim Taymans <wim.taymans@gmail.com>"); - static GType gst_decode_bin_get_type (void) @@ -290,7 +284,10 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_element_class_add_pad_template (gstelement_klass, gst_static_pad_template_get (&decoder_bin_src_template)); - gst_element_class_set_details (gstelement_klass, &gst_decode_bin_details); + gst_element_class_set_details_simple (gstelement_klass, + "Decoder Bin", "Generic/Bin/Decoder", + "Autoplug and decode to raw media", + "Wim Taymans <wim.taymans@gmail.com>"); gstelement_klass->change_state = GST_DEBUG_FUNCPTR (gst_decode_bin_change_state); diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index fcefecda3..e4726eba0 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -253,13 +253,6 @@ enum static GstBinClass *parent_class; static guint gst_decode_bin_signals[LAST_SIGNAL] = { 0 }; -static const GstElementDetails gst_decode_bin_details = -GST_ELEMENT_DETAILS ("Decoder Bin", - "Generic/Bin/Decoder", - "Autoplug and decode to raw media", - "Edward Hervey <edward.hervey@collabora.co.uk>, " - "Sebastian Dröge <sebastian.droege@collabora.co.uk>"); - static GstStaticCaps default_raw_caps = GST_STATIC_CAPS (DEFAULT_RAW_CAPS); static void do_async_start (GstDecodeBin * dbin); @@ -852,7 +845,11 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass) gst_element_class_add_pad_template (gstelement_klass, gst_static_pad_template_get (&decoder_bin_src_template)); - gst_element_class_set_details (gstelement_klass, &gst_decode_bin_details); + gst_element_class_set_details_simple (gstelement_klass, + "Decoder Bin", "Generic/Bin/Decoder", + "Autoplug and decode to raw media", + "Edward Hervey <edward.hervey@collabora.co.uk>, " + "Sebastian Dröge <sebastian.droege@collabora.co.uk>"); gstelement_klass->change_state = GST_DEBUG_FUNCPTR (gst_decode_bin_change_state); diff --git a/gst/playback/gstinputselector.c b/gst/playback/gstinputselector.c index 72aa9ffca..5ce5c3313 100644 --- a/gst/playback/gstinputselector.c +++ b/gst/playback/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 <julien@moutte.net>\n" - "Jan Schmidt <thaytan@mad.scientist.com>\n" - "Wim Taymans <wim.taymans@gmail.com>"); - static GstStaticPadTemplate gst_input_selector_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink%d", GST_PAD_SINK, @@ -746,7 +738,12 @@ 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 <julien@moutte.net>, " + "Jan Schmidt <thaytan@mad.scientist.com>, " + "Wim Taymans <wim.taymans@gmail.com>"); 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/playback/gstplaybin.c b/gst/playback/gstplaybin.c index f044c6160..a62dc8249 100644 --- a/gst/playback/gstplaybin.c +++ b/gst/playback/gstplaybin.c @@ -333,12 +333,6 @@ static GstElementClass *parent_class; //static guint gst_play_bin_signals[LAST_SIGNAL] = { 0 }; -static const GstElementDetails gst_play_bin_details = -GST_ELEMENT_DETAILS ("Player Bin", - "Generic/Bin/Player", - "Autoplug and play media from an uri", - "Wim Taymans <wim.taymans@gmail.com>"); - static GType gst_play_bin_get_type (void) { @@ -417,7 +411,10 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gobject_klass->dispose = gst_play_bin_dispose; - gst_element_class_set_details (gstelement_klass, &gst_play_bin_details); + gst_element_class_set_details_simple (gstelement_klass, + "Player Bin", "Generic/Bin/Player", + "Autoplug and play media from an uri", + "Wim Taymans <wim.taymans@gmail.com>"); gstelement_klass->change_state = GST_DEBUG_FUNCPTR (gst_play_bin_change_state); diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index 5cf4d9107..2d1ee4b37 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -559,12 +559,6 @@ static GstElementClass *parent_class; static guint gst_play_bin_signals[LAST_SIGNAL] = { 0 }; -static const GstElementDetails gst_play_bin_details = -GST_ELEMENT_DETAILS ("Player Bin 2", - "Generic/Bin/Player", - "Autoplug and play media from an uri", - "Wim Taymans <wim.taymans@gmail.com>"); - #define REMOVE_SIGNAL(obj,id) \ if (id) { \ g_signal_handler_disconnect (obj, id); \ @@ -1053,7 +1047,10 @@ gst_play_bin_class_init (GstPlayBinClass * klass) klass->get_audio_pad = gst_play_bin_get_audio_pad; klass->get_text_pad = gst_play_bin_get_text_pad; - gst_element_class_set_details (gstelement_klass, &gst_play_bin_details); + gst_element_class_set_details_simple (gstelement_klass, + "Player Bin 2", "Generic/Bin/Player", + "Autoplug and play media from an uri", + "Wim Taymans <wim.taymans@gmail.com>"); gstelement_klass->change_state = GST_DEBUG_FUNCPTR (gst_play_bin_change_state); @@ -2432,8 +2429,8 @@ _playsink_sink_event_probe_cb (GstPad * pad, GstEvent * event, if (format != GST_FORMAT_TIME) data->group->selector[data->type].group_start_accum = GST_CLOCK_TIME_NONE; - else if (!GST_CLOCK_TIME_IS_VALID (data->group->selector[data->type]. - group_start_accum)) + else if (!GST_CLOCK_TIME_IS_VALID (data->group->selector[data-> + type].group_start_accum)) data->group->selector[data->type].group_start_accum = segment->accum; } else if (GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) { gst_segment_init (&data->playbin->segments[index], GST_FORMAT_UNDEFINED); diff --git a/gst/playback/gststreamselector.c b/gst/playback/gststreamselector.c index b77da1e59..294eac4c0 100644 --- a/gst/playback/gststreamselector.c +++ b/gst/playback/gststreamselector.c @@ -31,14 +31,6 @@ GST_DEBUG_CATEGORY_STATIC (stream_selector_debug); #define GST_CAT_DEFAULT stream_selector_debug -static const GstElementDetails gst_stream_selector_details = -GST_ELEMENT_DETAILS ("StreamSelector", - "Generic", - "N-to-1 input stream_selectoring", - "Julien Moutte <julien@moutte.net>\n" - "Jan Schmidt <thaytan@mad.scientist.com>\n" - "Wim Taymans <wim.taymans@gmail.com>"); - static GstStaticPadTemplate gst_stream_selector_sink_factory = GST_STATIC_PAD_TEMPLATE ("sink%d", GST_PAD_SINK, @@ -468,7 +460,12 @@ gst_stream_selector_base_init (GstStreamSelectorClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_set_details (element_class, &gst_stream_selector_details); + gst_element_class_set_details_simple (element_class, + "StreamSelector", "Generic", + "N-to-1 input stream_selectoring", + "Julien Moutte <julien@moutte.net>, " + "Jan Schmidt <thaytan@mad.scientist.com>, " + "Wim Taymans <wim.taymans@gmail.com>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_stream_selector_sink_factory)); gst_element_class_add_pad_template (element_class, diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c index b19459b98..96dc57b17 100644 --- a/gst/playback/gsturidecodebin.c +++ b/gst/playback/gsturidecodebin.c @@ -134,12 +134,6 @@ static GstStaticCaps default_raw_caps = GST_STATIC_CAPS (DEFAULT_RAW_CAPS); GST_DEBUG_CATEGORY_STATIC (gst_uri_decode_bin_debug); #define GST_CAT_DEFAULT gst_uri_decode_bin_debug -static const GstElementDetails gst_uri_decode_bin_details = -GST_ELEMENT_DETAILS ("URI Decoder", - "Generic/Bin/Decoder", - "Autoplug and decode an URI to raw media", - "Wim Taymans <wim.taymans@gmail.com>"); - /* signals */ enum { @@ -203,7 +197,10 @@ gst_uri_decode_bin_base_init (gpointer g_class) gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&srctemplate)); - gst_element_class_set_details (gstelement_class, &gst_uri_decode_bin_details); + gst_element_class_set_details_simple (gstelement_class, + "URI Decoder", "Generic/Bin/Decoder", + "Autoplug and decode an URI to raw media", + "Wim Taymans <wim.taymans@gmail.com>"); } static gboolean diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c index d40007706..5aa68e32e 100644 --- a/gst/subparse/gstssaparse.c +++ b/gst/subparse/gstssaparse.c @@ -57,18 +57,15 @@ static void gst_ssa_parse_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - static GstElementDetails ssa_parse_details = { - "SSA Subtitle Parser", - "Codec/Parser/Subtitle", - "Parses SSA subtitle streams", - "Tim-Philipp Müller <tim centricular net>" - }; gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_templ)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_templ)); - gst_element_class_set_details (element_class, &ssa_parse_details); + gst_element_class_set_details_simple (element_class, + "SSA Subtitle Parser", "Codec/Parser/Subtitle", + "Parses SSA subtitle streams", + "Tim-Philipp Müller <tim centricular net>"); GST_DEBUG_CATEGORY_INIT (ssa_parse_debug, "ssaparse", 0, "SSA subtitle parser"); diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c index aa5c8915a..460ee66c3 100644 --- a/gst/subparse/gstsubparse.c +++ b/gst/subparse/gstsubparse.c @@ -55,13 +55,6 @@ gst_sub_parse_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static const GstElementDetails sub_parse_details = -GST_ELEMENT_DETAILS ("Subtitle parser", - "Codec/Parser/Subtitle", - "Parses subtitle (.sub) files into text streams", - "Gustavo J. A. M. Carneiro <gjc@inescporto.pt>\n" - "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); - #ifndef GST_DISABLE_XML static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -135,7 +128,11 @@ gst_sub_parse_base_init (GstSubParseClass * klass) gst_static_pad_template_get (&sink_templ)); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_templ)); - gst_element_class_set_details (element_class, &sub_parse_details); + gst_element_class_set_details_simple (element_class, + "Subtitle parser", "Codec/Parser/Subtitle", + "Parses subtitle (.sub) files into text streams", + "Gustavo J. A. M. Carneiro <gjc@inescporto.pt>, " + "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); } static void diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c index 4a440e954..e36182cb5 100644 --- a/gst/tcp/gstmultifdsink.c +++ b/gst/tcp/gstmultifdsink.c @@ -124,14 +124,6 @@ #define NOT_IMPLEMENTED 0 -/* elementfactory information */ -static const GstElementDetails gst_multi_fd_sink_details = -GST_ELEMENT_DETAILS ("Multi filedescriptor sink", - "Sink/Network", - "Send data to multiple filedescriptors", - "Thomas Vander Stichele <thomas at apestaart dot org>, " - "Wim Taymans <wim@fluendo.com>"); - static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -366,7 +358,11 @@ gst_multi_fd_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_multi_fd_sink_details); + gst_element_class_set_details_simple (element_class, + "Multi filedescriptor sink", "Sink/Network", + "Send data to multiple filedescriptors", + "Thomas Vander Stichele <thomas at apestaart dot org>, " + "Wim Taymans <wim@fluendo.com>"); } static void diff --git a/gst/tcp/gsttcpclientsink.c b/gst/tcp/gsttcpclientsink.c index 533944424..ca60578ba 100644 --- a/gst/tcp/gsttcpclientsink.c +++ b/gst/tcp/gsttcpclientsink.c @@ -42,13 +42,6 @@ #include "gsttcpclientsink.h" #include <string.h> /* memset */ -/* elementfactory information */ -static const GstElementDetails gst_tcp_client_sink_details = -GST_ELEMENT_DETAILS ("TCP client sink", - "Sink/Network", - "Send data as a client over the network via TCP", - "Thomas Vander Stichele <thomas at apestaart dot org>"); - /* TCPClientSink signals and args */ enum { @@ -131,7 +124,10 @@ gst_tcp_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_tcp_client_sink_details); + gst_element_class_set_details_simple (element_class, + "TCP client sink", "Sink/Network", + "Send data as a client over the network via TCP", + "Thomas Vander Stichele <thomas at apestaart dot org>"); } static void diff --git a/gst/tcp/gsttcpclientsrc.c b/gst/tcp/gsttcpclientsrc.c index a0548b992..b8ac8490d 100644 --- a/gst/tcp/gsttcpclientsrc.c +++ b/gst/tcp/gsttcpclientsrc.c @@ -52,12 +52,6 @@ GST_DEBUG_CATEGORY_STATIC (tcpclientsrc_debug); #define MAX_READ_SIZE 4 * 1024 -static const GstElementDetails gst_tcp_client_src_details = -GST_ELEMENT_DETAILS ("TCP client source", - "Source/Network", - "Receive data as a client over the network via TCP", - "Thomas Vander Stichele <thomas at apestaart dot org>"); - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -102,7 +96,10 @@ gst_tcp_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_tcp_client_src_details); + gst_element_class_set_details_simple (element_class, + "TCP client source", "Source/Network", + "Receive data as a client over the network via TCP", + "Thomas Vander Stichele <thomas at apestaart dot org>"); } static void diff --git a/gst/tcp/gsttcpserversink.c b/gst/tcp/gsttcpserversink.c index fcec3159a..c0cb95f73 100644 --- a/gst/tcp/gsttcpserversink.c +++ b/gst/tcp/gsttcpserversink.c @@ -51,13 +51,6 @@ #define TCP_BACKLOG 5 -/* elementfactory information */ -static const GstElementDetails gst_tcp_server_sink_details = -GST_ELEMENT_DETAILS ("TCP server sink", - "Sink/Network", - "Send data as a server over the network via TCP", - "Thomas Vander Stichele <thomas at apestaart dot org>"); - GST_DEBUG_CATEGORY_STATIC (tcpserversink_debug); #define GST_CAT_DEFAULT (tcpserversink_debug) @@ -91,7 +84,10 @@ gst_tcp_server_sink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_tcp_server_sink_details); + gst_element_class_set_details_simple (element_class, + "TCP server sink", "Sink/Network", + "Send data as a server over the network via TCP", + "Thomas Vander Stichele <thomas at apestaart dot org>"); } static void diff --git a/gst/tcp/gsttcpserversrc.c b/gst/tcp/gsttcpserversrc.c index 1273e0a8d..c4244dab7 100644 --- a/gst/tcp/gsttcpserversrc.c +++ b/gst/tcp/gsttcpserversrc.c @@ -53,12 +53,6 @@ GST_DEBUG_CATEGORY_STATIC (tcpserversrc_debug); #define TCP_BACKLOG 1 /* client connection queue */ -static const GstElementDetails gst_tcp_server_src_details = -GST_ELEMENT_DETAILS ("TCP server source", - "Source/Network", - "Receive data as a server over the network via TCP", - "Thomas Vander Stichele <thomas at apestaart dot org>"); - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -100,7 +94,10 @@ gst_tcp_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_tcp_server_src_details); + gst_element_class_set_details_simple (element_class, + "TCP server source", "Source/Network", + "Receive data as a server over the network via TCP", + "Thomas Vander Stichele <thomas at apestaart dot org>"); } static void diff --git a/gst/videorate/gstvideorate.c b/gst/videorate/gstvideorate.c index b34813380..cd72600c1 100644 --- a/gst/videorate/gstvideorate.c +++ b/gst/videorate/gstvideorate.c @@ -76,13 +76,6 @@ GST_DEBUG_CATEGORY_STATIC (video_rate_debug); #define GST_CAT_DEFAULT video_rate_debug -/* elementfactory information */ -static const GstElementDetails video_rate_details = -GST_ELEMENT_DETAILS ("Video rate adjuster", - "Filter/Effect/Video", - "Drops/duplicates/adjusts timestamps on video frames to make a perfect stream", - "Wim Taymans <wim@fluendo.com>"); - /* GstVideoRate signals and args */ enum { @@ -144,7 +137,10 @@ gst_video_rate_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &video_rate_details); + gst_element_class_set_details_simple (element_class, + "Video rate adjuster", "Filter/Effect/Video", + "Drops/duplicates/adjusts timestamps on video frames to make a perfect stream", + "Wim Taymans <wim@fluendo.com>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_video_rate_sink_template)); diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c index f572377c5..283fa277e 100644 --- a/gst/videoscale/gstvideoscale.c +++ b/gst/videoscale/gstvideoscale.c @@ -65,13 +65,6 @@ /* debug variable definition */ GST_DEBUG_CATEGORY (video_scale_debug); -/* elementfactory information */ -static const GstElementDetails video_scale_details = -GST_ELEMENT_DETAILS ("Video scaler", - "Filter/Effect/Video", - "Resizes video", - "Wim Taymans <wim.taymans@chello.be>"); - #define DEFAULT_PROP_METHOD GST_VIDEO_SCALE_BILINEAR enum @@ -258,7 +251,9 @@ gst_video_scale_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &video_scale_details); + gst_element_class_set_details_simple (element_class, + "Video scaler", "Filter/Effect/Video", + "Resizes video", "Wim Taymans <wim.taymans@chello.be>"); gst_element_class_add_pad_template (element_class, gst_video_scale_sink_template_factory ()); diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c index 9d61dbbd3..36d20f765 100644 --- a/gst/videotestsrc/gstvideotestsrc.c +++ b/gst/videotestsrc/gstvideotestsrc.c @@ -46,12 +46,6 @@ GST_DEBUG_CATEGORY_STATIC (video_test_src_debug); #define GST_CAT_DEFAULT video_test_src_debug -static const GstElementDetails video_test_src_details = -GST_ELEMENT_DETAILS ("Video test source", - "Source/Video", - "Creates a test video stream", - "David A. Schleef <ds@schleef.org>"); - #define DEFAULT_PATTERN GST_VIDEO_TEST_SRC_SMPTE #define DEFAULT_TIMESTAMP_OFFSET 0 #define DEFAULT_IS_LIVE FALSE @@ -165,7 +159,9 @@ gst_video_test_src_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &video_test_src_details); + gst_element_class_set_details_simple (element_class, + "Video test source", "Source/Video", + "Creates a test video stream", "David A. Schleef <ds@schleef.org>"); gst_element_class_add_pad_template (element_class, gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, diff --git a/sys/v4l/gstv4ljpegsrc.c b/sys/v4l/gstv4ljpegsrc.c index c640cb427..724a66fdf 100644 --- a/sys/v4l/gstv4ljpegsrc.c +++ b/sys/v4l/gstv4ljpegsrc.c @@ -29,13 +29,6 @@ #include "gstv4ljpegsrc.h" #include "v4lsrc_calls.h" -/* elementfactory information */ -static const GstElementDetails gst_v4ljpegsrc_details = -GST_ELEMENT_DETAILS ("Video (video4linux/raw) Jpeg Source", - "Source/Video", - "Reads jpeg frames from a video4linux (eg ov519) device", - "Jan Schmidt <thaytan@mad.scientist.com>"); - GST_DEBUG_CATEGORY_STATIC (v4ljpegsrc_debug); #define GST_CAT_DEFAULT v4ljpegsrc_debug @@ -85,7 +78,10 @@ gst_v4ljpegsrc_base_init (gpointer g_class) { GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (gstelement_class, &gst_v4ljpegsrc_details); + gst_element_class_set_details_simple (gstelement_class, + "Video (video4linux/raw) Jpeg Source", "Source/Video", + "Reads jpeg frames from a video4linux (eg ov519) device", + "Jan Schmidt <thaytan@mad.scientist.com>"); } static void diff --git a/sys/v4l/gstv4lmjpegsink.c b/sys/v4l/gstv4lmjpegsink.c index ed1e92670..3a5cfaa6d 100644 --- a/sys/v4l/gstv4lmjpegsink.c +++ b/sys/v4l/gstv4lmjpegsink.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY_STATIC (v4lmjpegsink_debug); #define GST_CAT_DEFAULT v4lmjpegsink_debug -/* elementfactory information */ -static const GstElementDetails gst_v4lmjpegsink_details = -GST_ELEMENT_DETAILS ("Video (video4linux/MJPEG) sink", - "Sink/Video", - "Writes MJPEG-encoded frames to a zoran MJPEG/video4linux device", - "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); - /* v4lmjpegsink signals and args */ enum { @@ -117,7 +110,10 @@ gst_v4lmjpegsink_base_init (gpointer g_class) ); GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (gstelement_class, &gst_v4lmjpegsink_details); + gst_element_class_set_details_simple (gstelement_class, + "Video (video4linux/MJPEG) sink", "Sink/Video", + "Writes MJPEG-encoded frames to a zoran MJPEG/video4linux device", + "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&sink_template)); diff --git a/sys/v4l/gstv4lmjpegsrc.c b/sys/v4l/gstv4lmjpegsrc.c index fbe10a4c0..61860a18f 100644 --- a/sys/v4l/gstv4lmjpegsrc.c +++ b/sys/v4l/gstv4lmjpegsrc.c @@ -30,13 +30,6 @@ GST_DEBUG_CATEGORY (v4lmjpegsrc_debug); #define GST_CAT_DEFAULT v4lmjpegsrc_debug -/* elementfactory information */ -static const GstElementDetails gst_v4lmjpegsrc_details = -GST_ELEMENT_DETAILS ("Video (video4linux/MJPEG) Source", - "Source/Video", - "Reads MJPEG-encoded frames from a zoran MJPEG/video4linux device", - "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); - /* V4lMjpegSrc signals and args */ enum { @@ -146,7 +139,10 @@ gst_v4lmjpegsrc_base_init (gpointer g_class) ); GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (gstelement_class, &gst_v4lmjpegsrc_details); + gst_element_class_set_details_sinmple (gstelement_class, + "Video (video4linux/MJPEG) Source", "Source/Video", + "Reads MJPEG-encoded frames from a zoran MJPEG/video4linux device", + "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&src_template)); diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c index 085836450..c0b5f780a 100644 --- a/sys/v4l/gstv4lsrc.c +++ b/sys/v4l/gstv4lsrc.c @@ -30,13 +30,6 @@ #include <sys/ioctl.h> -static const GstElementDetails gst_v4lsrc_details = -GST_ELEMENT_DETAILS ("Video (video4linux/raw) Source", - "Source/Video", - "Reads raw frames from a video4linux device", - "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); - - GST_DEBUG_CATEGORY_STATIC (v4lsrc_debug); #define GST_CAT_DEFAULT v4lsrc_debug @@ -79,7 +72,10 @@ gst_v4lsrc_base_init (gpointer g_class) { GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (gstelement_class, &gst_v4lsrc_details); + gst_element_class_set_details_simple (gstelement_class, + "Video (video4linux/raw) Source", "Source/Video", + "Reads raw frames from a video4linux device", + "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>"); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&v4l_src_template)); diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index aeac91265..629ba6373 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -135,13 +135,6 @@ static void gst_ximagesink_xwindow_update_geometry (GstXImageSink * ximagesink, GstXWindow * xwindow); static void gst_ximagesink_expose (GstXOverlay * overlay); -/* ElementFactory information */ -static const GstElementDetails gst_ximagesink_details = -GST_ELEMENT_DETAILS ("Video sink", - "Sink/Video", - "A standard X based videosink", - "Julien Moutte <julien@moutte.net>"); - static GstStaticPadTemplate gst_ximagesink_sink_template_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -2321,7 +2314,9 @@ gst_ximagesink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_ximagesink_details); + gst_element_class_set_details_simple (element_class, + "Video sink", "Sink/Video", + "A standard X based videosink", "Julien Moutte <julien@moutte.net>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_ximagesink_sink_template_factory)); diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 2892c2cd5..5591ec035 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -153,13 +153,6 @@ static gint gst_xvimagesink_get_format_from_caps (GstXvImageSink * xvimagesink, GstCaps * caps); static void gst_xvimagesink_expose (GstXOverlay * overlay); -/* ElementFactory information */ -static const GstElementDetails gst_xvimagesink_details = -GST_ELEMENT_DETAILS ("Video sink", - "Sink/Video", - "A Xv based videosink", - "Julien Moutte <julien@moutte.net>"); - /* Default template - initiated with class struct to allow gst-register to work without X running */ static GstStaticPadTemplate gst_xvimagesink_sink_template_factory = @@ -3432,7 +3425,9 @@ gst_xvimagesink_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_xvimagesink_details); + gst_element_class_set_details_simple (element_class, + "Video sink", "Sink/Video", + "A Xv based videosink", "Julien Moutte <julien@moutte.net>"); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_xvimagesink_sink_template_factory)); diff --git a/tests/check/elements/audioconvert.c b/tests/check/elements/audioconvert.c index 58c69dd8c..2092d9d1f 100644 --- a/tests/check/elements/audioconvert.c +++ b/tests/check/elements/audioconvert.c @@ -1082,6 +1082,7 @@ static GstAudioChannelPosition n8chan_pos_remap_in[8] = { GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT }; + static GstAudioChannelPosition n8chan_pos_remap_out[8] = { GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, diff --git a/tests/check/elements/playbin.c b/tests/check/elements/playbin.c index f285df40e..befd605f5 100644 --- a/tests/check/elements/playbin.c +++ b/tests/check/elements/playbin.c @@ -453,8 +453,6 @@ GST_BOILERPLATE_FULL (GstRedVideoSrc, gst_red_video_src, GstPushSrc, static void gst_red_video_src_base_init (gpointer klass) { - static const GstElementDetails details = - GST_ELEMENT_DETAILS ("Red Video Src", "Source/Video", "yep", "me"); static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-raw-yuv, format=(fourcc)I420") @@ -463,7 +461,8 @@ gst_red_video_src_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_templ)); - gst_element_class_set_details (element_class, &details); + gst_element_class_set_details_simple (element_class, + "Red Video Src", "Source/Video", "yep", "me"); } static GstFlowReturn @@ -566,8 +565,6 @@ GST_BOILERPLATE_FULL (GstCodecSrc, gst_codec_src, GstPushSrc, static void gst_codec_src_base_init (gpointer klass) { - static const GstElementDetails details = - GST_ELEMENT_DETAILS ("Codec Src", "Source/Video", "yep", "me"); static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-codec") @@ -576,7 +573,8 @@ gst_codec_src_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_templ)); - gst_element_class_set_details (element_class, &details); + gst_element_class_set_details_simple (element_class, + "Codec Src", "Source/Video", "yep", "me"); } static GstFlowReturn diff --git a/tests/check/elements/playbin2.c b/tests/check/elements/playbin2.c index a90dc84b2..75679eebf 100644 --- a/tests/check/elements/playbin2.c +++ b/tests/check/elements/playbin2.c @@ -522,8 +522,6 @@ GST_BOILERPLATE_FULL (GstRedVideoSrc, gst_red_video_src, GstPushSrc, static void gst_red_video_src_base_init (gpointer klass) { - static const GstElementDetails details = - GST_ELEMENT_DETAILS ("Red Video Src", "Source/Video", "yep", "me"); static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-raw-yuv, format=(fourcc)I420") @@ -532,7 +530,8 @@ gst_red_video_src_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_templ)); - gst_element_class_set_details (element_class, &details); + gst_element_class_set_details_simple (element_class, + "Red Video Src", "Source/Video", "yep", "me"); } static GstFlowReturn @@ -635,8 +634,6 @@ GST_BOILERPLATE_FULL (GstCodecSrc, gst_codec_src, GstPushSrc, static void gst_codec_src_base_init (gpointer klass) { - static const GstElementDetails details = - GST_ELEMENT_DETAILS ("Codec Src", "Source/Video", "yep", "me"); static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-codec") @@ -645,7 +642,8 @@ gst_codec_src_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_templ)); - gst_element_class_set_details (element_class, &details); + gst_element_class_set_details_simple (element_class, + "Codec Src", "Source/Video", "yep", "me"); } static GstFlowReturn diff --git a/tests/check/elements/textoverlay.c b/tests/check/elements/textoverlay.c index 63dd31d58..3c970b257 100644 --- a/tests/check/elements/textoverlay.c +++ b/tests/check/elements/textoverlay.c @@ -569,8 +569,8 @@ GST_START_TEST (test_video_waits_for_text) fail_unless_equals_int (g_list_length (buffers), 3); /* ... and there should not be any text rendered on it */ - fail_unless (buffer_is_all_black (GST_BUFFER_CAST (buffers->next->next-> - data))); + fail_unless (buffer_is_all_black (GST_BUFFER_CAST (buffers->next-> + next->data))); /* a fourth video buffer */ inbuffer = gst_buffer_make_metadata_writable (inbuffer); diff --git a/tests/check/libs/cddabasesrc.c b/tests/check/libs/cddabasesrc.c index abe7c2c8e..8747c9a5d 100644 --- a/tests/check/libs/cddabasesrc.c +++ b/tests/check/libs/cddabasesrc.c @@ -192,18 +192,14 @@ static gboolean gst_cd_foo_src_open (GstCddaBaseSrc * src, const gchar * device); static void gst_cd_foo_src_close (GstCddaBaseSrc * src); -static const GstElementDetails cdfoo_details = -GST_ELEMENT_DETAILS ("CD Audio (cdda) Source, FooBar", - "Source/File", - "Read audio from CD", - "Foo Bar <foo@bar.com>"); - static void gst_cd_foo_src_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &cdfoo_details); + gst_element_class_set_details_simple (element_class, + "CD Audio (cdda) Source, FooBar", "Source/File", + "Read audio from CD", "Foo Bar <foo@bar.com>"); } static void diff --git a/tests/check/libs/pbutils.c b/tests/check/libs/pbutils.c index 61b8b6097..c1219ba59 100644 --- a/tests/check/libs/pbutils.c +++ b/tests/check/libs/pbutils.c @@ -72,7 +72,8 @@ GST_START_TEST (test_pb_utils_post_missing_messages) bus = gst_element_get_bus (pipeline); /* first, test common assertion failure cases */ - ASSERT_CRITICAL (msg = gst_missing_uri_source_message_new (NULL, "http");); + ASSERT_CRITICAL (msg = gst_missing_uri_source_message_new (NULL, "http"); + ); ASSERT_CRITICAL (gst_missing_uri_source_message_new (pipeline, NULL)); ASSERT_CRITICAL (gst_missing_uri_sink_message_new (NULL, "http")); @@ -553,14 +554,11 @@ GST_START_TEST (test_pb_utils_install_plugins) ctx = gst_install_plugins_context_new (); - ASSERT_CRITICAL (ret = gst_install_plugins_sync (NULL, ctx); - ); + ASSERT_CRITICAL (ret = gst_install_plugins_sync (NULL, ctx);); ASSERT_CRITICAL (ret = - gst_install_plugins_async (NULL, ctx, result_cb, (gpointer) & marker); - ); + gst_install_plugins_async (NULL, ctx, result_cb, (gpointer) & marker);); ASSERT_CRITICAL (ret = - gst_install_plugins_async (details, ctx, NULL, (gpointer) & marker); - ); + gst_install_plugins_async (details, ctx, NULL, (gpointer) & marker);); /* make sure the functions return the right error code if the helper does * not exist */ diff --git a/tests/old/testsuite/alsa/formats.c b/tests/old/testsuite/alsa/formats.c index 0142e9d91..e6ca8f11c 100644 --- a/tests/old/testsuite/alsa/formats.c +++ b/tests/old/testsuite/alsa/formats.c @@ -42,6 +42,7 @@ pre_get_func (SineSrc * src) { counter++; }; + static void create_pipeline (void) { diff --git a/tests/old/testsuite/alsa/sinesrc.c b/tests/old/testsuite/alsa/sinesrc.c index f684aaeca..a42db71af 100644 --- a/tests/old/testsuite/alsa/sinesrc.c +++ b/tests/old/testsuite/alsa/sinesrc.c @@ -69,6 +69,7 @@ sinesrc_get_type (void) } return sinesrc_type; } + static void sinesrc_class_init (SineSrcClass * klass) { @@ -147,6 +148,7 @@ UIDENTITY (guint8 x) { return x; }; + static gint8 IDENTITY (gint8 x) { |