Updates for the gst_pad_push changes

Original commit message from CVS:
Updates for the gst_pad_push changes

diff --git a/test/Makefile.am b/test/Makefile.am
index dceff9d..36e1cff 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,7 +4,7 @@ noinst_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \
                  aviparse vidcapture avi2mpg mp2tomp1 mp1tomp1 pipetest \
                  vidcapture2 mp2toavi mp3tovorbis
 
-SUBDIRS = xml cothreads bindings
+SUBDIRS = xml bindings
 
 CFLAGS = -Wall $(shell gnome-config --cflags gnomeui)
 LDFLAGS = $(shell gnome-config --libs gnomeui)

diff --git a/test/ac3parse.c b/test/ac3parse.c
index f0bd0cb..e83b92a 100644 (file)
--- a/test/ac3parse.c
+++ b/test/ac3parse.c
@@ -48,8 +48,9 @@ int main(int argc,char *argv[]) {
 
   g_print("setting to READY state\n");
   gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_READY);
+  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   g_print("about to enter loop\n");
   while (1)
-    gst_src_push(GST_SRC(src));
+    gst_bin_iterate(GST_BIN(pipeline));
 }

diff --git a/test/avi2mpg.c b/test/avi2mpg.c
index 37a63d0..be4f4d1 100644 (file)
--- a/test/avi2mpg.c
+++ b/test/avi2mpg.c
@@ -173,11 +173,11 @@ int main(int argc,char *argv[]) {
                   gst_element_get_pad(fdsink,"sink"));
 
   g_print("setting to READY state\n");
-  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_READY);
+  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   g_print("about to enter loop\n");
 
-  g_idle_add(idle_func,src);
+  g_idle_add(idle_func,pipeline);
 
   gdk_threads_enter();
   gtk_main();
@@ -187,6 +187,6 @@ int main(int argc,char *argv[]) {
 }
 
 gboolean idle_func(gpointer data) {
-  gst_src_push(GST_SRC(data));
+  gst_bin_iterate(GST_BIN(data));
   return TRUE;
 }

diff --git a/test/aviparse.c b/test/aviparse.c
index 9f2d464..2fb8c24 100644 (file)
--- a/test/aviparse.c
+++ b/test/aviparse.c
@@ -134,7 +134,7 @@ int main(int argc,char *argv[]) {
   g_print("about to enter loop\n");
 
   // this does not work due to multithreading
-  g_idle_add(idle_func,src);
+  g_idle_add(idle_func,pipeline);
 
   gdk_threads_enter();
   gtk_main();
@@ -144,6 +144,6 @@ int main(int argc,char *argv[]) {
 }
 
 gboolean idle_func(gpointer data) {
-  gst_src_push(GST_SRC(data));
+  gst_bin_iterate(GST_BIN(data));
   return TRUE;
 }

diff --git a/test/dvdcat.c b/test/dvdcat.c
index bbc81f3..32f0f37 100644 (file)
--- a/test/dvdcat.c
+++ b/test/dvdcat.c
@@ -41,5 +41,5 @@ int main(int argc,char *argv[]) {
   gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   while (1)
-    gst_src_push(GST_SRC(src));
+    gst_bin_iterate(GST_BIN(pipeline));
 }

diff --git a/test/mp1parse.c b/test/mp1parse.c
index 5ffe003..dba5595 100644 (file)
--- a/test/mp1parse.c
+++ b/test/mp1parse.c
@@ -170,7 +170,7 @@ int main(int argc,char *argv[]) {
 
   g_print("about to enter loop\n");
 
-  g_idle_add(idle_func,src);
+  g_idle_add(idle_func,pipeline);
 
   gdk_threads_enter();
   gtk_main();
@@ -180,6 +180,6 @@ int main(int argc,char *argv[]) {
 }
 
 gboolean idle_func(gpointer data) {
-  gst_src_push(GST_SRC(data));
+  gst_bin_iterate(GST_BIN(data));
   return TRUE;
 }

diff --git a/test/mp1tomp1.c b/test/mp1tomp1.c
index ab20813..0d63f34 100644 (file)
--- a/test/mp1tomp1.c
+++ b/test/mp1tomp1.c
@@ -210,9 +210,9 @@ int main(int argc,char *argv[]) {
                   gst_element_get_pad(parse,"sink"));
 
   g_print("setting to READY state\n");
-  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_READY);
+  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   while (1) {
-    gst_src_push(GST_SRC(src));
+    gst_bin_iterate(GST_BIN(pipeline));
   }
 }

diff --git a/test/mp2toavi.c b/test/mp2toavi.c
index cc2d5fc..32b94de 100644 (file)
--- a/test/mp2toavi.c
+++ b/test/mp2toavi.c
@@ -283,9 +283,9 @@ int main(int argc,char *argv[]) {
                   gst_element_get_pad(fdsink,"sink"));
 
   g_print("setting to READY state\n");
