diff --git a/common b/common index 42491fe8cb..2d7b19ccea 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 42491fe8cbc7f7bd736008e67e6ba1e78cda6d2d +Subproject commit 2d7b19ccea5558f1689a287374f645a593291407 diff --git a/tests/old/testsuite/elements/events.h b/tests/old/testsuite/elements/events.h deleted file mode 100644 index a50b6aca2a..0000000000 --- a/tests/old/testsuite/elements/events.h +++ /dev/null @@ -1,45 +0,0 @@ -#include -#include - -/* - * no need to librify this simple function set - */ - -static void -print_props (gpointer data, gpointer user_data) -{ - GstPropsEntry *entry = (GstPropsEntry *)data; - GstElement *element = GST_ELEMENT (user_data); - - g_print ("%s: %s: ", gst_element_get_name (element), - g_quark_to_string (entry->propid)); - switch (entry->propstype) { - case GST_PROPS_INT_ID: - g_print ("%d\n", entry->data.int_data); - break; - case GST_PROPS_STRING_ID: - g_print ("%s\n", entry->data.string_data.string); - break; - case GST_PROPS_FLOAT_ID: - g_print ("%f\n", entry->data.float_data); - break; - default: - g_print ("unknown\n"); - } -} - -static void -event_func (GstElement *element, GstEvent *event) -{ - GstProps *props; - - if (event == NULL) - return; - - if (GST_EVENT_TYPE (event) == GST_EVENT_INFO) { - props = GST_EVENT_INFO_PROPS (event); - - g_list_foreach (props->properties, print_props, GST_EVENT_SRC (event)); - } -} - diff --git a/tests/old/testsuite/elements/fake.c b/tests/old/testsuite/elements/fake.c index 36259ce14f..6c2a50ff2f 100644 --- a/tests/old/testsuite/elements/fake.c +++ b/tests/old/testsuite/elements/fake.c @@ -5,7 +5,6 @@ */ #include -#include "events.h" GstElement * element_create (char *name, char *element) @@ -41,7 +40,6 @@ main (int argc, char *argv[]) g_print ("Creating pipeline\n"); pipeline = gst_pipeline_new ("pipeline"); - g_signal_connect (G_OBJECT (pipeline), "event", G_CALLBACK (event_func), NULL); g_print ("Creating elements\n"); if (!(src = element_create ("src", "fakesrc"))) return 1; g_object_set (G_OBJECT (src), "sizetype", 2, NULL); diff --git a/tests/old/testsuite/elements/tee.c b/tests/old/testsuite/elements/tee.c index fd42aee299..b95e5a710b 100644 --- a/tests/old/testsuite/elements/tee.c +++ b/tests/old/testsuite/elements/tee.c @@ -13,7 +13,6 @@ */ #include -#include "events.h" GstElement * element_create (char *name, char *element) @@ -52,7 +51,6 @@ main (int argc, char *argv[]) /* create */ g_print ("Creating pipeline\n"); pipeline = gst_pipeline_new ("pipeline"); - g_signal_connect (G_OBJECT (pipeline), "event", G_CALLBACK (event_func), NULL); g_print ("Creating elements\n"); if (!(tee = element_create ("tee", "tee"))) return 1; diff --git a/testsuite/elements/events.h b/testsuite/elements/events.h deleted file mode 100644 index a50b6aca2a..0000000000 --- a/testsuite/elements/events.h +++ /dev/null @@ -1,45 +0,0 @@ -#include -#include - -/* - * no need to librify this simple function set - */ - -static void -print_props (gpointer data, gpointer user_data) -{ - GstPropsEntry *entry = (GstPropsEntry *)data; - GstElement *element = GST_ELEMENT (user_data); - - g_print ("%s: %s: ", gst_element_get_name (element), - g_quark_to_string (entry->propid)); - switch (entry->propstype) { - case GST_PROPS_INT_ID: - g_print ("%d\n", entry->data.int_data); - break; - case GST_PROPS_STRING_ID: - g_print ("%s\n", entry->data.string_data.string); - break; - case GST_PROPS_FLOAT_ID: - g_print ("%f\n", entry->data.float_data); - break; - default: - g_print ("unknown\n"); - } -} - -static void -event_func (GstElement *element, GstEvent *event) -{ - GstProps *props; - - if (event == NULL) - return; - - if (GST_EVENT_TYPE (event) == GST_EVENT_INFO) { - props = GST_EVENT_INFO_PROPS (event); - - g_list_foreach (props->properties, print_props, GST_EVENT_SRC (event)); - } -} - diff --git a/testsuite/elements/fake.c b/testsuite/elements/fake.c index 36259ce14f..6c2a50ff2f 100644 --- a/testsuite/elements/fake.c +++ b/testsuite/elements/fake.c @@ -5,7 +5,6 @@ */ #include -#include "events.h" GstElement * element_create (char *name, char *element) @@ -41,7 +40,6 @@ main (int argc, char *argv[]) g_print ("Creating pipeline\n"); pipeline = gst_pipeline_new ("pipeline"); - g_signal_connect (G_OBJECT (pipeline), "event", G_CALLBACK (event_func), NULL); g_print ("Creating elements\n"); if (!(src = element_create ("src", "fakesrc"))) return 1; g_object_set (G_OBJECT (src), "sizetype", 2, NULL); diff --git a/testsuite/elements/tee.c b/testsuite/elements/tee.c index fd42aee299..b95e5a710b 100644 --- a/testsuite/elements/tee.c +++ b/testsuite/elements/tee.c @@ -13,7 +13,6 @@ */ #include -#include "events.h" GstElement * element_create (char *name, char *element) @@ -52,7 +51,6 @@ main (int argc, char *argv[]) /* create */ g_print ("Creating pipeline\n"); pipeline = gst_pipeline_new ("pipeline"); - g_signal_connect (G_OBJECT (pipeline), "event", G_CALLBACK (event_func), NULL); g_print ("Creating elements\n"); if (!(tee = element_create ("tee", "tee"))) return 1;