From 71e2ed4a1cf04feb8d637441732b986c784b6a33 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 2 Nov 2003 21:55:15 +0000 Subject: [PATCH] fix for new plugin system Original commit message from CVS: fix for new plugin system --- gst/tcp/gsttcp.c | 33 ++++++++++++++------------------- gst/tcp/gsttcpplugin.c | 33 ++++++++++++++------------------- gst/tcp/gsttcpsink.c | 20 +++++++++++++------- gst/tcp/gsttcpsrc.c | 20 +++++++++++++------- 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c index 1b7f57a..60e7d79 100644 --- a/gst/tcp/gsttcp.c +++ b/gst/tcp/gsttcp.c @@ -21,32 +21,27 @@ #include "gsttcpsrc.h" #include "gsttcpsink.h" -/* elementfactory information */ -extern GstElementDetails gst_tcpsrc_details; -extern GstElementDetails gst_tcpsink_details; - static gboolean -plugin_init (GModule *module, GstPlugin *plugin) +plugin_init (GstPlugin *plugin) { - GstElementFactory *src, *sink; - - /* create an elementfactory for the tcpsrc element */ - sink = gst_element_factory_new ("tcpsink",GST_TYPE_TCPSINK, - &gst_tcpsink_details); - g_return_val_if_fail (sink != NULL, FALSE); - gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (sink)); + if (!gst_element_register (plugin, "tcpsink", GST_RANK_NONE, GST_TYPE_TCPSINK)) + return FALSE; - src = gst_element_factory_new ("tcpsrc",GST_TYPE_TCPSRC, - &gst_tcpsrc_details); - g_return_val_if_fail (src != NULL, FALSE); - gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (src)); + if (!gst_element_register (plugin, "tcpsrc", GST_RANK_NONE, GST_TYPE_TCPSRC)) + return FALSE; return TRUE; } -GstPluginDesc plugin_desc = { +GST_PLUGIN_DEFINE ( GST_VERSION_MAJOR, GST_VERSION_MINOR, "tcp", - plugin_init -}; + "transfer data over the network via TCP", + plugin_init, + VERSION, + GST_LICENSE, + GST_COPYRIGHT, + GST_PACKAGE, + GST_ORIGIN +) diff --git a/gst/tcp/gsttcpplugin.c b/gst/tcp/gsttcpplugin.c index 1b7f57a..60e7d79 100644 --- a/gst/tcp/gsttcpplugin.c +++ b/gst/tcp/gsttcpplugin.c @@ -21,32 +21,27 @@ #include "gsttcpsrc.h" #include "gsttcpsink.h" -/* elementfactory information */ -extern GstElementDetails gst_tcpsrc_details; -extern GstElementDetails gst_tcpsink_details; - static gboolean -plugin_init (GModule *module, GstPlugin *plugin) +plugin_init (GstPlugin *plugin) { - GstElementFactory *src, *sink; - - /* create an elementfactory for the tcpsrc element */ - sink = gst_element_factory_new ("tcpsink",GST_TYPE_TCPSINK, - &gst_tcpsink_details); - g_return_val_if_fail (sink != NULL, FALSE); - gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (sink)); + if (!gst_element_register (plugin, "tcpsink", GST_RANK_NONE, GST_TYPE_TCPSINK)) + return FALSE; - src = gst_element_factory_new ("tcpsrc",GST_TYPE_TCPSRC, - &gst_tcpsrc_details); - g_return_val_if_fail (src != NULL, FALSE); - gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (src)); + if (!gst_element_register (plugin, "tcpsrc", GST_RANK_NONE, GST_TYPE_TCPSRC)) + return FALSE; return TRUE; } -GstPluginDesc plugin_desc = { +GST_PLUGIN_DEFINE ( GST_VERSION_MAJOR, GST_VERSION_MINOR, "tcp", - plugin_init -}; + "transfer data over the network via TCP", + plugin_init, + VERSION, + GST_LICENSE, + GST_COPYRIGHT, + GST_PACKAGE, + GST_ORIGIN +) diff --git a/gst/tcp/gsttcpsink.c b/gst/tcp/gsttcpsink.c index 01b4db0..869653f 100644 --- a/gst/tcp/gsttcpsink.c +++ b/gst/tcp/gsttcpsink.c @@ -26,15 +26,12 @@ #define TCP_DEFAULT_PORT 4953 /* elementfactory information */ -GstElementDetails gst_tcpsink_details = { +static GstElementDetails gst_tcpsink_details = GST_ELEMENT_DETAILS ( "TCP packet sender", - "Sink/Network", "LGPL", "Send data over the network via TCP", - VERSION, - "Zeeshan Ali ", - "(C) 2003", -}; + "Zeeshan Ali " +); /* TCPSink signals and args */ enum { @@ -67,6 +64,7 @@ gst_tcpsink_control_get_type(void) { return tcpsink_control_type; } +static void gst_tcpsink_base_init (gpointer g_class); static void gst_tcpsink_class_init (GstTCPSink *klass); static void gst_tcpsink_init (GstTCPSink *tcpsink); @@ -93,7 +91,7 @@ gst_tcpsink_get_type (void) if (!tcpsink_type) { static const GTypeInfo tcpsink_info = { sizeof(GstTCPSinkClass), - NULL, + gst_tcpsink_base_init, NULL, (GClassInitFunc)gst_tcpsink_class_init, NULL, @@ -109,6 +107,14 @@ gst_tcpsink_get_type (void) } static void +gst_tcpsink_base_init (gpointer g_class) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); + + gst_element_class_set_details (element_class, &gst_tcpsink_details); +} + +static void gst_tcpsink_class_init (GstTCPSink *klass) { GObjectClass *gobject_class; diff --git a/gst/tcp/gsttcpsrc.c b/gst/tcp/gsttcpsrc.c index 205edd8..fb17fe3 100644 --- a/gst/tcp/gsttcpsrc.c +++ b/gst/tcp/gsttcpsrc.c @@ -28,15 +28,12 @@ #define TCP_DEFAULT_PORT 4953 /* elementfactory information */ -GstElementDetails gst_tcpsrc_details = { +GstElementDetails gst_tcpsrc_details = GST_ELEMENT_DETAILS ( "TCP packet receiver", "Source/Network", - "LGPL", "Receive data over the network via TCP", - VERSION, - "Zeeshan Ali ", - "(C) 2003", -}; + "Zeeshan Ali " +); /* TCPSrc signals and args */ enum { @@ -67,6 +64,7 @@ gst_tcpsrc_control_get_type(void) { return tcpsrc_control_type; } +static void gst_tcpsrc_base_init (gpointer g_class); static void gst_tcpsrc_class_init (GstTCPSrc *klass); static void gst_tcpsrc_init (GstTCPSrc *tcpsrc); @@ -92,7 +90,7 @@ gst_tcpsrc_get_type (void) if (!tcpsrc_type) { static const GTypeInfo tcpsrc_info = { sizeof(GstTCPSrcClass), - NULL, + gst_tcpsrc_base_init, NULL, (GClassInitFunc)gst_tcpsrc_class_init, NULL, @@ -108,6 +106,14 @@ gst_tcpsrc_get_type (void) } static void +gst_tcpsrc_base_init (gpointer g_class) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); + + gst_element_class_set_details (element_class, &gst_tcpsrc_details); +} + +static void gst_tcpsrc_class_init (GstTCPSrc *klass) { GObjectClass *gobject_class; -- 2.7.4