-  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_READY);
+  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   while (1) {
-    gst_src_push(GST_SRC(src));
+    gst_bin_iterate(GST_BIN(pipeline));
   }
 }

diff --git a/test/mp2tomp1.c b/test/mp2tomp1.c
index 1340edb..cca6b42 100644 (file)
--- a/test/mp2tomp1.c
+++ b/test/mp2tomp1.c
@@ -270,10 +270,10 @@ int main(int argc,char *argv[]) {
                   gst_element_get_pad(fdsink,"sink"));
 
   g_print("setting to READY state\n");
-  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_READY);
+  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   while (1) {
-    gst_src_push(GST_SRC(src));
+    gst_bin_iterate(GST_BIN(pipeline));
   }
 
   return 0;

diff --git a/test/mp3.c b/test/mp3.c
index 036aeea..2b7c696 100644 (file)
--- a/test/mp3.c
+++ b/test/mp3.c
@@ -57,7 +57,7 @@ int main(int argc,char *argv[]) {
   gst_element_set_state(GST_ELEMENT(bin),GST_STATE_PLAYING);
 
   while (playing)
-    gst_src_push(GST_SRC(src));
+    gst_bin_iterate(GST_BIN(bin));
 
   return 0;
 }

diff --git a/test/mp3parse.c b/test/mp3parse.c
index 03e7047..d7dddc5 100644 (file)
--- a/test/mp3parse.c
+++ b/test/mp3parse.c
@@ -59,5 +59,5 @@ int main(int argc,char *argv[]) {
 
   g_print("about to enter loop\n");
   while (1)
-    gst_src_push(GST_SRC(src));
+    gst_bin_iterate(GST_BIN(pipeline));
 }

diff --git a/test/mp3play.c b/test/mp3play.c
index e3f71db..fec0983 100644 (file)
--- a/test/mp3play.c
+++ b/test/mp3play.c
@@ -58,9 +58,10 @@ int main(int argc,char *argv[]) {
 
   g_print("setting to READY state\n");
   gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_READY);
+  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   g_print("about to enter loop\n");
   while (1) {
-    gst_src_push(GST_SRC(src));
-       }
+    gst_bin_iterate(GST_BIN(pipeline));
+  }
 }

diff --git a/test/mp3tovorbis.c b/test/mp3tovorbis.c
index cf8ba5c..2587745 100644 (file)
--- a/test/mp3tovorbis.c
+++ b/test/mp3tovorbis.c
@@ -68,10 +68,10 @@ int main(int argc,char *argv[]) {
                   gst_element_get_pad(sink,"sink"));
 
   g_print("setting to READY state\n");
-  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_READY);
+  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   g_print("about to enter loop\n");
   while (1) {
-    gst_src_push(GST_SRC(src));
+    gst_bin_iterate(GST_BIN(pipeline));
   }
 }

diff --git a/test/mpeg2parse.c b/test/mpeg2parse.c
index 32f4c8c..d0fed19 100644 (file)
--- a/test/mpeg2parse.c
+++ b/test/mpeg2parse.c
@@ -8,7 +8,7 @@ void eof(GstSrc *src) {
 }
 
 gboolean idle_func(gpointer data) {
-  gst_src_push(GST_SRC(data));
+  gst_bin_iterate(GST_BIN(data));
   return TRUE;
 }
 
@@ -220,7 +220,7 @@ int main(int argc,char *argv[]) {
   gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_READY);
   gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
-  gtk_idle_add(idle_func,src);
+  gtk_idle_add(idle_func,pipeline);
 
   gdk_threads_enter();
   gtk_main();

diff --git a/test/pipetest.c b/test/pipetest.c
index 74f23b6..50fd223 100644 (file)
--- a/test/pipetest.c
+++ b/test/pipetest.c
@@ -55,10 +55,10 @@ int main(int argc,char *argv[]) {
                   gst_element_get_pad(sink,"sink"));
 
   g_print("setting to READY state\n");
-  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_READY);
+  gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   g_print("about to enter loop\n");
   while (1) {
-    gst_src_push(GST_SRC(src));
+    gst_bin_iterate(GST_BIN(pipeline));
   }
 }

diff --git a/test/record.c b/test/record.c
index 9000145..50726aa 100644 (file)
--- a/test/record.c
+++ b/test/record.c
@@ -37,7 +37,8 @@ int main(int argc,char *argv[]) {
   g_print("\nok, runnable, hitting 'play'...\n");
   gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
-  while(1)
-    gst_src_push(GST_SRC(audiosrc));
+  while(1) {
+    gst_bin_iterate(GST_BIN(pipeline));
+  }
 }
 

