Menu
▾
▴
[gst-cvs] tpm gstreamer: gstreamer/ gstreamer/tests/check/libs/ gstreamer/tests/check/pipelines/
|
From: <tp...@ke...> - 2007-12-21 21:17:41
|
CVS Root: /cvs/gstreamer
Module: gstreamer
Changes by: tpm
Date: Fri Dec 21 2007 21:17:47 UTC
Log message:
* tests/check/libs/controller.c:
* tests/check/libs/typefindhelper.c:
* tests/check/pipelines/parse-launch.c:
Don't use GST_PLUGIN_DEFINE_STATIC, it is not portable and is
going to be deprecated (see #498924).
Modified files:
. : ChangeLog
tests/check/libs: controller.c typefindhelper.c
tests/check/pipelines: parse-launch.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3592&r2=1.3593
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/tests/check/libs/controller.c.diff?r1=1.29&r2=1.30
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/tests/check/libs/typefindhelper.c.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/tests/check/pipelines/parse-launch.c.diff?r1=1.14&r2=1.15
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.3592
retrieving revision 1.3593
diff -u -d -r1.3592 -r1.3593
--- ChangeLog 21 Dec 2007 20:58:21 -0000 1.3592
+++ ChangeLog 21 Dec 2007 21:17:31 -0000 1.3593
@@ -1,5 +1,13 @@
2007-12-21 Tim-Philipp Müller <tim at centricular dot net>
+ * tests/check/libs/controller.c:
+ * tests/check/libs/typefindhelper.c:
+ * tests/check/pipelines/parse-launch.c:
+ Don't use GST_PLUGIN_DEFINE_STATIC, it is not portable and is
+ going to be deprecated (see #498924).
+
+2007-12-21 Tim-Philipp Müller <tim at centricular dot net>
* gst/gsttypefind.c: (gst_type_find_register):
Make gst_type_find_register work for static typefind functions,
ie. allow passing plugin == NULL (prerequisite for #498924).
Index: controller.c
RCS file: /cvs/gstreamer/gstreamer/tests/check/libs/controller.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- controller.c 13 Sep 2007 08:36:37 -0000 1.29
+++ controller.c 21 Dec 2007 21:17:32 -0000 1.30
@@ -68,7 +68,7 @@
GstElementClass parent_class;
};
-GType gst_test_mono_source_get_type (void);
+static GType gst_test_mono_source_get_type (void);
static void
gst_test_mono_source_get_property (GObject * object,
@@ -187,7 +187,7 @@
gst_element_class_set_details (element_class, &details);
}
-GType
+static GType
gst_test_mono_source_get_type (void)
{
static GType type = 0;
@@ -212,42 +212,20 @@
return type;
+/* so we don't have to paste the gst_element_register into 50 places below */
static gboolean
-plugin_init (GstPlugin * plugin)
+local_gst_controller_init (int *argc, char ***argv)
- gboolean res = TRUE;
+ fail_unless (gst_controller_init (argc, argv));
- res &= gst_element_register (plugin, "testmonosource", GST_RANK_NONE,
- GST_TYPE_TEST_MONO_SOURCE);
- return res;
+ fail_unless (gst_element_register (NULL, "testmonosource", GST_RANK_NONE,
+ GST_TYPE_TEST_MONO_SOURCE));
+ return TRUE;
-GST_PLUGIN_DEFINE_STATIC (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- "gst-test",
- "controller test plugin - several unit test support elements",
- plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
+#define gst_controller_init(a,b) local_gst_controller_init(a,b)
-/*
-static void __attribute__ ((constructor))
-_gst_plugin_static_init__plugin_init (void)
-{
- static GstPluginDesc plugin_desc_ = {
- GST_VERSION_MAJOR,
- plugin_init,
- VERSION,
- GST_LICENSE,
- PACKAGE,
- GST_PACKAGE,
- GST_ORIGIN,
- GST_PADDING_INIT
- };
- _gst_plugin_register_static (&plugin_desc_);
-}
-*/
/* TESTS */
/* double init should not harm */
GST_START_TEST (controller_init)
Index: typefindhelper.c
RCS file: /cvs/gstreamer/gstreamer/tests/check/libs/typefindhelper.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- typefindhelper.c 1 Jul 2006 20:56:55 -0000 1.2
+++ typefindhelper.c 21 Dec 2007 21:17:32 -0000 1.3
@@ -33,6 +33,8 @@
0x00, 0x03, 0xf4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x01
+static void foobar_typefind (GstTypeFind * tf, gpointer unused);
static GstStaticCaps foobar_caps = GST_STATIC_CAPS ("foo/x-bar");
#define FOOBAR_CAPS (gst_static_caps_get (&foobar_caps))
@@ -40,10 +42,16 @@
/* make sure the entire data in the buffer is available for peeking */
GST_START_TEST (test_buffer_range)
+ static gchar *foobar_exts[] = { "foobar", NULL };
GstStructure *s;
GstBuffer *buf;
GstCaps *caps;
+ fail_unless (gst_type_find_register (NULL, "foo/x-bar",
+ GST_RANK_PRIMARY + 50, foobar_typefind, foobar_exts, FOOBAR_CAPS,
+ NULL, NULL));
buf = gst_buffer_new ();
fail_unless (buf != NULL);
GST_BUFFER_DATA (buf) = (guint8 *) vorbisid;
@@ -65,7 +73,7 @@
GST_END_TEST;
-Suite *
+static Suite *
gst_typefindhelper_suite (void)
Suite *s = suite_create ("typefindhelper");
@@ -114,22 +122,3 @@
gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, FOOBAR_CAPS);
-
-static gboolean
- static gchar *foobar_exts[] = { "foobar", NULL };
- if (!gst_type_find_register (plugin, "foo/x-bar", GST_RANK_PRIMARY + 50,
- foobar_typefind, foobar_exts, FOOBAR_CAPS, NULL, NULL)) {
- return FALSE;
- }
- return TRUE;
- "dummy typefind functions",
- plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
Index: parse-launch.c
RCS file: /cvs/gstreamer/gstreamer/tests/check/pipelines/parse-launch.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- parse-launch.c 15 Jun 2007 10:43:51 -0000 1.14
+++ parse-launch.c 21 Dec 2007 21:17:32 -0000 1.15
@@ -30,6 +30,9 @@
#include <gst/check/gstcheck.h>
+#define GST_TYPE_PARSE_TEST_ELEMENT (gst_parse_test_element_get_type())
+static GType gst_parse_test_element_get_type (void);
static GstElement *
setup_pipeline (const gchar * pipe_descr)
@@ -416,6 +419,9 @@
GST_START_TEST (delayed_link)
+ fail_unless (gst_element_register (NULL, "parsetestelement",
+ GST_RANK_NONE, GST_TYPE_PARSE_TEST_ELEMENT));
/* This tests the delayed linking support in parse_launch by creating
* a test element based on bin, which contains a fakesrc and a sometimes
* pad-template, and trying to link to a fakesink. When the bin transitions
@@ -444,8 +450,6 @@
-#define GST_TYPE_PARSE_TEST_ELEMENT (gst_parse_test_element_get_type())
typedef struct _GstParseTestElement
GstBin parent;
@@ -532,21 +536,7 @@
return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-gst_register_parse_element (GstPlugin * plugin)
- if (!gst_element_register (plugin, "parsetestelement", GST_RANK_NONE,
- GST_TYPE_PARSE_TEST_ELEMENT))
-GST_PLUGIN_DEFINE_STATIC (GST_VERSION_MAJOR, GST_VERSION_MINOR,
- "parsetestelement", "Test element for parse launch",
- gst_register_parse_element, VERSION, GST_LICENSE, GST_PACKAGE_NAME,
- GST_PACKAGE_ORIGIN);
parse_suite (void)
Suite *s = suite_create ("Parse Launch syntax");
|