diff --git a/gst/multipart/multipart.c b/gst/multipart/multipart.c index 30f10626bd..ac1638478d 100644 --- a/gst/multipart/multipart.c +++ b/gst/multipart/multipart.c @@ -29,10 +29,12 @@ static gboolean plugin_init (GstPlugin * plugin) { - gst_multipart_demux_plugin_init (plugin); - gst_multipart_mux_plugin_init (plugin); + gboolean ret = FALSE; - return TRUE; + ret |= GST_ELEMENT_REGISTER (multipartdemux, plugin); + ret |= GST_ELEMENT_REGISTER (multipartmux, plugin); + + return ret; } GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c index 8efe2ea775..28bee57092 100644 --- a/gst/multipart/multipartdemux.c +++ b/gst/multipart/multipartdemux.c @@ -122,6 +122,10 @@ static void gst_multipart_demux_dispose (GObject * object); #define gst_multipart_demux_parent_class parent_class G_DEFINE_TYPE (GstMultipartDemux, gst_multipart_demux, GST_TYPE_ELEMENT); +GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (multipartdemux, "multipartdemux", + GST_RANK_PRIMARY, GST_TYPE_MULTIPART_DEMUX, + GST_DEBUG_CATEGORY_INIT (gst_multipart_demux_debug, "multipartdemux", 0, + "multipart demuxer")); static void gst_multipart_demux_class_init (GstMultipartDemuxClass * klass) @@ -796,15 +800,3 @@ gst_multipart_get_property (GObject * object, guint prop_id, break; } } - - - -gboolean -gst_multipart_demux_plugin_init (GstPlugin * plugin) -{ - GST_DEBUG_CATEGORY_INIT (gst_multipart_demux_debug, - "multipartdemux", 0, "multipart demuxer"); - - return gst_element_register (plugin, "multipartdemux", GST_RANK_PRIMARY, - GST_TYPE_MULTIPART_DEMUX); -} diff --git a/gst/multipart/multipartdemux.h b/gst/multipart/multipartdemux.h index cb81a83d12..b450b950bb 100644 --- a/gst/multipart/multipartdemux.h +++ b/gst/multipart/multipartdemux.h @@ -102,7 +102,7 @@ struct _GstMultipartDemuxClass GType gst_multipart_demux_get_type (void); -gboolean gst_multipart_demux_plugin_init (GstPlugin * plugin); +GST_ELEMENT_REGISTER_DECLARE (multipartdemux); G_END_DECLS diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c index e76ccc013a..f8d7689a61 100644 --- a/gst/multipart/multipartmux.c +++ b/gst/multipart/multipartmux.c @@ -97,6 +97,10 @@ static void gst_multipart_mux_get_property (GObject * object, guint prop_id, #define gst_multipart_mux_parent_class parent_class G_DEFINE_TYPE (GstMultipartMux, gst_multipart_mux, GST_TYPE_ELEMENT); +GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (multipartmux, "multipartmux", + GST_RANK_NONE, GST_TYPE_MULTIPART_MUX, + GST_DEBUG_CATEGORY_INIT (gst_multipart_mux_debug, "multipartmux", 0, + "multipart muxer")); static void gst_multipart_mux_class_init (GstMultipartMuxClass * klass) @@ -683,13 +687,3 @@ gst_multipart_mux_change_state (GstElement * element, GstStateChange transition) return ret; } - -gboolean -gst_multipart_mux_plugin_init (GstPlugin * plugin) -{ - GST_DEBUG_CATEGORY_INIT (gst_multipart_mux_debug, "multipartmux", 0, - "multipart muxer"); - - return gst_element_register (plugin, "multipartmux", GST_RANK_NONE, - GST_TYPE_MULTIPART_MUX); -} diff --git a/gst/multipart/multipartmux.h b/gst/multipart/multipartmux.h index 3b44f5a0b4..9ff94e5832 100644 --- a/gst/multipart/multipartmux.h +++ b/gst/multipart/multipartmux.h @@ -90,7 +90,7 @@ struct _GstMultipartMuxClass GType gst_multipart_mux_get_type (void); -gboolean gst_multipart_mux_plugin_init (GstPlugin * plugin); +GST_ELEMENT_REGISTER_DECLARE (multipartmux); G_END_DECLS