diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | tests/check/elements/icydemux.c | 35 |
3 files changed, 10 insertions, 30 deletions
@@ -1,3 +1,8 @@ +2008-01-11 Tim-Philipp Müller <tim at centricular dot net> + + * tests/check/elements/icydemux.c: (GST_START_TEST), (icydemux_suite): + Don't use deprecated GST_PLUGIN_DEFINE_STATIC. + 2008-01-10 Sebastian Dröge <slomo@circular-chaos.org> * autogen.sh: diff --git a/common b/common -Subproject 49c2fc5c9bff0e9858e89978bd98164a386de51 +Subproject bd02d788384b40ff511cac0e32aa77f51a68912 diff --git a/tests/check/elements/icydemux.c b/tests/check/elements/icydemux.c index 8a6e9101..480210fa 100644 --- a/tests/check/elements/icydemux.c +++ b/tests/check/elements/icydemux.c @@ -72,20 +72,6 @@ typefind_succeed (GstTypeFind * tf, gpointer private) } } -static gboolean -plugin_init (GstPlugin * plugin) -{ - gst_type_find_register (plugin, "success", GST_RANK_PRIMARY, typefind_succeed, - NULL, gst_static_caps_get (&typefind_caps), NULL, NULL); - - return TRUE; -} - -GST_PLUGIN_DEFINE_STATIC (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gst-test", - "test plugin for icydemux", - plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); - static void icydemux_found_pad (GstElement * src, GstPad * pad, gpointer data) { @@ -163,6 +149,10 @@ GST_START_TEST (test_demux) const gchar *tag; GstCaps *caps; + fail_unless (gst_type_find_register (NULL, "success", GST_RANK_PRIMARY, + typefind_succeed, NULL, gst_static_caps_get (&typefind_caps), NULL, + NULL)); + fake_typefind_caps = TRUE; caps = gst_caps_from_string (ICYCAPS); @@ -252,19 +242,4 @@ icydemux_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = icydemux_suite (); - SRunner *sr = srunner_create (s); - - gst_check_init (&argc, &argv); - - srunner_run_all (sr, CK_NORMAL); - nf = srunner_ntests_failed (sr); - srunner_free (sr); - - return nf; -} +GST_CHECK_MAIN (icydemux) |