From 3cda4e2eaa73df412424f4c6d39bf1a94a733164 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 13 Aug 2001 19:00:13 +0000 Subject: [PATCH] sync with the current CVS glib API Original commit message from CVS: sync with the current CVS glib API --- docs/gst/gstreamer-sections.txt | 4 +-- docs/manual/dynamic.sgml | 12 ++++---- docs/manual/helloworld2.sgml | 8 +++--- docs/manual/pads.sgml | 2 +- docs/manual/queues.sgml | 4 +-- docs/manual/threads.sgml | 4 +-- docs/manual/typedetection.sgml | 4 +-- docs/manual/xml.sgml | 6 ++-- examples/cutter/cutter.c | 8 +++--- examples/helloworld/helloworld.c | 4 +-- examples/helloworld2/helloworld2.c | 8 +++--- examples/mixer/mixer.c | 4 +-- examples/plugins/example.c | 2 +- examples/queue2/queue2.c | 4 +-- examples/queue3/queue3.c | 4 +-- examples/queue4/queue4.c | 4 +-- examples/thread/thread.c | 4 +-- examples/typefind/typefind.c | 4 +-- examples/xml/createxml.c | 4 +-- examples/xml/runxml.c | 2 +- gst/autoplug/autoplugtest.c | 4 +-- gst/autoplug/gstautoplugcache.c | 4 +-- gst/autoplug/gstautoplugger.c | 42 ++++++++++++++-------------- gst/autoplug/gststaticautoplug.c | 12 ++++---- gst/autoplug/gststaticautoplugrender.c | 8 +++--- gst/elements/gstdisksink.c | 2 +- gst/elements/gstfakesink.c | 2 +- gst/elements/gstfakesrc.c | 2 +- gst/elements/gstidentity.c | 2 +- gst/elements/gstmultidisksrc.c | 2 +- gst/elements/gstmultifilesrc.c | 2 +- gst/gobject2gtk.c | 2 +- gst/gobject2gtk.h | 6 ++-- gst/gst.c | 2 +- gst/gstautoplug.c | 2 +- gst/gstbin.c | 2 +- gst/gstelement.c | 20 ++++++------- gst/gstobject.c | 14 +++++----- gst/gstpad.c | 12 ++++---- gst/gstparse.c | 6 ++-- gst/gsttypefind.c | 2 +- gst/gstxml.c | 2 +- plugins/elements/gstdisksink.c | 2 +- plugins/elements/gstfakesink.c | 2 +- plugins/elements/gstfakesrc.c | 2 +- plugins/elements/gstidentity.c | 2 +- plugins/elements/gstmultidisksrc.c | 2 +- plugins/elements/gstmultifilesrc.c | 2 +- test/avi2mpg.c | 8 +++--- test/lat.c | 8 +++--- test/mp1tomp1.c | 4 +-- test/mp2toavi.c | 10 +++---- test/mp2tomp1.c | 4 +-- test/mp2tomp1v2.c | 10 +++---- test/mp3.c | 4 +-- test/mp3parse.c | 4 +-- test/mp3play.c | 4 +-- test/mp3tovorbis.c | 4 +-- test/pipetest.c | 4 +-- test/qtest.c | 4 +-- tests/autoplug.c | 2 +- tests/eos/case1.c | 4 +-- tests/eos/case2.c | 4 +-- tests/eos/case3.c | 4 +-- tests/eos/case4.c | 4 +-- tests/eos/case5.c | 8 +++--- tests/eos/case6.c | 8 +++--- tests/eos/case7.c | 6 ++-- tests/events.c | 2 +- tests/mp1vid.c | 4 +-- tests/muxing/case1.c | 4 +-- tests/old/examples/cutter/cutter.c | 8 +++--- tests/old/examples/helloworld/helloworld.c | 4 +-- tests/old/examples/helloworld2/helloworld2.c | 8 +++--- tests/old/examples/mixer/mixer.c | 4 +-- tests/old/examples/plugins/example.c | 2 +- tests/old/examples/queue2/queue2.c | 4 +-- tests/old/examples/queue3/queue3.c | 4 +-- tests/old/examples/queue4/queue4.c | 4 +-- tests/old/examples/thread/thread.c | 4 +-- tests/old/examples/typefind/typefind.c | 4 +-- tests/old/examples/xml/createxml.c | 4 +-- tests/old/examples/xml/runxml.c | 2 +- tests/paranoia.c | 4 +-- tests/sched/runxml.c | 8 +++--- tests/states.c | 20 ++++++------- 86 files changed, 231 insertions(+), 231 deletions(-) diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 4047974..ef1fa23 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -73,8 +73,8 @@ G_SIGNAL_RUN_LAST G_SIGNAL_RUN_FIRST GCallback G_CALLBACK -g_signal_newc -g2g_signal_newc +g_signal_new +g2g_signal_new g_signal_lookup g_signal_handler_block g_signal_handler_unblock diff --git a/docs/manual/dynamic.sgml b/docs/manual/dynamic.sgml index 6cd753b..784cb85 100644 --- a/docs/manual/dynamic.sgml +++ b/docs/manual/dynamic.sgml @@ -54,11 +54,11 @@ main(int argc, char *argv[]) gst_bin_add (GST_BIN (pipeline), GST_ELEMENT (src)); gst_bin_add (GST_BIN (pipeline), GST_ELEMENT (parse)); - g_signal_connectc (G_OBJECT (parse), "new_pad", - G_CALLBACK (new_pad_created), pipeline, FALSE); + g_signal_connect (G_OBJECT (parse), "new_pad", + G_CALLBACK (new_pad_created), pipeline); - g_signal_connectc (G_OBJECT (src), "eos", - G_CALLBACK (eof), NULL, FALSE); + g_signal_connect (G_OBJECT (src), "eos", + G_CALLBACK (eof), NULL); gst_pad_connect (gst_element_get_pad (src, "src"), gst_element_get_pad (parse, "sink")); @@ -83,8 +83,8 @@ main(int argc, char *argv[]) 'new_pad' that we connected to the mpeg1parser using: - g_signal_connectc (G_OBJECT (parse), "new_pad", - G_CALLBACK (new_pad_created), pipeline, FALSE); + g_signal_connect (G_OBJECT (parse), "new_pad", + G_CALLBACK (new_pad_created), pipeline); When an elementary stream has been detected in the system stream, diff --git a/docs/manual/helloworld2.sgml b/docs/manual/helloworld2.sgml index a1bc1ae..b904f00 100644 --- a/docs/manual/helloworld2.sgml +++ b/docs/manual/helloworld2.sgml @@ -51,12 +51,12 @@ main (int argc, char *argv[]) autobin = gst_bin_new ("autobin"); cache = gst_elementfactory_make ("autoplugcache", "cache"); - g_signal_connectc (G_OBJECT (cache), "cache_empty", - G_CALLBACK (gst_play_cache_empty), pipeline, FALSE); + g_signal_connect (G_OBJECT (cache), "cache_empty", + G_CALLBACK (gst_play_cache_empty), pipeline); typefind = gst_elementfactory_make ("typefind", "typefind"); - g_signal_connectc (G_OBJECT (typefind), "have_type", - G_CALLBACK (gst_play_have_type), pipeline, FALSE); + g_signal_connect (G_OBJECT (typefind), "have_type", + G_CALLBACK (gst_play_have_type), pipeline); gst_bin_add (GST_BIN (autobin), cache); gst_bin_add (GST_BIN (autobin), typefind); diff --git a/docs/manual/pads.sgml b/docs/manual/pads.sgml index 1e0886d..36bd021 100644 --- a/docs/manual/pads.sgml +++ b/docs/manual/pads.sgml @@ -105,7 +105,7 @@ main(int argc, char *argv[]) ... mpeg2parser = gst_elementfactory_make ("mpeg2parse", "mpeg2parse"); - g_signal_connectc (G_OBJECT (mpeg2parser), "new_pad", pad_connect_func, pipeline, FALSE); + g_signal_connect (G_OBJECT (mpeg2parser), "new_pad", pad_connect_func, pipeline); ... // start the pipeline diff --git a/docs/manual/queues.sgml b/docs/manual/queues.sgml index e8ad9d2..abba7f4 100644 --- a/docs/manual/queues.sgml +++ b/docs/manual/queues.sgml @@ -82,8 +82,8 @@ main (int argc, char *argv[]) disksrc = gst_elementfactory_make ("disksrc", "disk_source"); g_assert (disksrc != NULL); g_object_set (G_OBJECT (disksrc), "location", argv[1], NULL); - g_signal_connectc (G_OBJECT (disksrc), "eos", - G_CALLBACK (eos), thread, FALSE); + g_signal_connect (G_OBJECT (disksrc), "eos", + G_CALLBACK (eos), thread); queue = gst_elementfactory_make ("queue", "queue"); diff --git a/docs/manual/threads.sgml b/docs/manual/threads.sgml index 4349783..2706965 100644 --- a/docs/manual/threads.sgml +++ b/docs/manual/threads.sgml @@ -95,8 +95,8 @@ main (int argc, char *argv[]) disksrc = gst_elementfactory_make ("disksrc", "disk_source"); g_assert (disksrc != NULL); g_object_set (G_OBJECT (disksrc), "location", argv[1], NULL); - g_signal_connectc (G_OBJECT (disksrc), "eos", - G_CALLBACK (eos), thread, FALSE); + g_signal_connect (G_OBJECT (disksrc), "eos", + G_CALLBACK (eos), thread); /* and an audio sink */ audiosink = gst_elementfactory_make ("audiosink", "play_audio"); diff --git a/docs/manual/typedetection.sgml b/docs/manual/typedetection.sgml index 7cf294d..7458df4 100644 --- a/docs/manual/typedetection.sgml +++ b/docs/manual/typedetection.sgml @@ -85,8 +85,8 @@ main(int argc, char *argv[]) gst_bin_add (GST_BIN (bin), disksrc); gst_bin_add (GST_BIN (bin), typefind); - g_signal_connectc (G_OBJECT (typefind), "have_type", - G_CALLBACK (type_found), NULL, FALSE); + g_signal_connect (G_OBJECT (typefind), "have_type", + G_CALLBACK (type_found), NULL); gst_pad_connect (gst_element_get_pad (disksrc, "src"), gst_element_get_pad (typefind, "sink")); diff --git a/docs/manual/xml.sgml b/docs/manual/xml.sgml index cf8d102..10f00f2 100644 --- a/docs/manual/xml.sgml +++ b/docs/manual/xml.sgml @@ -196,8 +196,8 @@ xmlNsPtr ns; ns = xmlNewNs (NULL, "http://gstreamer.net/gst-test/1.0/", "test"); ... thread = gst_elementfactory_make ("thread", "thread"); - g_signal_connectc (G_OBJECT (thread), "object_saved", - G_CALLBACK (object_saved), g_strdup ("decoder thread"), FALSE); + g_signal_connect (G_OBJECT (thread), "object_saved", + G_CALLBACK (object_saved), g_strdup ("decoder thread")); ... @@ -246,7 +246,7 @@ object_saved (GstObject *object, xmlNodePtr parent, gpointer data) xml = gst_xml_new (); - g_signal_connectc (G_OBJECT (xml), "object_loaded", + g_signal_connect (G_OBJECT (xml), "object_loaded", G_CALLBACK (xml_loaded), xml); ret = gst_xml_parse_file (xml, "xmlTest.gst", NULL); diff --git a/examples/cutter/cutter.c b/examples/cutter/cutter.c index eeec85d..e1bd639 100644 --- a/examples/cutter/cutter.c +++ b/examples/cutter/cutter.c @@ -169,10 +169,10 @@ int main (int argc, char *argv[]) /* set signal handlers */ g_print ("setting signal handlers\n"); - g_signal_connectc (G_OBJECT(cutter), "cut_start", - (GCallback)cut_start_signal, NULL, FALSE); - g_signal_connectc (G_OBJECT(cutter), "cut_stop", - (GCallback)cut_stop_signal, NULL, FALSE); + g_signal_connect (G_OBJECT(cutter), "cut_start", + (GCallback)cut_start_signal, NULL); + g_signal_connect (G_OBJECT(cutter), "cut_stop", + (GCallback)cut_stop_signal, NULL); /* start playing */ g_print ("setting to play\n"); diff --git a/examples/helloworld/helloworld.c b/examples/helloworld/helloworld.c index 74e2a4f..adb71e6 100644 --- a/examples/helloworld/helloworld.c +++ b/examples/helloworld/helloworld.c @@ -28,8 +28,8 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); - g_signal_connectc(G_OBJECT(disksrc),"eos", - G_CALLBACK(eos),NULL,FALSE); + g_signal_connect(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos),NULL); /* now it's time to get the parser */ parse = gst_elementfactory_make("mp3parse","parse"); diff --git a/examples/helloworld2/helloworld2.c b/examples/helloworld2/helloworld2.c index 40e7069..3f3faa8 100644 --- a/examples/helloworld2/helloworld2.c +++ b/examples/helloworld2/helloworld2.c @@ -105,12 +105,12 @@ main (int argc, char *argv[]) autobin = gst_bin_new ("autobin"); cache = gst_elementfactory_make ("autoplugcache", "cache"); - g_signal_connectc (G_OBJECT (cache), "cache_empty", - G_CALLBACK (gst_play_cache_empty), pipeline, FALSE); + g_signal_connect (G_OBJECT (cache), "cache_empty", + G_CALLBACK (gst_play_cache_empty), pipeline); typefind = gst_elementfactory_make ("typefind", "typefind"); - g_signal_connectc (G_OBJECT (typefind), "have_type", - G_CALLBACK (gst_play_have_type), pipeline, FALSE); + g_signal_connect (G_OBJECT (typefind), "have_type", + G_CALLBACK (gst_play_have_type), pipeline); gst_bin_add (GST_BIN (autobin), cache); gst_bin_add (GST_BIN (autobin), typefind); diff --git a/examples/mixer/mixer.c b/examples/mixer/mixer.c index 998bafb..78568e9 100644 --- a/examples/mixer/mixer.c +++ b/examples/mixer/mixer.c @@ -276,8 +276,8 @@ create_input_channel (int id, char* location) gst_bin_add(GST_BIN(channel->pipe), channel->disksrc); /* connect signal to eos of disksrc */ - g_signal_connectc (G_OBJECT(channel->disksrc),"eos", - G_CALLBACK(eos),NULL,FALSE); + g_signal_connect (G_OBJECT(channel->disksrc),"eos", + G_CALLBACK(eos),NULL); #ifdef DEBUG diff --git a/examples/plugins/example.c b/examples/plugins/example.c index 402a413..351f9fc 100644 --- a/examples/plugins/example.c +++ b/examples/plugins/example.c @@ -169,7 +169,7 @@ gst_example_class_init (GstExampleClass *klass) * called asdf. The signal will also pass a pointer to the listeners * which happens to be the example element itself */ gst_example_signals[ASDF] = - g_signal_newc("asdf", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new("asdf", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstExampleClass, asdf), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GST_TYPE_EXAMPLE); diff --git a/examples/queue2/queue2.c b/examples/queue2/queue2.c index 19d4478..f4b2a9a 100644 --- a/examples/queue2/queue2.c +++ b/examples/queue2/queue2.c @@ -36,8 +36,8 @@ int main(int argc,char *argv[]) disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); - g_signal_connectc (G_OBJECT(disksrc),"eos", - G_CALLBACK(eos), thread, FALSE); + g_signal_connect (G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread); queue = gst_elementfactory_make("queue", "queue"); diff --git a/examples/queue3/queue3.c b/examples/queue3/queue3.c index fbc2dcd..083b101 100644 --- a/examples/queue3/queue3.c +++ b/examples/queue3/queue3.c @@ -36,8 +36,8 @@ int main(int argc,char *argv[]) disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); - g_signal_connectc(G_OBJECT(disksrc),"eos", - G_CALLBACK(eos), thread, FALSE); + g_signal_connect(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread); queue = gst_elementfactory_make("queue", "queue"); diff --git a/examples/queue4/queue4.c b/examples/queue4/queue4.c index 896a54b..2feac14 100644 --- a/examples/queue4/queue4.c +++ b/examples/queue4/queue4.c @@ -38,8 +38,8 @@ int main(int argc,char *argv[]) disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); - g_signal_connectc(G_OBJECT(disksrc),"eos", - G_CALLBACK(eos), thread, FALSE); + g_signal_connect(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread); queue = gst_elementfactory_make("queue", "queue"); queue2 = gst_elementfactory_make("queue", "queue2"); diff --git a/examples/thread/thread.c b/examples/thread/thread.c index afc3892..3a0c713 100644 --- a/examples/thread/thread.c +++ b/examples/thread/thread.c @@ -37,8 +37,8 @@ int main(int argc,char *argv[]) disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); - g_signal_connectc(G_OBJECT(disksrc),"eos", - G_CALLBACK(eos), thread, FALSE); + g_signal_connect(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread); /* and an audio sink */ osssink = gst_elementfactory_make("osssink", "play_audio"); diff --git a/examples/typefind/typefind.c b/examples/typefind/typefind.c index a69a296..319bc38 100644 --- a/examples/typefind/typefind.c +++ b/examples/typefind/typefind.c @@ -43,8 +43,8 @@ main(int argc, char *argv[]) gst_bin_add(GST_BIN(bin), disksrc); gst_bin_add(GST_BIN(bin), typefind); - g_signal_connectc (G_OBJECT (typefind), "have_type", - type_found, NULL, FALSE); + g_signal_connect (G_OBJECT (typefind), "have_type", + type_found, NULL); gst_pad_connect(gst_element_get_pad(disksrc,"src"), gst_element_get_pad(typefind,"sink")); diff --git a/examples/xml/createxml.c b/examples/xml/createxml.c index e3cfa4e..92baeb7 100644 --- a/examples/xml/createxml.c +++ b/examples/xml/createxml.c @@ -32,12 +32,12 @@ int main(int argc,char *argv[]) //thread = gst_thread_new("thread"); thread = gst_elementfactory_make("thread", "thread"); g_assert(thread != NULL); - g_signal_connectc (G_OBJECT (thread), "object_saved", object_saved, g_strdup ("decoder thread"), FALSE); + g_signal_connect (G_OBJECT (thread), "object_saved", object_saved, g_strdup ("decoder thread")); thread2 = gst_elementfactory_make("thread", "thread2"); //thread2 = gst_thread_new("thread2"); g_assert(thread2 != NULL); - g_signal_connectc (G_OBJECT (thread2), "object_saved", object_saved, g_strdup ("render thread"), FALSE); + g_signal_connect (G_OBJECT (thread2), "object_saved", object_saved, g_strdup ("render thread")); /* create a new bin to hold the elements */ bin = gst_bin_new("bin"); diff --git a/examples/xml/runxml.c b/examples/xml/runxml.c index 4fbaf2a..76a71bc 100644 --- a/examples/xml/runxml.c +++ b/examples/xml/runxml.c @@ -35,7 +35,7 @@ int main(int argc,char *argv[]) xml = gst_xml_new (); - g_signal_connectc (G_OBJECT (xml), "object_loaded", xml_loaded, xml, FALSE); + g_signal_connect (G_OBJECT (xml), "object_loaded", xml_loaded, xml); ret = gst_xml_parse_file(xml, "xmlTest.gst", NULL); g_assert (ret == TRUE); diff --git a/gst/autoplug/autoplugtest.c b/gst/autoplug/autoplugtest.c index 41b5e80..6385286 100644 --- a/gst/autoplug/autoplugtest.c +++ b/gst/autoplug/autoplugtest.c @@ -73,9 +73,9 @@ int main (int argc,char *argv[]) { autobin = gst_bin_new("autobin"); cache = gst_elementfactory_make ("autoplugcache","cache"); - g_signal_connectc (G_OBJECT(cache),"cache_empty",(GCallback)cache_empty,NULL,FALSE); + g_signal_connect (G_OBJECT(cache),"cache_empty",(GCallback)cache_empty,NULL); typefind = gst_elementfactory_make ("typefind", "typefind"); - g_signal_connectc (G_OBJECT(typefind),"have_type",(GCallback)have_type,&caps,FALSE); + g_signal_connect (G_OBJECT(typefind),"have_type",(GCallback)have_type,&caps); gst_bin_add (GST_BIN(autobin),cache); gst_bin_add (GST_BIN(autobin),typefind); gst_element_connect(cache,"src",typefind,"sink"); diff --git a/gst/autoplug/gstautoplugcache.c b/gst/autoplug/gstautoplugcache.c index 2136326..f1993d3 100644 --- a/gst/autoplug/gstautoplugcache.c +++ b/gst/autoplug/gstautoplugcache.c @@ -143,12 +143,12 @@ gst_autoplugcache_class_init (GstAutoplugCacheClass *klass) FALSE,G_PARAM_WRITABLE)); // CHECKME! gst_autoplugcache_signals[FIRST_BUFFER] = - g_signal_newc ("first_buffer", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("first_buffer", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAutoplugCacheClass, first_buffer), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); gst_autoplugcache_signals[CACHE_EMPTY] = - g_signal_newc ("cache_empty", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("cache_empty", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAutoplugCacheClass, cache_empty), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); diff --git a/gst/autoplug/gstautoplugger.c b/gst/autoplug/gstautoplugger.c index f8c9e51..2ba800b 100644 --- a/gst/autoplug/gstautoplugger.c +++ b/gst/autoplug/gstautoplugger.c @@ -138,7 +138,7 @@ gst_autoplugger_class_init (GstAutopluggerClass *klass) /* gst_autoplugger_signals[_EMPTY] = - g_signal_newc ("_empty", G_OBJECT_TYPE(gobject_class), G_SIGNAL_RUN_LAST, + g_signal_new ("_empty", G_OBJECT_TYPE(gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAutopluggerClass, _empty), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); */ @@ -171,8 +171,8 @@ gst_autoplugger_init (GstAutoplugger *autoplugger) g_object_set(G_OBJECT(autoplugger->cache),"caps_proxy",TRUE,NULL); // attach signals to the cache - g_signal_connectc (G_OBJECT (autoplugger->cache), "first_buffer", - G_CALLBACK (gst_autoplugger_cache_first_buffer), autoplugger, FALSE); + g_signal_connect (G_OBJECT (autoplugger->cache), "first_buffer", + G_CALLBACK (gst_autoplugger_cache_first_buffer), autoplugger); // add the cache to self gst_bin_add (GST_BIN(autoplugger), autoplugger->cache); @@ -182,18 +182,18 @@ gst_autoplugger_init (GstAutoplugger *autoplugger) autoplugger->cache_srcpad = gst_element_get_pad (autoplugger->cache, "src"); // attach handlers to the typefind pads - g_signal_connectc (G_OBJECT (autoplugger->cache_sinkpad), "caps_changed", - G_CALLBACK (gst_autoplugger_external_sink_caps_changed), autoplugger,FALSE); - g_signal_connectc (G_OBJECT (autoplugger->cache_srcpad), "caps_changed", - G_CALLBACK (gst_autoplugger_external_src_caps_changed), autoplugger,FALSE); - g_signal_connectc (G_OBJECT (autoplugger->cache_sinkpad), "caps_nego_failed", - G_CALLBACK (gst_autoplugger_external_sink_caps_nego_failed), autoplugger,FALSE); - g_signal_connectc (G_OBJECT (autoplugger->cache_srcpad), "caps_nego_failed", - G_CALLBACK (gst_autoplugger_external_src_caps_nego_failed), autoplugger,FALSE); -// g_signal_connectc (G_OBJECT (autoplugger->cache_sinkpad), "connected", -// gst_autoplugger_external_sink_connected, autoplugger,FALSE); -// g_signal_connectc (G_OBJECT (autoplugger->cache_srcpad), "connected", -// gst_autoplugger_external_src_connected, autoplugger,FALSE); + g_signal_connect (G_OBJECT (autoplugger->cache_sinkpad), "caps_changed", + G_CALLBACK (gst_autoplugger_external_sink_caps_changed), autoplugger); + g_signal_connect (G_OBJECT (autoplugger->cache_srcpad), "caps_changed", + G_CALLBACK (gst_autoplugger_external_src_caps_changed), autoplugger); + g_signal_connect (G_OBJECT (autoplugger->cache_sinkpad), "caps_nego_failed", + G_CALLBACK (gst_autoplugger_external_sink_caps_nego_failed), autoplugger); + g_signal_connect (G_OBJECT (autoplugger->cache_srcpad), "caps_nego_failed", + G_CALLBACK (gst_autoplugger_external_src_caps_nego_failed), autoplugger); +// g_signal_connect (G_OBJECT (autoplugger->cache_sinkpad), "connected", +// gst_autoplugger_external_sink_connected, autoplugger); +// g_signal_connect (G_OBJECT (autoplugger->cache_srcpad), "connected", +// gst_autoplugger_external_src_connected, autoplugger); // ghost both of these pads to the outside world gst_element_add_ghost_pad (GST_ELEMENT(autoplugger), autoplugger->cache_sinkpad, "sink"); @@ -488,8 +488,8 @@ gst_schedule_show(GST_ELEMENT_SCHED(autoplugger)); // attach the cache_empty handler // FIXME this is the wrong place, it shouldn't be done until we get successful caps nego! - g_signal_connectc (G_OBJECT(autoplugger->cache),"cache_empty", - G_CALLBACK (gst_autoplugger_cache_empty), autoplugger, FALSE); + g_signal_connect (G_OBJECT(autoplugger->cache),"cache_empty", + G_CALLBACK (gst_autoplugger_cache_empty), autoplugger); autoplugger->paused--; if (autoplugger->paused == 0) @@ -532,8 +532,8 @@ gst_schedule_show(GST_ELEMENT_SCHED(autoplugger)); GST_DEBUG(GST_CAT_AUTOPLUG, "creating typefind and setting signal handler\n"); autoplugger->typefind = gst_elementfactory_make("typefind","unnamed_typefind"); autoplugger->typefind_sinkpad = gst_element_get_pad(autoplugger->typefind,"sink"); - g_signal_connectc (G_OBJECT(autoplugger->typefind),"have_type", - G_CALLBACK (gst_autoplugger_typefind_have_type), autoplugger, FALSE); + g_signal_connect (G_OBJECT(autoplugger->typefind),"have_type", + G_CALLBACK (gst_autoplugger_typefind_have_type), autoplugger); } // add it to self and attach it GST_DEBUG(GST_CAT_AUTOPLUG, "adding typefind to self and connecting to cache\n"); @@ -553,8 +553,8 @@ gst_schedule_show(GST_ELEMENT_SCHED(autoplugger)); gst_schedule_show(GST_ELEMENT_SCHED(autoplugger)); } else { // // attach the cache_empty handler, since the cache simply isn't needed -// g_signal_connectc (G_OBJECT(autoplugger->cache),"cache_empty", -// gst_autoplugger_cache_empty,autoplugger,FALSE); +// g_signal_connect (G_OBJECT(autoplugger->cache),"cache_empty", +// gst_autoplugger_cache_empty,autoplugger); } } diff --git a/gst/autoplug/gststaticautoplug.c b/gst/autoplug/gststaticautoplug.c index d1becd2..9c92081 100644 --- a/gst/autoplug/gststaticautoplug.c +++ b/gst/autoplug/gststaticautoplug.c @@ -226,8 +226,8 @@ gst_autoplug_pads_autoplug (GstElement *src, GstElement *sink) if (!connected) { GST_DEBUG (0,"gstpipeline: delaying pad connections for \"%s\" to \"%s\"\n", GST_ELEMENT_NAME(src), GST_ELEMENT_NAME(sink)); - g_signal_connectc (G_OBJECT(src), "new_pad", - G_CALLBACK (gst_autoplug_pads_autoplug_func), sink, FALSE); + g_signal_connect (G_OBJECT(src), "new_pad", + G_CALLBACK (gst_autoplug_pads_autoplug_func), sink); } } @@ -460,10 +460,10 @@ differ: data->i = i; GST_DEBUG (0,"delaying the creation of a ghostpad for %s\n", GST_ELEMENT_NAME (thesrcelement)); - g_signal_connectc (G_OBJECT (thesrcelement), "new_pad", - G_CALLBACK (autoplug_dynamic_pad), data, FALSE); - g_signal_connectc (G_OBJECT (thesrcelement), "new_ghost_pad", - G_CALLBACK (autoplug_dynamic_pad), data, FALSE); + g_signal_connect (G_OBJECT (thesrcelement), "new_pad", + G_CALLBACK (autoplug_dynamic_pad), data); + g_signal_connect (G_OBJECT (thesrcelement), "new_ghost_pad", + G_CALLBACK (autoplug_dynamic_pad), data); } } } diff --git a/gst/autoplug/gststaticautoplugrender.c b/gst/autoplug/gststaticautoplugrender.c index 4f712ca..b38cfe7 100644 --- a/gst/autoplug/gststaticautoplugrender.c +++ b/gst/autoplug/gststaticautoplugrender.c @@ -228,10 +228,10 @@ gst_autoplug_pads_autoplug (GstElement *src, GstElement *sink) if (!connected) { GST_DEBUG (0,"gstpipeline: delaying pad connections for \"%s\" to \"%s\"\n", GST_ELEMENT_NAME(src), GST_ELEMENT_NAME(sink)); - g_signal_connectc (G_OBJECT(src),"new_pad", - G_CALLBACK (gst_autoplug_pads_autoplug_func), sink, FALSE); - g_signal_connectc (G_OBJECT(src),"new_ghost_pad", - G_CALLBACK (gst_autoplug_pads_autoplug_func), sink, FALSE); + g_signal_connect (G_OBJECT(src),"new_pad", + G_CALLBACK (gst_autoplug_pads_autoplug_func), sink); + g_signal_connect (G_OBJECT(src),"new_ghost_pad", + G_CALLBACK (gst_autoplug_pads_autoplug_func), sink); } } diff --git a/gst/elements/gstdisksink.c b/gst/elements/gstdisksink.c index 524de11..8a838c6 100644 --- a/gst/elements/gstdisksink.c +++ b/gst/elements/gstdisksink.c @@ -103,7 +103,7 @@ gst_disksink_class_init (GstDiskSinkClass *klass) NULL,G_PARAM_READWRITE)); // CHECKME! gst_disksink_signals[SIGNAL_HANDOFF] = - g_signal_newc ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstDiskSinkClass, handoff), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); diff --git a/gst/elements/gstfakesink.c b/gst/elements/gstfakesink.c index a8976f0..ec872b3 100644 --- a/gst/elements/gstfakesink.c +++ b/gst/elements/gstfakesink.c @@ -111,7 +111,7 @@ gst_fakesink_class_init (GstFakeSinkClass *klass) FALSE, G_PARAM_READWRITE)); gst_fakesink_signals[SIGNAL_HANDOFF] = - g_signal_newc ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstFakeSinkClass, handoff), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/gst/elements/gstfakesrc.c b/gst/elements/gstfakesrc.c index 7362385..6e980a9 100644 --- a/gst/elements/gstfakesrc.c +++ b/gst/elements/gstfakesrc.c @@ -151,7 +151,7 @@ gst_fakesrc_class_init (GstFakeSrcClass *klass) FALSE, G_PARAM_READWRITE)); // CHECKME gst_fakesrc_signals[SIGNAL_HANDOFF] = - g_signal_newc ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstFakeSrcClass, handoff), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/gst/elements/gstidentity.c b/gst/elements/gstidentity.c index 0ba7634..e8195aa 100644 --- a/gst/elements/gstidentity.c +++ b/gst/elements/gstidentity.c @@ -105,7 +105,7 @@ gst_identity_class_init (GstIdentityClass *klass) TRUE,G_PARAM_READWRITE)); gst_identity_signals[SIGNAL_HANDOFF] = - g_signal_newc ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstIdentityClass, handoff), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/gst/elements/gstmultidisksrc.c b/gst/elements/gstmultidisksrc.c index afa0c32..b5eaa8c 100644 --- a/gst/elements/gstmultidisksrc.c +++ b/gst/elements/gstmultidisksrc.c @@ -101,7 +101,7 @@ gst_multidisksrc_class_init (GstMultiDiskSrcClass *klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); gst_multidisksrc_signals[NEW_FILE] = - g_signal_newc ("new_file", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("new_file", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMultiDiskSrcClass, new_file), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/gst/elements/gstmultifilesrc.c b/gst/elements/gstmultifilesrc.c index afa0c32..b5eaa8c 100644 --- a/gst/elements/gstmultifilesrc.c +++ b/gst/elements/gstmultifilesrc.c @@ -101,7 +101,7 @@ gst_multidisksrc_class_init (GstMultiDiskSrcClass *klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); gst_multidisksrc_signals[NEW_FILE] = - g_signal_newc ("new_file", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("new_file", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMultiDiskSrcClass, new_file), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/gst/gobject2gtk.c b/gst/gobject2gtk.c index 3279c45..72b6698 100644 --- a/gst/gobject2gtk.c +++ b/gst/gobject2gtk.c @@ -249,7 +249,7 @@ g2g_param_spec_string(gchar *name,gchar *nick,gchar *blurb,gchar *def,gint flags guint -g2g_signal_newc (const gchar *name, +g2g_signal_new (const gchar *name, GtkType object_type, GtkSignalRunType signal_flags, guint function_offset, diff --git a/gst/gobject2gtk.h b/gst/gobject2gtk.h index 1b66556..0a373a0 100644 --- a/gst/gobject2gtk.h +++ b/gst/gobject2gtk.h @@ -138,9 +138,9 @@ gpointer g2g_object_new(GtkType type,gpointer blah_varargs_stuff); #define GCallback gpointer // FIXME? #define G_CALLBACK(f) ((gpointer)(f)) -#define g_signal_newc g2g_signal_newc +#define g_signal_new g2g_signal_new guint -g2g_signal_newc (const gchar *signal_name, +g2g_signal_new (const gchar *signal_name, GtkType object_type, GtkSignalRunType signal_flags, guint function_offset, @@ -156,7 +156,7 @@ g_signal_emit(object,signal,detail,args...) \ gtk_signal_emit((GtkObject *)object,signal, ## args ) #define \ -g_signal_connectc(object,name,func,func_data,swap) \ +g_signal_connect(object,name,func,func_data) \ gtk_signal_connect((GtkObject *)object,name,func,func_data) #define \ diff --git a/gst/gst.c b/gst/gst.c index fb2c753..3c8afc9 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -65,7 +65,7 @@ gst_init (int *argc, char **argv[]) if (!g_thread_supported ()) g_thread_init (NULL); #ifdef USE_GLIB2 - g_type_init(0); + g_type_init(); #else { gchar *display; diff --git a/gst/gstautoplug.c b/gst/gstautoplug.c index 9b1a012..a054127 100644 --- a/gst/gstautoplug.c +++ b/gst/gstautoplug.c @@ -77,7 +77,7 @@ gst_autoplug_class_init(GstAutoplugClass *klass) parent_class = g_type_class_ref (GST_TYPE_OBJECT); gst_autoplug_signals[NEW_OBJECT] = - g_signal_newc ("new_object", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("new_object", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstAutoplugClass, new_object), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GST_TYPE_OBJECT); diff --git a/gst/gstbin.c b/gst/gstbin.c index e73f045..3bd1c23 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -108,7 +108,7 @@ gst_bin_class_init (GstBinClass *klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); gst_bin_signals[OBJECT_ADDED] = - g_signal_newc ("object_added", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_FIRST, + g_signal_new ("object_added", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GstBinClass, object_added), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); diff --git a/gst/gstelement.c b/gst/gstelement.c index 1a7d325..c77d7cb 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -99,37 +99,37 @@ gst_element_class_init (GstElementClass *klass) parent_class = g_type_class_ref(GST_TYPE_OBJECT); gst_element_signals[STATE_CHANGE] = - g_signal_newc ("state_change", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("state_change", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, state_change), NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); gst_element_signals[NEW_PAD] = - g_signal_newc ("new_pad", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("new_pad", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, new_pad), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GST_TYPE_PAD); gst_element_signals[PAD_REMOVED] = - g_signal_newc ("pad_removed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("pad_removed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, pad_removed), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GST_TYPE_PAD); gst_element_signals[NEW_GHOST_PAD] = - g_signal_newc ("new_ghost_pad", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("new_ghost_pad", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, new_ghost_pad), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GST_TYPE_PAD); gst_element_signals[GHOST_PAD_REMOVED] = - g_signal_newc ("ghost_pad_removed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("ghost_pad_removed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, ghost_pad_removed), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GST_TYPE_PAD); gst_element_signals[ERROR] = - g_signal_newc ("error", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("error", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass, error), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE,1, G_TYPE_STRING); gst_element_signals[EOS] = - g_signal_newc ("eos", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("eos", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstElementClass,eos), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -137,7 +137,7 @@ gst_element_class_init (GstElementClass *klass) gobject_class->set_property = GST_DEBUG_FUNCPTR(gst_element_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR(gst_element_get_property); - gobject_class->shutdown = GST_DEBUG_FUNCPTR(gst_element_shutdown); +// gobject_class->shutdown = GST_DEBUG_FUNCPTR(gst_element_shutdown); // FIXME! // gobject_class->destroy = GST_DEBUG_FUNCPTR(gst_element_real_destroy); @@ -931,8 +931,8 @@ gst_element_shutdown (GObject *object) if (GST_IS_BIN (GST_OBJECT_PARENT (element))) gst_bin_remove (GST_BIN (GST_OBJECT_PARENT (element)), element); - if (G_OBJECT_CLASS (parent_class)->shutdown) - G_OBJECT_CLASS (parent_class)->shutdown (G_OBJECT (object)); +// if (G_OBJECT_CLASS (parent_class)->shutdown) +// G_OBJECT_CLASS (parent_class)->shutdown (G_OBJECT (object)); } static void diff --git a/gst/gstobject.c b/gst/gstobject.c index c8ec25e..77b603e 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -94,13 +94,13 @@ gst_object_class_init (GstObjectClass *klass) parent_class = g_type_class_ref (G_TYPE_OBJECT); gst_object_signals[PARENT_SET] = - g_signal_newc("parent_set", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new("parent_set", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstObjectClass, parent_set), NULL, NULL, g_cclosure_marshal_VOID__OBJECT,G_TYPE_NONE,1, G_TYPE_OBJECT); #ifndef GST_DISABLE_LOADSAVE gst_object_signals[OBJECT_SAVED] = - g_signal_newc("object_saved", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new("object_saved", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstObjectClass, object_saved), NULL, NULL, g_cclosure_marshal_VOID__POINTER,G_TYPE_NONE,1, G_TYPE_POINTER); @@ -110,7 +110,7 @@ gst_object_class_init (GstObjectClass *klass) // FIXME!!! // klass->signal_object = g_object_new(gst_signal_object_get_type (,NULL)); - gobject_class->shutdown = gst_object_shutdown; +// gobject_class->shutdown = gst_object_shutdown; // gobject_class->destroy = gst_object_real_destroy; gobject_class->finalize = gst_object_finalize; } @@ -214,7 +214,7 @@ gst_object_destroy (GstObject *object) * invocations. */ gst_object_ref (object); - G_OBJECT_GET_CLASS (object)->shutdown (G_OBJECT (object)); +// G_OBJECT_GET_CLASS (object)->shutdown (G_OBJECT (object)); gst_object_unref (object); } } @@ -224,7 +224,7 @@ gst_object_shutdown (GObject *object) { GST_DEBUG (GST_CAT_REFCOUNTING, "shutdown '%s'\n",GST_OBJECT_NAME(object)); GST_FLAG_SET (GST_OBJECT (object), GST_DESTROYED); - parent_class->shutdown (object); +// parent_class->shutdown (object); } /* finilize is called when the object has to free its resources */ @@ -618,7 +618,7 @@ gst_signal_object_class_init (GstSignalObjectClass *klass) #ifndef GST_DISABLE_LOADSAVE gst_signal_object_signals[SO_OBJECT_LOADED] = - g_signal_newc("object_loaded", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new("object_loaded", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstObjectClass, parent_set), NULL, NULL, gst_marshal_VOID__OBJECT_POINTER,G_TYPE_NONE,2, G_TYPE_OBJECT,G_TYPE_POINTER); @@ -647,7 +647,7 @@ gst_class_signal_connect (GstObjectClass *klass, gpointer func, gpointer func_data) { - return g_signal_connectc (klass->signal_object, name, func, func_data, FALSE); + return g_signal_connect (klass->signal_object, name, func, func_data); } #ifndef GST_DISABLE_LOADSAVE diff --git a/gst/gstpad.c b/gst/gstpad.c index ec73ac1..7638f0e 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -147,27 +147,27 @@ gst_real_pad_class_init (GstRealPadClass *klass) gobject_class->get_property = GST_DEBUG_FUNCPTR(gst_real_pad_get_property); gst_real_pad_signals[REAL_SET_ACTIVE] = - g_signal_newc ("set_active", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("set_active", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRealPadClass, set_active), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); gst_real_pad_signals[REAL_CAPS_CHANGED] = - g_signal_newc ("caps_changed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("caps_changed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRealPadClass, caps_changed), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); gst_real_pad_signals[REAL_CAPS_NEGO_FAILED] = - g_signal_newc ("caps_nego_failed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("caps_nego_failed", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRealPadClass, caps_nego_failed), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); gst_real_pad_signals[REAL_CONNECTED] = - g_signal_newc ("connected", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("connected", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRealPadClass, connected), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); gst_real_pad_signals[REAL_DISCONNECTED] = - g_signal_newc ("disconnected", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("disconnected", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRealPadClass, disconnected), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -1629,7 +1629,7 @@ gst_padtemplate_class_init (GstPadTemplateClass *klass) padtemplate_parent_class = g_type_class_ref(GST_TYPE_OBJECT); gst_padtemplate_signals[TEMPL_PAD_CREATED] = - g_signal_newc ("pad_created", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new ("pad_created", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstPadTemplateClass, pad_created), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GST_TYPE_PAD); diff --git a/gst/gstparse.c b/gst/gstparse.c index b552587..336818c 100644 --- a/gst/gstparse.c +++ b/gst/gstparse.c @@ -371,8 +371,8 @@ gst_parse_launch_cmdline(int argc,char *argv[],GstBin *parent,gst_parse_priv *pr srcpadname, GST_DEBUG_PAD_NAME(GST_PARSE_LISTPAD(sinkpads))); - g_signal_connectc (G_OBJECT (previous), "new_pad", dynamic_connect, connect, FALSE); - g_signal_connectc (G_OBJECT (previous), "new_ghost_pad", dynamic_connect, connect, FALSE); + g_signal_connect (G_OBJECT (previous), "new_pad", dynamic_connect, connect); + g_signal_connect (G_OBJECT (previous), "new_ghost_pad", dynamic_connect, connect); } else { for (j=0; (jpipe), channel->disksrc); /* connect signal to eos of disksrc */ - g_signal_connectc (G_OBJECT(channel->disksrc),"eos", - G_CALLBACK(eos),NULL,FALSE); + g_signal_connect (G_OBJECT(channel->disksrc),"eos", + G_CALLBACK(eos),NULL); #ifdef DEBUG diff --git a/tests/old/examples/plugins/example.c b/tests/old/examples/plugins/example.c index 402a413..351f9fc 100644 --- a/tests/old/examples/plugins/example.c +++ b/tests/old/examples/plugins/example.c @@ -169,7 +169,7 @@ gst_example_class_init (GstExampleClass *klass) * called asdf. The signal will also pass a pointer to the listeners * which happens to be the example element itself */ gst_example_signals[ASDF] = - g_signal_newc("asdf", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, + g_signal_new("asdf", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstExampleClass, asdf), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GST_TYPE_EXAMPLE); diff --git a/tests/old/examples/queue2/queue2.c b/tests/old/examples/queue2/queue2.c index 19d4478..f4b2a9a 100644 --- a/tests/old/examples/queue2/queue2.c +++ b/tests/old/examples/queue2/queue2.c @@ -36,8 +36,8 @@ int main(int argc,char *argv[]) disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); - g_signal_connectc (G_OBJECT(disksrc),"eos", - G_CALLBACK(eos), thread, FALSE); + g_signal_connect (G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread); queue = gst_elementfactory_make("queue", "queue"); diff --git a/tests/old/examples/queue3/queue3.c b/tests/old/examples/queue3/queue3.c index fbc2dcd..083b101 100644 --- a/tests/old/examples/queue3/queue3.c +++ b/tests/old/examples/queue3/queue3.c @@ -36,8 +36,8 @@ int main(int argc,char *argv[]) disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); - g_signal_connectc(G_OBJECT(disksrc),"eos", - G_CALLBACK(eos), thread, FALSE); + g_signal_connect(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread); queue = gst_elementfactory_make("queue", "queue"); diff --git a/tests/old/examples/queue4/queue4.c b/tests/old/examples/queue4/queue4.c index 896a54b..2feac14 100644 --- a/tests/old/examples/queue4/queue4.c +++ b/tests/old/examples/queue4/queue4.c @@ -38,8 +38,8 @@ int main(int argc,char *argv[]) disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); - g_signal_connectc(G_OBJECT(disksrc),"eos", - G_CALLBACK(eos), thread, FALSE); + g_signal_connect(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread); queue = gst_elementfactory_make("queue", "queue"); queue2 = gst_elementfactory_make("queue", "queue2"); diff --git a/tests/old/examples/thread/thread.c b/tests/old/examples/thread/thread.c index afc3892..3a0c713 100644 --- a/tests/old/examples/thread/thread.c +++ b/tests/old/examples/thread/thread.c @@ -37,8 +37,8 @@ int main(int argc,char *argv[]) disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); - g_signal_connectc(G_OBJECT(disksrc),"eos", - G_CALLBACK(eos), thread, FALSE); + g_signal_connect(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread); /* and an audio sink */ osssink = gst_elementfactory_make("osssink", "play_audio"); diff --git a/tests/old/examples/typefind/typefind.c b/tests/old/examples/typefind/typefind.c index a69a296..319bc38 100644 --- a/tests/old/examples/typefind/typefind.c +++ b/tests/old/examples/typefind/typefind.c @@ -43,8 +43,8 @@ main(int argc, char *argv[]) gst_bin_add(GST_BIN(bin), disksrc); gst_bin_add(GST_BIN(bin), typefind); - g_signal_connectc (G_OBJECT (typefind), "have_type", - type_found, NULL, FALSE); + g_signal_connect (G_OBJECT (typefind), "have_type", + type_found, NULL); gst_pad_connect(gst_element_get_pad(disksrc,"src"), gst_element_get_pad(typefind,"sink")); diff --git a/tests/old/examples/xml/createxml.c b/tests/old/examples/xml/createxml.c index e3cfa4e..92baeb7 100644 --- a/tests/old/examples/xml/createxml.c +++ b/tests/old/examples/xml/createxml.c @@ -32,12 +32,12 @@ int main(int argc,char *argv[]) //thread = gst_thread_new("thread"); thread = gst_elementfactory_make("thread", "thread"); g_assert(thread != NULL); - g_signal_connectc (G_OBJECT (thread), "object_saved", object_saved, g_strdup ("decoder thread"), FALSE); + g_signal_connect (G_OBJECT (thread), "object_saved", object_saved, g_strdup ("decoder thread")); thread2 = gst_elementfactory_make("thread", "thread2"); //thread2 = gst_thread_new("thread2"); g_assert(thread2 != NULL); - g_signal_connectc (G_OBJECT (thread2), "object_saved", object_saved, g_strdup ("render thread"), FALSE); + g_signal_connect (G_OBJECT (thread2), "object_saved", object_saved, g_strdup ("render thread")); /* create a new bin to hold the elements */ bin = gst_bin_new("bin"); diff --git a/tests/old/examples/xml/runxml.c b/tests/old/examples/xml/runxml.c index 4fbaf2a..76a71bc 100644 --- a/tests/old/examples/xml/runxml.c +++ b/tests/old/examples/xml/runxml.c @@ -35,7 +35,7 @@ int main(int argc,char *argv[]) xml = gst_xml_new (); - g_signal_connectc (G_OBJECT (xml), "object_loaded", xml_loaded, xml, FALSE); + g_signal_connect (G_OBJECT (xml), "object_loaded", xml_loaded, xml); ret = gst_xml_parse_file(xml, "xmlTest.gst", NULL); g_assert (ret == TRUE); diff --git a/tests/paranoia.c b/tests/paranoia.c index b3642a1..45128c6 100644 --- a/tests/paranoia.c +++ b/tests/paranoia.c @@ -40,8 +40,8 @@ int main(int argc,char *argv[]) { gst_element_connect(paranoia,"src",queue,"sink"); gst_element_connect(queue,"src",audio_thread,"sink"); - g_signal_connectc(G_OBJECT(gst_element_get_pad(paranoia,"src")),"eos", - G_CALLBACK(paranoia_eos),NULL,FALSE); + g_signal_connect(G_OBJECT(gst_element_get_pad(paranoia,"src")),"eos", + G_CALLBACK(paranoia_eos),NULL); gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING); if (GST_STATE(paranoia) != GST_STATE_PLAYING) fprintf(stderr,"error: state not set\n"); diff --git a/tests/sched/runxml.c b/tests/sched/runxml.c index 284e316..38a6309 100644 --- a/tests/sched/runxml.c +++ b/tests/sched/runxml.c @@ -54,8 +54,8 @@ int main(int argc,char *argv[]) src = gst_bin_get_by_name (GST_BIN (bin), "fakesrc"); if (src) { - g_signal_connectc (G_OBJECT(src), "handoff", - G_CALLBACK(buffer_handoff_src), bin,FALSE); + g_signal_connect (G_OBJECT(src), "handoff", + G_CALLBACK(buffer_handoff_src), bin); } else { g_print ("could not find src element\n"); @@ -64,8 +64,8 @@ int main(int argc,char *argv[]) sink = gst_bin_get_by_name (GST_BIN (bin), "fakesink"); if (sink) { - g_signal_connectc (G_OBJECT(sink), "handoff", - G_CALLBACK(buffer_handoff_sink), bin,FALSE); + g_signal_connect (G_OBJECT(sink), "handoff", + G_CALLBACK(buffer_handoff_sink), bin); } else { g_print ("could not find sink element\n"); diff --git a/tests/states.c b/tests/states.c index 34a54dd..70aec3f 100644 --- a/tests/states.c +++ b/tests/states.c @@ -25,16 +25,16 @@ int main(int argc,char *argv[]) { bin = gst_bin_new("bin"); g_return_val_if_fail(1,bin != NULL); - g_signal_connectc (G_OBJECT(src),"state_change", - G_CALLBACK(state_change),NULL,FALSE); - g_signal_connectc (G_OBJECT(subbin),"state_change", - G_CALLBACK(state_change),NULL,FALSE); - g_signal_connectc (G_OBJECT(filter),"state_change", - G_CALLBACK(state_change),NULL,FALSE); - g_signal_connectc (G_OBJECT(sink),"state_change", - G_CALLBACK(state_change),NULL,FALSE); - g_signal_connectc (G_OBJECT(bin),"state_change", - G_CALLBACK(state_change),NULL,FALSE); + g_signal_connect (G_OBJECT(src),"state_change", + G_CALLBACK(state_change),NULL); + g_signal_connect (G_OBJECT(subbin),"state_change", + G_CALLBACK(state_change),NULL); + g_signal_connect (G_OBJECT(filter),"state_change", + G_CALLBACK(state_change),NULL); + g_signal_connect (G_OBJECT(sink),"state_change", + G_CALLBACK(state_change),NULL); + g_signal_connect (G_OBJECT(bin),"state_change", + G_CALLBACK(state_change),NULL); g_print("STATES: element '%s' starts at state %d(%s)\n",gst_element_get_name(src), GST_STATE(src),gst_element_statename(GST_STATE(src))); -- 2.7.4