diff options
Diffstat (limited to 'gst/debug')
| -rw-r--r-- | gst/debug/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/debug/breakmydata.c | 23 | ||||
| -rw-r--r-- | gst/debug/efence.c | 7 | ||||
| -rw-r--r-- | gst/debug/gstdebug.c | 37 | ||||
| -rw-r--r-- | gst/debug/gstnavseek.c | 8 | ||||
| -rw-r--r-- | gst/debug/gstpushfilesrc.c | 7 | ||||
| -rw-r--r-- | gst/debug/gstpushfilesrc.h | 2 | ||||
| -rw-r--r-- | gst/debug/negotiation.c | 10 | ||||
| -rw-r--r-- | gst/debug/progressreport.c | 8 | ||||
| -rw-r--r-- | gst/debug/progressreport.h | 2 | ||||
| -rw-r--r-- | gst/debug/rndbuffersize.c | 21 | ||||
| -rw-r--r-- | gst/debug/testplugin.c | 20 |
12 files changed, 49 insertions, 100 deletions
diff --git a/gst/debug/Makefile.am b/gst/debug/Makefile.am index e9112661..bf7bec03 100644 --- a/gst/debug/Makefile.am +++ b/gst/debug/Makefile.am @@ -11,6 +11,7 @@ noinst_HEADERS = \ gstnavigationtest.h \ gstnavseek.h \ gstpushfilesrc.h \ + gsttaginject.h \ progressreport.h \ tests.h @@ -31,10 +32,9 @@ libgstdebug_la_SOURCES = \ breakmydata.c \ gstnavseek.c \ gstpushfilesrc.c \ - gstpushfilesrc.h \ + gsttaginject.c \ rndbuffersize.c \ progressreport.c \ - progressreport.h \ tests.c \ testplugin.c diff --git a/gst/debug/breakmydata.c b/gst/debug/breakmydata.c index b7cf73c1..63e30b6c 100644 --- a/gst/debug/breakmydata.c +++ b/gst/debug/breakmydata.c @@ -100,8 +100,14 @@ GstStaticPadTemplate bmd_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); -GST_BOILERPLATE (GstBreakMyData, gst_break_my_data, GstBaseTransform, - GST_TYPE_BASE_TRANSFORM); + +#define DEBUG_INIT(bla) \ + GST_DEBUG_CATEGORY_INIT (gst_break_my_data_debug, "breakmydata", 0, \ + "debugging category for breakmydata element"); + +GST_BOILERPLATE_FULL (GstBreakMyData, gst_break_my_data, GstBaseTransform, + GST_TYPE_BASE_TRANSFORM, DEBUG_INIT); + static void gst_break_my_data_base_init (gpointer g_class) @@ -289,16 +295,3 @@ gst_break_my_data_stop (GstBaseTransform * trans) return TRUE; } - -gboolean -gst_break_my_data_plugin_init (GstPlugin * plugin) -{ - if (!gst_element_register (plugin, "breakmydata", GST_RANK_NONE, - GST_TYPE_BREAK_MY_DATA)) - return FALSE; - - GST_DEBUG_CATEGORY_INIT (gst_break_my_data_debug, "breakmydata", 0, - "debugging category for breakmydata element"); - - return TRUE; -} diff --git a/gst/debug/efence.c b/gst/debug/efence.c index 90b98cb0..8174e3ca 100644 --- a/gst/debug/efence.c +++ b/gst/debug/efence.c @@ -512,11 +512,6 @@ gst_fenced_buffer_class_init (gpointer g_class, gpointer class_data) mini_object_class->copy = (GstMiniObjectCopyFunction) gst_fenced_buffer_copy; } -static void -gst_fenced_buffer_init (GTypeInstance * instance, gpointer g_class) -{ -} - GType gst_fenced_buffer_get_type (void) { @@ -532,7 +527,7 @@ gst_fenced_buffer_get_type (void) NULL, sizeof (GstFencedBuffer), 0, - (GInstanceInitFunc) gst_fenced_buffer_init, + NULL, }; fenced_buf_type = g_type_register_static (GST_TYPE_BUFFER, diff --git a/gst/debug/gstdebug.c b/gst/debug/gstdebug.c index 40bf3521..53f24d50 100644 --- a/gst/debug/gstdebug.c +++ b/gst/debug/gstdebug.c @@ -23,27 +23,34 @@ #include <gst/gst.h> -gboolean gst_break_my_data_plugin_init (GstPlugin * plugin); -gboolean gst_rnd_buffer_size_plugin_init (GstPlugin * plugin); -gboolean gst_navseek_plugin_init (GstPlugin * plugin); -gboolean gst_progress_report_plugin_init (GstPlugin * plugin); -gboolean gst_test_plugin_init (GstPlugin * plugin); - +GType gst_break_my_data_get_type (void); +GType gst_rnd_buffer_size_get_type (void); +GType gst_navseek_get_type (void); +GType gst_progress_report_get_type (void); +GType gst_tag_inject_get_type (void); +GType gst_test_get_type (void); /* -gboolean gst_push_file_src_plugin_init (GstPlugin * plugin); -gboolean gst_negotiation_plugin_init (GstPlugin * plugin); +GType gst_push_file_src_get_type (void); +GType gst_gst_negotiation_get_type (void); */ static gboolean plugin_init (GstPlugin * plugin) { - if (!gst_break_my_data_plugin_init (plugin) || - !gst_rnd_buffer_size_plugin_init (plugin) || - !gst_navseek_plugin_init (plugin) || -/* !gst_push_file_src_plugin_init (plugin) || */ -/* !gst_negotiation_plugin_init (plugin) || */ - !gst_progress_report_plugin_init (plugin) || - !gst_test_plugin_init (plugin)) + if (!gst_element_register (plugin, "breakmydata", GST_RANK_NONE, + gst_break_my_data_get_type ()) + || !gst_element_register (plugin, "rndbuffersize", GST_RANK_NONE, + gst_rnd_buffer_size_get_type ()) + || !gst_element_register (plugin, "navseek", GST_RANK_NONE, + gst_navseek_get_type ()) || +/* !gst_element_register (plugin, "pushfilesrc", GST_RANK_NONE, gst_push_file_src_get_type ()) || */ +/* !gst_element_register (plugin, "negotiation", GST_RANK_NONE, gst_gst_negotiation_get_type ()) || */ + !gst_element_register (plugin, "progressreport", GST_RANK_NONE, + gst_progress_report_get_type ()) + || !gst_element_register (plugin, "taginject", GST_RANK_NONE, + gst_tag_inject_get_type ()) + || !gst_element_register (plugin, "testsink", GST_RANK_NONE, + gst_test_get_type ())) return FALSE; return TRUE; diff --git a/gst/debug/gstnavseek.c b/gst/debug/gstnavseek.c index 1f006a0d..c47bf42f 100644 --- a/gst/debug/gstnavseek.c +++ b/gst/debug/gstnavseek.c @@ -129,7 +129,6 @@ gst_navseek_seek (GstNavSeek * navseek, gint64 offset) GstPad *peer_pad; gint64 peer_value; - /* Query for the current time then attempt to set to time + offset */ peer_pad = gst_pad_get_peer (GST_BASE_TRANSFORM (navseek)->sinkpad); ret = gst_pad_query_position (peer_pad, &peer_format, &peer_value); @@ -339,10 +338,3 @@ gst_navseek_stop (GstBaseTransform * trans) /* anything we should be doing here? */ return TRUE; } - -gboolean -gst_navseek_plugin_init (GstPlugin * plugin) -{ - return gst_element_register (plugin, "navseek", GST_RANK_NONE, - GST_TYPE_NAVSEEK); -} diff --git a/gst/debug/gstpushfilesrc.c b/gst/debug/gstpushfilesrc.c index 3fb91630..7ef5259c 100644 --- a/gst/debug/gstpushfilesrc.c +++ b/gst/debug/gstpushfilesrc.c @@ -196,10 +196,3 @@ gst_push_file_src_uri_handler_init (gpointer g_iface, gpointer iface_data) iface->get_uri = gst_push_file_src_uri_get_uri; iface->set_uri = gst_push_file_src_uri_set_uri; } - -gboolean -gst_push_file_src_plugin_init (GstPlugin * plugin) -{ - return gst_element_register (plugin, "pushfilesrc", GST_RANK_NONE, - GST_TYPE_PUSH_FILE_SRC); -} diff --git a/gst/debug/gstpushfilesrc.h b/gst/debug/gstpushfilesrc.h index b3b6b887..350696f5 100644 --- a/gst/debug/gstpushfilesrc.h +++ b/gst/debug/gstpushfilesrc.h @@ -52,6 +52,8 @@ struct _GstPushFileSrcClass GstBinClass parent_class; }; +GType gst_push_file_src_get_type(void); + G_END_DECLS #endif /* __GST_PUSH_FILE_SRC_H__*/ diff --git a/gst/debug/negotiation.c b/gst/debug/negotiation.c index b2de7d57..12082273 100644 --- a/gst/debug/negotiation.c +++ b/gst/debug/negotiation.c @@ -285,13 +285,3 @@ gst_negotiation_get_property (GObject * object, guint prop_id, break; } } - -gboolean -gst_negotiation_plugin_init (GstPlugin * plugin) -{ - if (!gst_element_register (plugin, "negotiation", GST_RANK_NONE, - GST_TYPE_NEGOTIATION)) - return FALSE; - - return TRUE; -} diff --git a/gst/debug/progressreport.c b/gst/debug/progressreport.c index 3540390c..e79f6fd9 100644 --- a/gst/debug/progressreport.c +++ b/gst/debug/progressreport.c @@ -487,11 +487,3 @@ gst_progress_report_get_property (GObject * object, guint prop_id, break; } } - - -gboolean -gst_progress_report_plugin_init (GstPlugin * plugin) -{ - return gst_element_register (plugin, "progressreport", GST_RANK_NONE, - GST_TYPE_PROGRESS_REPORT); -} diff --git a/gst/debug/progressreport.h b/gst/debug/progressreport.h index ec4f24de..880efc8a 100644 --- a/gst/debug/progressreport.h +++ b/gst/debug/progressreport.h @@ -62,6 +62,8 @@ struct _GstProgressReportClass GstBaseTransformClass parent_class; }; +GType gst_progress_report_get_type(void); + G_END_DECLS #endif /* __GST_PROGRESS_REPORT_H__*/ diff --git a/gst/debug/rndbuffersize.c b/gst/debug/rndbuffersize.c index 87bdbd09..7a8abd6b 100644 --- a/gst/debug/rndbuffersize.c +++ b/gst/debug/rndbuffersize.c @@ -92,9 +92,12 @@ static void gst_rnd_buffer_size_loop (GstRndBufferSize * self); static GstStateChangeReturn gst_rnd_buffer_size_change_state (GstElement * element, GstStateChange transition); +#define DEBUG_INIT(bla) \ + GST_DEBUG_CATEGORY_INIT (gst_rnd_buffer_size_debug, "rndbuffersize", 0, \ + "rndbuffersize element"); -GST_BOILERPLATE (GstRndBufferSize, gst_rnd_buffer_size, GstElement, - GST_TYPE_ELEMENT); +GST_BOILERPLATE_FULL (GstRndBufferSize, gst_rnd_buffer_size, GstElement, + GST_TYPE_ELEMENT, DEBUG_INIT); static void @@ -366,17 +369,3 @@ gst_rnd_buffer_size_change_state (GstElement * element, return ret; } - - -gboolean -gst_rnd_buffer_size_plugin_init (GstPlugin * plugin) -{ - if (!gst_element_register (plugin, "rndbuffersize", GST_RANK_NONE, - GST_TYPE_RND_BUFFER_SIZE)) - return FALSE; - - GST_DEBUG_CATEGORY_INIT (gst_rnd_buffer_size_debug, "rndbuffersize", 0, - "rndbuffersize element"); - - return TRUE; -} diff --git a/gst/debug/testplugin.c b/gst/debug/testplugin.c index f118a515..dbb1e618 100644 --- a/gst/debug/testplugin.c +++ b/gst/debug/testplugin.c @@ -86,7 +86,13 @@ static const GstElementDetails details = GST_ELEMENT_DETAILS ("Test plugin", "perform a number of tests", "Benjamin Otte <otte@gnome>"); -GST_BOILERPLATE (GstTest, gst_test, GstBaseSink, GST_TYPE_BASE_SINK); +#define DEBUG_INIT(bla) \ + GST_DEBUG_CATEGORY_INIT (gst_test_debug, "testsink", 0, \ + "debugging category for testsink element"); + +GST_BOILERPLATE_FULL (GstTest, gst_test, GstBaseSink, GST_TYPE_BASE_SINK, + DEBUG_INIT); + static void gst_test_base_init (gpointer g_class) @@ -310,15 +316,3 @@ gst_test_get_property (GObject * object, guint prop_id, GValue * value, GST_OBJECT_UNLOCK (test); } - -gboolean -gst_test_plugin_init (GstPlugin * plugin) -{ - if (!gst_element_register (plugin, "testsink", GST_RANK_NONE, GST_TYPE_TEST)) - return FALSE; - - GST_DEBUG_CATEGORY_INIT (gst_test_debug, "testsink", 0, - "debugging category for testsink element"); - - return TRUE; -} |