Commit 5e21fa5e authored by Benjamin Otte's avatar Benjamin Otte
Browse files

gst_element_class_set_details => gst_element_class_set_details_simple

Also change my email from the old university one to the current one.
parent 6cc13843
......@@ -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);
}
}
......
......@@ -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
......
......@@ -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));
......
......@@ -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));
......
......@@ -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
......
......@@ -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
......
......@@ -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");
......
......@@ -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 */
......
......@@ -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));
......
......@@ -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));
......
......@@ -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
......
......@@ -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));
......
......@@ -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));
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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, " \
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment