summaryrefslogtreecommitdiff
path: root/sys/cdrom
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2003-11-02 14:47:52 +0000
committerBenjamin Otte <otte@gnome.org>2003-11-02 14:47:52 +0000
commiteabfbf13fc047855e176732caad160f4f12d1fe0 (patch)
treea3fa2787c0db39a23f956d35ec8dc93e7f261407 /sys/cdrom
parent59e0556a9044dcdd447386790997e360e39e46bf (diff)
downloadgstreamer-plugins-bad-eabfbf13fc047855e176732caad160f4f12d1fe0.tar.gz
fix most of sys dir. v4l2 and dxr3 pending, as I don't have them
Original commit message from CVS: fix most of sys dir. v4l2 and dxr3 pending, as I don't have them
Diffstat (limited to 'sys/cdrom')
-rw-r--r--sys/cdrom/gstcdplayer.c46
1 files changed, 24 insertions, 22 deletions
diff --git a/sys/cdrom/gstcdplayer.c b/sys/cdrom/gstcdplayer.c
index 2efeb992f..dccf4cba4 100644
--- a/sys/cdrom/gstcdplayer.c
+++ b/sys/cdrom/gstcdplayer.c
@@ -41,6 +41,7 @@ enum
LAST_SIGNAL,
};
+static void cdplayer_base_init (gpointer g_class);
static void cdplayer_class_init (CDPlayerClass *klass);
static void cdplayer_init (CDPlayer *cdp);
static void cdplayer_dispose (GObject *object);
@@ -57,16 +58,13 @@ static GstElementStateReturn
static GstElementClass *parent_class;
static guint cdplayer_signals[LAST_SIGNAL] = { 0 };
-static GstElementDetails cdplayer_details = {
+static GstElementDetails cdplayer_details = GST_ELEMENT_DETAILS (
"CD Player",
"Generic/Bin",
- "LGPL", /* ? */
"Play CD audio through the CD Drive",
- VERSION,
- "Charles Schmidt <cbschmid@uiuc.edu>\n"
- "Wim Taymans <wim.taymans@chello.be>",
- "(C) 2002",
-};
+ "Charles Schmidt <cbschmid@uiuc.edu>, "
+ "Wim Taymans <wim.taymans@chello.be>"
+);
GType
@@ -77,7 +75,7 @@ cdplayer_get_type (void)
if (!cdplayer_type) {
static const GTypeInfo cdplayer_info = {
sizeof (CDPlayerClass),
- NULL,
+ cdplayer_base_init,
NULL,
(GClassInitFunc) cdplayer_class_init,
NULL,
@@ -95,6 +93,13 @@ cdplayer_get_type (void)
}
static void
+cdplayer_base_init (gpointer g_class)
+{
+ GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+ gst_element_class_set_details (element_class, &cdplayer_details);
+}
+static void
cdplayer_class_init (CDPlayerClass * klass)
{
GObjectClass *gobject_klass;
@@ -349,23 +354,20 @@ cdplayer_change_state (GstElement * element)
static gboolean
-plugin_init (GModule * module, GstPlugin * plugin)
+plugin_init (GstPlugin * plugin)
{
- GstElementFactory *factory;
-
- factory = gst_element_factory_new ("cdplayer", GST_TYPE_CDPLAYER, &cdplayer_details);
- g_return_val_if_fail (factory != NULL, FALSE);
- gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
-
- gst_plugin_set_longname (plugin, "CD Player");
-
- return TRUE;
-
+ return gst_element_register (plugin, "cdplayer", GST_RANK_NONE, GST_TYPE_CDPLAYER);
}
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"cdplayer",
- plugin_init
-};
+ "CD Player",
+ plugin_init,
+ VERSION,
+ GST_LICENSE, /* ? */
+ GST_COPYRIGHT,
+ GST_PACKAGE,
+ GST_ORIGIN
+);