diff --git a/test/spectrum.c b/test/spectrum.c
index 107b429..767deab 100644 (file)
--- a/test/spectrum.c
+++ b/test/spectrum.c
@@ -77,6 +77,6 @@ void spectrum_chain(GstPad *pad,GstBuffer *buf) {
 }
 
 gboolean idle_func(gpointer data) {
-  gst_src_push(GST_SRC(data));
+  //gst_src_push(GST_SRC(data));
   return TRUE;
 }

diff --git a/test/vidcapture.c b/test/vidcapture.c
index 90f38b0..738588a 100644 (file)
--- a/test/vidcapture.c
+++ b/test/vidcapture.c
@@ -76,6 +76,6 @@ int main(int argc,char *argv[]) {
   gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   while(1)
-    gst_src_push(GST_SRC(videosrc));
+    gst_bin_iterate(GST_BIN(pipeline));
 }
 

diff --git a/test/vidcapture2.c b/test/vidcapture2.c
index 8dc9474..b4a83bf 100644 (file)
--- a/test/vidcapture2.c
+++ b/test/vidcapture2.c
@@ -77,6 +77,6 @@ int main(int argc,char *argv[]) {
   gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING);
 
   while(1)
-    gst_src_push(GST_SRC(videosrc));
+    gst_bin_iterate(GST_BIN(pipeline));
 }
 

diff --git a/test/videotest.c b/test/videotest.c
index 74ba9d3..2012e3c 100644 (file)
--- a/test/videotest.c
+++ b/test/videotest.c
@@ -72,7 +72,7 @@ int main(int argc,char *argv[]) {
   gst_element_set_state(GST_ELEMENT(bin),GST_STATE_PLAYING);
 
   //gtk_object_set(GTK_OBJECT(src),"tune",133250,NULL);
-  g_idle_add(idle_func,src);
+  g_idle_add(idle_func,bin);
 
   gtk_main();
 }
@@ -80,6 +80,6 @@ int main(int argc,char *argv[]) {
 gboolean idle_func(gpointer data) {
   static int i=0;
   //g_print("pushing %d\n",i++);
-  gst_src_push(GST_SRC(data));
+  gst_bin_iterate(GST_BIN(data));
   return TRUE;
 }

diff --git a/test/wave.c b/test/wave.c
index c92dea1..cacfd03 100644 (file)
--- a/test/wave.c
+++ b/test/wave.c
@@ -48,12 +48,12 @@ int main(int argc,char *argv[]) {
   gst_element_set_state(GST_ELEMENT(bin),GST_STATE_READY);
   gst_element_set_state(GST_ELEMENT(bin),GST_STATE_PLAYING);
 
-  g_idle_add(idle_func,src);
+  g_idle_add(idle_func,bin);
 
   gtk_main();
 }
 
 gboolean idle_func(gpointer data) {
-  gst_src_push(GST_SRC(data));
+  gst_bin_iterate(GST_BIN(data));
   return TRUE;
 }

diff --git a/test/xml/createreg.c b/test/xml/createreg.c
index fc93c76..7ca3514 100644 (file)
--- a/test/xml/createreg.c
+++ b/test/xml/createreg.c
@@ -42,7 +42,7 @@ int main(int argc,char *argv[]) {
       subtree = xmlNewChild(tree,NULL,"longname",
                             element->details->longname);
       subtree = xmlNewChild(tree,NULL,"class",
-                            element->details->class);
+                            element->details->klass);
       subtree = xmlNewChild(tree,NULL,"description",
                             element->details->description);
       subtree = xmlNewChild(tree,NULL,"version",

diff --git a/test/xml/readreg.c b/test/xml/readreg.c
index 4a04f13..8db054b 100644 (file)
--- a/test/xml/readreg.c
+++ b/test/xml/readreg.c
@@ -88,7 +88,7 @@ int main(int argc,char *argv[]) {
         else if (!strcmp(field->name,"longname"))
           element->details.longname = getcontents(doc,field);
         else if (!strcmp(field->name,"class"))
-          element->details.class = getcontents(doc,field);
+          element->details.klass = getcontents(doc,field);
         else if (!strcmp(field->name,"description"))
           element->details.description = getcontents(doc,field);
         else if (!strcmp(field->name,"version"))
@@ -117,7 +117,7 @@ int main(int argc,char *argv[]) {
         g_print("Plugin filename: %s\n",element->plugin->filename);
         g_print("Element name: %s\n",element->name);
         g_print("Element long name: %s\n",element->details.longname);
-        g_print("Element class: %s\n",element->details.class);
+        g_print("Element class: %s\n",element->details.klass);
         g_print("Element description: %s\n",element->details.description);
         g_print("Element version: %s\n",element->details.version);
         g_print("Element author: %s\n",element->details.author);