diff --git a/examples/Makefile.am b/examples/Makefile.am index a970883560..7d5a43860f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -8,4 +8,6 @@ endif SUBDIRS = $(GNOME_SUBDS) \ helloworld helloworld2 \ queue queue2 queue3 queue4 \ - launch thread xml plugins typefind mixer + launch thread xml typefind mixer + +DIST_SUBDIRS = autoplug plugins diff --git a/examples/helloworld/helloworld.c b/examples/helloworld/helloworld.c index 9e3f93e783..74e2a4faaa 100644 --- a/examples/helloworld/helloworld.c +++ b/examples/helloworld/helloworld.c @@ -27,9 +27,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos),NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos),NULL,FALSE); /* 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 19e0b1e443..fc1dcd1459 100644 --- a/examples/helloworld2/helloworld2.c +++ b/examples/helloworld2/helloworld2.c @@ -32,9 +32,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos),NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos),NULL,FALSE); /* and an audio sink */ osssink = gst_elementfactory_make("osssink", "play_audio"); diff --git a/examples/mixer/mixer.c b/examples/mixer/mixer.c index 4461d4796c..998bafb337 100644 --- a/examples/mixer/mixer.c +++ b/examples/mixer/mixer.c @@ -270,14 +270,14 @@ create_input_channel (int id, char* location) g_assert(channel->disksrc != NULL); GST_DEBUG(0, "c_i_p : setting location\n"); - gtk_object_set(GTK_OBJECT(channel->disksrc),"location", location, NULL); + g_object_set(G_OBJECT(channel->disksrc),"location", location, NULL); /* add disksrc to the bin before autoplug */ gst_bin_add(GST_BIN(channel->pipe), channel->disksrc); /* connect signal to eos of disksrc */ - gtk_signal_connect(GTK_OBJECT(channel->disksrc),"eos", - GTK_SIGNAL_FUNC(eos),NULL); + g_signal_connectc (G_OBJECT(channel->disksrc),"eos", + G_CALLBACK(eos),NULL,FALSE); #ifdef DEBUG @@ -395,7 +395,7 @@ void env_register_cp (GstElement *volenv, double cp_time, double cp_level) char buffer[30]; sprintf (buffer, "%f:%f", cp_time, cp_level); - gtk_object_set(GTK_OBJECT(volenv), "controlpoint", buffer, NULL); + g_object_set(G_OBJECT(volenv), "controlpoint", buffer, NULL); } diff --git a/examples/queue/queue.c b/examples/queue/queue.c index 7137f114b3..763a0358a8 100644 --- a/examples/queue/queue.c +++ b/examples/queue/queue.c @@ -25,7 +25,7 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); parse = gst_elementfactory_make("mp3parse", "parse"); decode = gst_elementfactory_make("mpg123", "decode"); diff --git a/examples/queue2/queue2.c b/examples/queue2/queue2.c index 837732e4c9..19d4478371 100644 --- a/examples/queue2/queue2.c +++ b/examples/queue2/queue2.c @@ -35,9 +35,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos), thread); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc (G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread, FALSE); queue = gst_elementfactory_make("queue", "queue"); diff --git a/examples/queue3/queue3.c b/examples/queue3/queue3.c index 152cd1e30a..fbc2dcdb6e 100644 --- a/examples/queue3/queue3.c +++ b/examples/queue3/queue3.c @@ -35,9 +35,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos), thread); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread, FALSE); queue = gst_elementfactory_make("queue", "queue"); diff --git a/examples/queue4/queue4.c b/examples/queue4/queue4.c index cb984cc7bc..896a54b69a 100644 --- a/examples/queue4/queue4.c +++ b/examples/queue4/queue4.c @@ -37,9 +37,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos), thread); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread, FALSE); 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 5c691a0fa2..afc3892ade 100644 --- a/examples/thread/thread.c +++ b/examples/thread/thread.c @@ -36,9 +36,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos), thread); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread, FALSE); /* and an audio sink */ osssink = gst_elementfactory_make("osssink", "play_audio"); diff --git a/examples/typefind/typefind.c b/examples/typefind/typefind.c index 4e19f268c6..a69a296a60 100644 --- a/examples/typefind/typefind.c +++ b/examples/typefind/typefind.c @@ -34,7 +34,7 @@ main(int argc, char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); typefind = gst_elementfactory_make("typefind", "typefind"); g_assert(typefind != NULL); @@ -43,8 +43,8 @@ main(int argc, char *argv[]) gst_bin_add(GST_BIN(bin), disksrc); gst_bin_add(GST_BIN(bin), typefind); - gtk_signal_connect (GTK_OBJECT (typefind), "have_type", - type_found, NULL); + g_signal_connectc (G_OBJECT (typefind), "have_type", + type_found, NULL, FALSE); 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 ce8b395495..e3cfa4e599 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); - gtk_signal_connect (GTK_OBJECT (thread), "object_saved", object_saved, g_strdup ("decoder thread")); + g_signal_connectc (G_OBJECT (thread), "object_saved", object_saved, g_strdup ("decoder thread"), FALSE); thread2 = gst_elementfactory_make("thread", "thread2"); //thread2 = gst_thread_new("thread2"); g_assert(thread2 != NULL); - gtk_signal_connect (GTK_OBJECT (thread2), "object_saved", object_saved, g_strdup ("render thread")); + g_signal_connectc (G_OBJECT (thread2), "object_saved", object_saved, g_strdup ("render thread"), FALSE); /* create a new bin to hold the elements */ bin = gst_bin_new("bin"); @@ -46,7 +46,7 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); queue = gst_elementfactory_make("queue", "queue"); queue2 = gst_elementfactory_make("queue", "queue2"); diff --git a/examples/xml/runxml.c b/examples/xml/runxml.c index 400e82559b..4fbaf2a599 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 (); - gtk_signal_connect (GTK_OBJECT (xml), "object_loaded", xml_loaded, xml); + g_signal_connectc (G_OBJECT (xml), "object_loaded", xml_loaded, xml, FALSE); ret = gst_xml_parse_file(xml, "xmlTest.gst", NULL); g_assert (ret == TRUE); diff --git a/tests/old/examples/Makefile.am b/tests/old/examples/Makefile.am index a970883560..7d5a43860f 100644 --- a/tests/old/examples/Makefile.am +++ b/tests/old/examples/Makefile.am @@ -8,4 +8,6 @@ endif SUBDIRS = $(GNOME_SUBDS) \ helloworld helloworld2 \ queue queue2 queue3 queue4 \ - launch thread xml plugins typefind mixer + launch thread xml typefind mixer + +DIST_SUBDIRS = autoplug plugins diff --git a/tests/old/examples/helloworld/helloworld.c b/tests/old/examples/helloworld/helloworld.c index 9e3f93e783..74e2a4faaa 100644 --- a/tests/old/examples/helloworld/helloworld.c +++ b/tests/old/examples/helloworld/helloworld.c @@ -27,9 +27,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos),NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos),NULL,FALSE); /* now it's time to get the parser */ parse = gst_elementfactory_make("mp3parse","parse"); diff --git a/tests/old/examples/helloworld2/helloworld2.c b/tests/old/examples/helloworld2/helloworld2.c index 19e0b1e443..fc1dcd1459 100644 --- a/tests/old/examples/helloworld2/helloworld2.c +++ b/tests/old/examples/helloworld2/helloworld2.c @@ -32,9 +32,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos),NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos),NULL,FALSE); /* and an audio sink */ osssink = gst_elementfactory_make("osssink", "play_audio"); diff --git a/tests/old/examples/mixer/mixer.c b/tests/old/examples/mixer/mixer.c index 4461d4796c..998bafb337 100644 --- a/tests/old/examples/mixer/mixer.c +++ b/tests/old/examples/mixer/mixer.c @@ -270,14 +270,14 @@ create_input_channel (int id, char* location) g_assert(channel->disksrc != NULL); GST_DEBUG(0, "c_i_p : setting location\n"); - gtk_object_set(GTK_OBJECT(channel->disksrc),"location", location, NULL); + g_object_set(G_OBJECT(channel->disksrc),"location", location, NULL); /* add disksrc to the bin before autoplug */ gst_bin_add(GST_BIN(channel->pipe), channel->disksrc); /* connect signal to eos of disksrc */ - gtk_signal_connect(GTK_OBJECT(channel->disksrc),"eos", - GTK_SIGNAL_FUNC(eos),NULL); + g_signal_connectc (G_OBJECT(channel->disksrc),"eos", + G_CALLBACK(eos),NULL,FALSE); #ifdef DEBUG @@ -395,7 +395,7 @@ void env_register_cp (GstElement *volenv, double cp_time, double cp_level) char buffer[30]; sprintf (buffer, "%f:%f", cp_time, cp_level); - gtk_object_set(GTK_OBJECT(volenv), "controlpoint", buffer, NULL); + g_object_set(G_OBJECT(volenv), "controlpoint", buffer, NULL); } diff --git a/tests/old/examples/queue/queue.c b/tests/old/examples/queue/queue.c index 7137f114b3..763a0358a8 100644 --- a/tests/old/examples/queue/queue.c +++ b/tests/old/examples/queue/queue.c @@ -25,7 +25,7 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); parse = gst_elementfactory_make("mp3parse", "parse"); decode = gst_elementfactory_make("mpg123", "decode"); diff --git a/tests/old/examples/queue2/queue2.c b/tests/old/examples/queue2/queue2.c index 837732e4c9..19d4478371 100644 --- a/tests/old/examples/queue2/queue2.c +++ b/tests/old/examples/queue2/queue2.c @@ -35,9 +35,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos), thread); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc (G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread, FALSE); queue = gst_elementfactory_make("queue", "queue"); diff --git a/tests/old/examples/queue3/queue3.c b/tests/old/examples/queue3/queue3.c index 152cd1e30a..fbc2dcdb6e 100644 --- a/tests/old/examples/queue3/queue3.c +++ b/tests/old/examples/queue3/queue3.c @@ -35,9 +35,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos), thread); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread, FALSE); queue = gst_elementfactory_make("queue", "queue"); diff --git a/tests/old/examples/queue4/queue4.c b/tests/old/examples/queue4/queue4.c index cb984cc7bc..896a54b69a 100644 --- a/tests/old/examples/queue4/queue4.c +++ b/tests/old/examples/queue4/queue4.c @@ -37,9 +37,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos), thread); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread, FALSE); 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 5c691a0fa2..afc3892ade 100644 --- a/tests/old/examples/thread/thread.c +++ b/tests/old/examples/thread/thread.c @@ -36,9 +36,9 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); - gtk_signal_connect(GTK_OBJECT(disksrc),"eos", - GTK_SIGNAL_FUNC(eos), thread); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); + g_signal_connectc(G_OBJECT(disksrc),"eos", + G_CALLBACK(eos), thread, FALSE); /* 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 4e19f268c6..a69a296a60 100644 --- a/tests/old/examples/typefind/typefind.c +++ b/tests/old/examples/typefind/typefind.c @@ -34,7 +34,7 @@ main(int argc, char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); typefind = gst_elementfactory_make("typefind", "typefind"); g_assert(typefind != NULL); @@ -43,8 +43,8 @@ main(int argc, char *argv[]) gst_bin_add(GST_BIN(bin), disksrc); gst_bin_add(GST_BIN(bin), typefind); - gtk_signal_connect (GTK_OBJECT (typefind), "have_type", - type_found, NULL); + g_signal_connectc (G_OBJECT (typefind), "have_type", + type_found, NULL, FALSE); 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 ce8b395495..e3cfa4e599 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); - gtk_signal_connect (GTK_OBJECT (thread), "object_saved", object_saved, g_strdup ("decoder thread")); + g_signal_connectc (G_OBJECT (thread), "object_saved", object_saved, g_strdup ("decoder thread"), FALSE); thread2 = gst_elementfactory_make("thread", "thread2"); //thread2 = gst_thread_new("thread2"); g_assert(thread2 != NULL); - gtk_signal_connect (GTK_OBJECT (thread2), "object_saved", object_saved, g_strdup ("render thread")); + g_signal_connectc (G_OBJECT (thread2), "object_saved", object_saved, g_strdup ("render thread"), FALSE); /* create a new bin to hold the elements */ bin = gst_bin_new("bin"); @@ -46,7 +46,7 @@ int main(int argc,char *argv[]) /* create a disk reader */ disksrc = gst_elementfactory_make("disksrc", "disk_source"); g_assert(disksrc != NULL); - gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); + g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL); queue = gst_elementfactory_make("queue", "queue"); queue2 = gst_elementfactory_make("queue", "queue2"); diff --git a/tests/old/examples/xml/runxml.c b/tests/old/examples/xml/runxml.c index 400e82559b..4fbaf2a599 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 (); - gtk_signal_connect (GTK_OBJECT (xml), "object_loaded", xml_loaded, xml); + g_signal_connectc (G_OBJECT (xml), "object_loaded", xml_loaded, xml, FALSE); ret = gst_xml_parse_file(xml, "xmlTest.gst", NULL); g_assert (ret == TRUE);