for i in `find . -name *.[ch]`; do perl -n -i -p -e 's/disksrc/filesrc/g;' $i; done

Original commit message from CVS:
for i in `find . -name *.[ch]`; do perl -n -i -p -e 's/disksrc/filesrc/g;' $i; done

diff --git a/examples/autoplug/autoplug.c b/examples/autoplug/autoplug.c
index 9de5ba5..4fef339 100644 (file)
--- a/examples/autoplug/autoplug.c
+++ b/examples/autoplug/autoplug.c
@@ -17,14 +17,14 @@ gst_play_have_type (GstElement *typefind, GstCaps *caps, GstElement *pipeline)
   GstAutoplug *autoplug;
   GtkWidget *socket;
   GstElement *autobin;
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *cache;
 
   GST_DEBUG (0,"GstPipeline: play have type\n");
 
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
   autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
   cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
 
@@ -109,7 +109,7 @@ static void
 gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 {
   GstElement *autobin;
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *cache;
   GstElement *new_element;
 
@@ -117,15 +117,15 @@ gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
   autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
   cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
   new_element = gst_bin_get_by_name (GST_BIN (autobin), "new_element");
 
-  gst_element_disconnect (disksrc, "src", cache, "sink");
+  gst_element_disconnect (filesrc, "src", cache, "sink");
   gst_element_disconnect (cache, "src", new_element, "sink");
   gst_bin_remove (GST_BIN (autobin), cache);
-  gst_element_connect (disksrc, "src", new_element, "sink");
+  gst_element_connect (filesrc, "src", new_element, "sink");
 
   gst_element_set_state (pipeline, GST_STATE_PLAYING);
 
@@ -134,7 +134,7 @@ gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *pipeline;
   GstElement *autobin;
   GstElement *typefind;
@@ -154,10 +154,10 @@ int main(int argc,char *argv[])
   g_assert(pipeline != NULL);
 
   /* 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);
-  gst_bin_add (GST_BIN (pipeline), disksrc);
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  gtk_object_set(GTK_OBJECT(filesrc),"location", argv[1],NULL);
+  gst_bin_add (GST_BIN (pipeline), filesrc);
 
   autobin = gst_bin_new ("autobin");
   cache = gst_elementfactory_make ("autoplugcache", "cache");
@@ -172,7 +172,7 @@ int main(int argc,char *argv[])
   gst_element_add_ghost_pad (autobin, gst_element_get_pad (cache, "sink"), "sink");
 
   gst_bin_add (GST_BIN( pipeline), autobin);
-  gst_element_connect (disksrc, "src", autobin, "sink");
+  gst_element_connect (filesrc, "src", autobin, "sink");
 
   /* start playing */
   gst_element_set_state( GST_ELEMENT (pipeline), GST_STATE_PLAYING);

diff --git a/examples/helloworld/helloworld.c b/examples/helloworld/helloworld.c
index adb71e6..c1ae980 100644 (file)
--- a/examples/helloworld/helloworld.c
+++ b/examples/helloworld/helloworld.c
@@ -13,7 +13,7 @@ void eos(GstElement *element)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *bin, *disksrc, *parse, *decoder, *downmix, *mulaw, *mulawdec, *osssink;
+  GstElement *bin, *filesrc, *parse, *decoder, *downmix, *mulaw, *mulawdec, *osssink;
 
   gst_init(&argc,&argv);
 
@@ -26,9 +26,9 @@ int main(int argc,char *argv[])
   bin = gst_pipeline_new("pipeline");
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect(G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect(G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos),NULL);
 
   /* now it's time to get the parser */
@@ -41,7 +41,7 @@ int main(int argc,char *argv[])
   osssink = gst_elementfactory_make("osssink", "play_audio");
 
   /* add objects to the main pipeline */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), parse);
   gst_bin_add(GST_BIN(bin), decoder);
   gst_bin_add(GST_BIN(bin), downmix);
@@ -50,7 +50,7 @@ int main(int argc,char *argv[])
   gst_bin_add(GST_BIN(bin), osssink);
 
   /* connect src to sink */
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(parse,"sink"));
   gst_pad_connect(gst_element_get_pad(parse,"src"),
                   gst_element_get_pad(decoder,"sink"));
@@ -81,7 +81,7 @@ int main(int argc,char *argv[])
   gst_object_destroy(GST_OBJECT(downmix));
   gst_object_destroy(GST_OBJECT(mulaw));
   gst_object_destroy(GST_OBJECT(mulawdec));
-  gst_object_destroy(GST_OBJECT(disksrc));
+  gst_object_destroy(GST_OBJECT(filesrc));
   gst_object_destroy(GST_OBJECT(bin));
 
   exit(0);

diff --git a/examples/helloworld2/helloworld2.c b/examples/helloworld2/helloworld2.c
index 3f3faa8..c98f6bf 100644 (file)
--- a/examples/helloworld2/helloworld2.c
+++ b/examples/helloworld2/helloworld2.c
@@ -7,14 +7,14 @@ gst_play_have_type (GstElement *typefind, GstCaps *caps, GstElement *pipeline)
   GstElement *new_element;
   GstAutoplug *autoplug;
   GstElement *autobin;
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *cache;
 
   GST_DEBUG (0,"GstPipeline: play have type\n");
 
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
   autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
   cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
 
@@ -54,7 +54,7 @@ static void
 gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 {
   GstElement *autobin;
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *cache;
   GstElement *new_element;
 
@@ -62,15 +62,15 @@ gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
   autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
   cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
   new_element = gst_bin_get_by_name (GST_BIN (autobin), "new_element");
 
-  gst_element_disconnect (disksrc, "src", cache, "sink");
+  gst_element_disconnect (filesrc, "src", cache, "sink");
   gst_element_disconnect (cache, "src", new_element, "sink");
   gst_bin_remove (GST_BIN (autobin), cache);
-  gst_element_connect (disksrc, "src", new_element, "sink");
+  gst_element_connect (filesrc, "src", new_element, "sink");
 
   gst_element_set_state (pipeline, GST_STATE_PLAYING);
 
@@ -80,7 +80,7 @@ gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 int 
 main (int argc, char *argv[]) 
 {
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *pipeline;
   GstElement *autobin;
   GstElement *typefind;
@@ -98,10 +98,10 @@ main (int argc, char *argv[])
   g_assert (pipeline != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make ("disksrc", "disk_source");
-  g_assert (disksrc != NULL);
-  g_object_set (G_OBJECT (disksrc), "location", argv[1], NULL);
-  gst_bin_add (GST_BIN (pipeline), disksrc);
+  filesrc = gst_elementfactory_make ("filesrc", "disk_source");
+  g_assert (filesrc != NULL);
+  g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
+  gst_bin_add (GST_BIN (pipeline), filesrc);
 
   autobin = gst_bin_new ("autobin");
   cache = gst_elementfactory_make ("autoplugcache", "cache");
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
   gst_element_add_ghost_pad (autobin, gst_element_get_pad (cache, "sink"), "sink");
 
   gst_bin_add (GST_BIN( pipeline), autobin);
-  gst_element_connect (disksrc, "src", autobin, "sink");
+  gst_element_connect (filesrc, "src", autobin, "sink");
 
   /* start playing */
   gst_element_set_state( GST_ELEMENT (pipeline), GST_STATE_PLAYING);

diff --git a/examples/launch/mp3parselaunch.c b/examples/launch/mp3parselaunch.c
index 4ac3577..41c28e8 100644 (file)
--- a/examples/launch/mp3parselaunch.c
+++ b/examples/launch/mp3parselaunch.c
@@ -4,7 +4,7 @@ int
 main (int argc, char *argv[]) 
 {
   GstElement *pipeline;
-  GstElement *disksrc;
+  GstElement *filesrc;
 
   gst_init (&argc, &argv);
 
@@ -14,10 +14,10 @@ main (int argc, char *argv[])
   }
   pipeline = gst_pipeline_new ("my_pipeline");
 
-  gst_parse_launch ("disksrc[my_disksrc] ! mp3parse ! mpg123 ! osssink", GST_BIN (pipeline));
+  gst_parse_launch ("filesrc[my_filesrc] ! mp3parse ! mpg123 ! osssink", GST_BIN (pipeline));
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "my_disksrc");
-  g_object_set (G_OBJECT (disksrc), "location", argv[1], NULL);
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "my_filesrc");
+  g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
 
   gst_element_set_state (pipeline, GST_STATE_PLAYING);
 

diff --git a/examples/mixer/mixer.c b/examples/mixer/mixer.c
index 0f72231..f0dbfcd 100644 (file)
--- a/examples/mixer/mixer.c
+++ b/examples/mixer/mixer.c
@@ -264,20 +264,20 @@ create_input_channel (int id, char* location)
     
   /* create elements */
 
-  GST_DEBUG(0, "c_i_p : creating disksrc\n");
+  GST_DEBUG(0, "c_i_p : creating filesrc\n");
 
-  sprintf (buffer, "disksrc%d", id);
-  channel->disksrc = gst_elementfactory_make ("disksrc", buffer);
-  g_assert(channel->disksrc != NULL);    
+  sprintf (buffer, "filesrc%d", id);
+  channel->filesrc = gst_elementfactory_make ("filesrc", buffer);
+  g_assert(channel->filesrc != NULL);    
 
   GST_DEBUG(0, "c_i_p : setting location\n");
-  g_object_set(G_OBJECT(channel->disksrc),"location", location, NULL);
+  g_object_set(G_OBJECT(channel->filesrc),"location", location, NULL);
 
-  /* add disksrc to the bin before autoplug */
-  gst_bin_add(GST_BIN(channel->pipe), channel->disksrc);
+  /* add filesrc to the bin before autoplug */
+  gst_bin_add(GST_BIN(channel->pipe), channel->filesrc);
 
-  /* connect signal to eos of disksrc */
-  g_signal_connect (G_OBJECT(channel->disksrc),"eos",
+  /* connect signal to eos of filesrc */
+  g_signal_connect (G_OBJECT(channel->filesrc),"eos",
                      G_CALLBACK(eos),NULL);
 
 
@@ -296,7 +296,7 @@ create_input_channel (int id, char* location)
 #endif
 
 #ifdef WITH_BUG
-  srccaps = gst_play_typefind (GST_BIN (channel->pipe), channel->disksrc);
+  srccaps = gst_play_typefind (GST_BIN (channel->pipe), channel->filesrc);
 #endif
 #ifdef WITH_BUG2
   {
@@ -364,7 +364,7 @@ create_input_channel (int id, char* location)
   gst_bin_add (GST_BIN(channel->pipe), channel->volenv);
   gst_bin_add (GST_BIN (channel->pipe), new_element);
   
-  gst_element_connect (channel->disksrc, "src", new_element, "sink");
+  gst_element_connect (channel->filesrc, "src", new_element, "sink");
   gst_element_connect (new_element, "src_00", channel->volenv, "sink");
   
   /* add a ghost pad */

diff --git a/examples/mixer/mixer.h b/examples/mixer/mixer.h
index b967141..4cae18e 100644 (file)
--- a/examples/mixer/mixer.h
+++ b/examples/mixer/mixer.h
@@ -5,7 +5,7 @@
 
 typedef struct 
 {
-  GstElement *pipe, *disksrc, *volenv;
+  GstElement *pipe, *filesrc, *volenv;
   
   char *location;
   int channel_id;

diff --git a/examples/queue/queue.c b/examples/queue/queue.c
index 763a035..15dd327 100644 (file)
--- a/examples/queue/queue.c
+++ b/examples/queue/queue.c
@@ -3,7 +3,7 @@
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink, *parse, *decode, *queue;
+  GstElement *filesrc, *osssink, *parse, *decode, *queue;
   GstElement *bin;
   GstElement *thread;
 
@@ -23,9 +23,9 @@ int main(int argc,char *argv[])
   g_assert(bin != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
 
   parse = gst_elementfactory_make("mp3parse", "parse");
   decode = gst_elementfactory_make("mpg123", "decode");
@@ -37,7 +37,7 @@ int main(int argc,char *argv[])
   g_assert(osssink != NULL);
 
   /* add objects to the main pipeline */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), parse);
   gst_bin_add(GST_BIN(bin), decode);
   gst_bin_add(GST_BIN(bin), queue);
@@ -46,7 +46,7 @@ int main(int argc,char *argv[])
 
   gst_bin_add(GST_BIN(bin), thread);
   
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(parse,"sink"));
   gst_pad_connect(gst_element_get_pad(parse,"src"),
                   gst_element_get_pad(decode,"sink"));

diff --git a/examples/queue2/queue2.c b/examples/queue2/queue2.c
index f4b2a9a..f92eed4 100644 (file)
--- a/examples/queue2/queue2.c
+++ b/examples/queue2/queue2.c
@@ -13,7 +13,7 @@ void eos(GstElement *element, gpointer data)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink, *queue;
+  GstElement *filesrc, *osssink, *queue;
   GstElement *pipeline;
   GstElement *thread;
 
@@ -33,10 +33,10 @@ int main(int argc,char *argv[])
   g_assert(pipeline != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect (G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect (G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos), thread);
 
   queue = gst_elementfactory_make("queue", "queue");
@@ -47,7 +47,7 @@ int main(int argc,char *argv[])
 
   /* add objects to the main pipeline */
   /*
-  gst_pipeline_add_src(GST_PIPELINE(pipeline), disksrc);
+  gst_pipeline_add_src(GST_PIPELINE(pipeline), filesrc);
   gst_pipeline_add_sink(GST_PIPELINE(pipeline), queue);
 
   gst_bin_add(GST_BIN(thread), osssink);

diff --git a/examples/queue3/queue3.c b/examples/queue3/queue3.c
index 083b101..553846f 100644 (file)
--- a/examples/queue3/queue3.c
+++ b/examples/queue3/queue3.c
@@ -13,7 +13,7 @@ void eos(GstElement *element, gpointer data)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink, *queue, *parse, *decode;
+  GstElement *filesrc, *osssink, *queue, *parse, *decode;
   GstElement *bin;
   GstElement *thread;
 
@@ -33,10 +33,10 @@ int main(int argc,char *argv[])
   g_assert(bin != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect(G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect(G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos), thread);
 
   queue = gst_elementfactory_make("queue", "queue");
@@ -49,14 +49,14 @@ int main(int argc,char *argv[])
   decode = gst_elementfactory_make("mpg123", "decode");
 
   /* add objects to the main bin */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), queue);
 
   gst_bin_add(GST_BIN(thread), parse);
   gst_bin_add(GST_BIN(thread), decode);
   gst_bin_add(GST_BIN(thread), osssink);
   
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(queue,"sink"));
 
   gst_pad_connect(gst_element_get_pad(queue,"src"),

diff --git a/examples/queue4/queue4.c b/examples/queue4/queue4.c
index 2feac14..8e28592 100644 (file)
--- a/examples/queue4/queue4.c
+++ b/examples/queue4/queue4.c
@@ -13,7 +13,7 @@ void eos(GstElement *element, gpointer data)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink, *queue, *queue2, *parse, *decode;
+  GstElement *filesrc, *osssink, *queue, *queue2, *parse, *decode;
   GstElement *bin;
   GstElement *thread, *thread2;
 
@@ -35,10 +35,10 @@ int main(int argc,char *argv[])
   g_assert(bin != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect(G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect(G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos), thread);
 
   queue = gst_elementfactory_make("queue", "queue");
@@ -52,7 +52,7 @@ int main(int argc,char *argv[])
   decode = gst_elementfactory_make("mpg123", "decode");
 
   /* add objects to the main bin */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), queue);
 
   gst_bin_add(GST_BIN(thread), parse);
@@ -61,7 +61,7 @@ int main(int argc,char *argv[])
 
   gst_bin_add(GST_BIN(thread2), osssink);
   
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(queue,"sink"));
 
   gst_pad_connect(gst_element_get_pad(queue,"src"),

diff --git a/examples/thread/thread.c b/examples/thread/thread.c
index 3a0c713..7011880 100644 (file)
--- a/examples/thread/thread.c
+++ b/examples/thread/thread.c
@@ -14,7 +14,7 @@ void eos(GstElement *element, gpointer data)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink;
+  GstElement *filesrc, *osssink;
   GstElement *pipeline;
   GstElement *thread;
 
@@ -34,10 +34,10 @@ int main(int argc,char *argv[])
   g_assert(pipeline != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect(G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect(G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos), thread);
 
   /* and an audio sink */
@@ -46,7 +46,7 @@ int main(int argc,char *argv[])
 
   /* add objects to the main pipeline */
   /*
-  gst_pipeline_add_src(GST_PIPELINE(pipeline), disksrc);
+  gst_pipeline_add_src(GST_PIPELINE(pipeline), filesrc);
   gst_pipeline_add_sink(GST_PIPELINE(pipeline), osssink);
 
   if (!gst_pipeline_autoplug(GST_PIPELINE(pipeline))) {
@@ -55,9 +55,9 @@ int main(int argc,char *argv[])
   }
   */
 
-  //gst_bin_remove(GST_BIN(pipeline), disksrc);
+  //gst_bin_remove(GST_BIN(pipeline), filesrc);
 
-  //gst_bin_add(GST_BIN(thread), disksrc);
+  //gst_bin_add(GST_BIN(thread), filesrc);
   gst_bin_add(GST_BIN(thread), GST_ELEMENT(pipeline));
 
   /* make it ready */

diff --git a/examples/xml/createxml.c b/examples/xml/createxml.c
index 50f20f1..7dd4326 100644 (file)
--- a/examples/xml/createxml.c
+++ b/examples/xml/createxml.c
@@ -15,7 +15,7 @@ object_saved (GstObject *object, xmlNodePtr parent, gpointer data)
 
 int main(int argc,char *argv[])
 {
-  GstElement *disksrc, *osssink, *queue, *queue2, *parse, *decode;
+  GstElement *filesrc, *osssink, *queue, *queue2, *parse, *decode;
   GstElement *bin;
   GstElement *thread, *thread2;
 
@@ -48,9 +48,9 @@ int main(int argc,char *argv[])
   g_assert(bin != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
 
   queue = gst_elementfactory_make("queue", "queue");
   queue2 = gst_elementfactory_make("queue", "queue2");
@@ -63,7 +63,7 @@ int main(int argc,char *argv[])
   decode = gst_elementfactory_make("mpg123", "decode");
 
   /* add objects to the main bin */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), queue);
 
   gst_bin_add(GST_BIN(thread), parse);
@@ -72,7 +72,7 @@ int main(int argc,char *argv[])
 
   gst_bin_add(GST_BIN(thread2), osssink);
 
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(queue,"sink"));
 
   gst_pad_connect(gst_element_get_pad(queue,"src"),

diff --git a/tests/old/examples/autoplug/autoplug.c b/tests/old/examples/autoplug/autoplug.c
index 9de5ba5..4fef339 100644 (file)
--- a/tests/old/examples/autoplug/autoplug.c
+++ b/tests/old/examples/autoplug/autoplug.c
@@ -17,14 +17,14 @@ gst_play_have_type (GstElement *typefind, GstCaps *caps, GstElement *pipeline)
   GstAutoplug *autoplug;
   GtkWidget *socket;
   GstElement *autobin;
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *cache;
 
   GST_DEBUG (0,"GstPipeline: play have type\n");
 
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
   autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
   cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
 
@@ -109,7 +109,7 @@ static void
 gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 {
   GstElement *autobin;
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *cache;
   GstElement *new_element;
 
@@ -117,15 +117,15 @@ gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
   autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
   cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
   new_element = gst_bin_get_by_name (GST_BIN (autobin), "new_element");
 
-  gst_element_disconnect (disksrc, "src", cache, "sink");
+  gst_element_disconnect (filesrc, "src", cache, "sink");
   gst_element_disconnect (cache, "src", new_element, "sink");
   gst_bin_remove (GST_BIN (autobin), cache);
-  gst_element_connect (disksrc, "src", new_element, "sink");
+  gst_element_connect (filesrc, "src", new_element, "sink");
 
   gst_element_set_state (pipeline, GST_STATE_PLAYING);
 
@@ -134,7 +134,7 @@ gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *pipeline;
   GstElement *autobin;
   GstElement *typefind;
@@ -154,10 +154,10 @@ int main(int argc,char *argv[])
   g_assert(pipeline != NULL);
 
   /* 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);
-  gst_bin_add (GST_BIN (pipeline), disksrc);
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  gtk_object_set(GTK_OBJECT(filesrc),"location", argv[1],NULL);
+  gst_bin_add (GST_BIN (pipeline), filesrc);
 
   autobin = gst_bin_new ("autobin");
   cache = gst_elementfactory_make ("autoplugcache", "cache");
@@ -172,7 +172,7 @@ int main(int argc,char *argv[])
   gst_element_add_ghost_pad (autobin, gst_element_get_pad (cache, "sink"), "sink");
 
   gst_bin_add (GST_BIN( pipeline), autobin);
-  gst_element_connect (disksrc, "src", autobin, "sink");
+  gst_element_connect (filesrc, "src", autobin, "sink");
 
   /* start playing */
   gst_element_set_state( GST_ELEMENT (pipeline), GST_STATE_PLAYING);

diff --git a/tests/old/examples/helloworld/helloworld.c b/tests/old/examples/helloworld/helloworld.c
index adb71e6..c1ae980 100644 (file)
--- a/tests/old/examples/helloworld/helloworld.c
+++ b/tests/old/examples/helloworld/helloworld.c
@@ -13,7 +13,7 @@ void eos(GstElement *element)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *bin, *disksrc, *parse, *decoder, *downmix, *mulaw, *mulawdec, *osssink;
+  GstElement *bin, *filesrc, *parse, *decoder, *downmix, *mulaw, *mulawdec, *osssink;
 
   gst_init(&argc,&argv);
 
@@ -26,9 +26,9 @@ int main(int argc,char *argv[])
   bin = gst_pipeline_new("pipeline");
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect(G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect(G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos),NULL);
 
   /* now it's time to get the parser */
@@ -41,7 +41,7 @@ int main(int argc,char *argv[])
   osssink = gst_elementfactory_make("osssink", "play_audio");
 
   /* add objects to the main pipeline */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), parse);
   gst_bin_add(GST_BIN(bin), decoder);
   gst_bin_add(GST_BIN(bin), downmix);
@@ -50,7 +50,7 @@ int main(int argc,char *argv[])
   gst_bin_add(GST_BIN(bin), osssink);
 
   /* connect src to sink */
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(parse,"sink"));
   gst_pad_connect(gst_element_get_pad(parse,"src"),
                   gst_element_get_pad(decoder,"sink"));
@@ -81,7 +81,7 @@ int main(int argc,char *argv[])
   gst_object_destroy(GST_OBJECT(downmix));
   gst_object_destroy(GST_OBJECT(mulaw));
   gst_object_destroy(GST_OBJECT(mulawdec));
-  gst_object_destroy(GST_OBJECT(disksrc));
+  gst_object_destroy(GST_OBJECT(filesrc));
   gst_object_destroy(GST_OBJECT(bin));
 
   exit(0);

diff --git a/tests/old/examples/helloworld2/helloworld2.c b/tests/old/examples/helloworld2/helloworld2.c
index 3f3faa8..c98f6bf 100644 (file)
--- a/tests/old/examples/helloworld2/helloworld2.c
+++ b/tests/old/examples/helloworld2/helloworld2.c
@@ -7,14 +7,14 @@ gst_play_have_type (GstElement *typefind, GstCaps *caps, GstElement *pipeline)
   GstElement *new_element;
   GstAutoplug *autoplug;
   GstElement *autobin;
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *cache;
 
   GST_DEBUG (0,"GstPipeline: play have type\n");
 
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
   autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
   cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
 
@@ -54,7 +54,7 @@ static void
 gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 {
   GstElement *autobin;
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *cache;
   GstElement *new_element;
 
@@ -62,15 +62,15 @@ gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 
   gst_element_set_state (pipeline, GST_STATE_PAUSED);
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "disk_source");
   autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
   cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
   new_element = gst_bin_get_by_name (GST_BIN (autobin), "new_element");
 
-  gst_element_disconnect (disksrc, "src", cache, "sink");
+  gst_element_disconnect (filesrc, "src", cache, "sink");
   gst_element_disconnect (cache, "src", new_element, "sink");
   gst_bin_remove (GST_BIN (autobin), cache);
-  gst_element_connect (disksrc, "src", new_element, "sink");
+  gst_element_connect (filesrc, "src", new_element, "sink");
 
   gst_element_set_state (pipeline, GST_STATE_PLAYING);
 
@@ -80,7 +80,7 @@ gst_play_cache_empty (GstElement *element, GstElement *pipeline)
 int 
 main (int argc, char *argv[]) 
 {
-  GstElement *disksrc;
+  GstElement *filesrc;
   GstElement *pipeline;
   GstElement *autobin;
   GstElement *typefind;
@@ -98,10 +98,10 @@ main (int argc, char *argv[])
   g_assert (pipeline != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make ("disksrc", "disk_source");
-  g_assert (disksrc != NULL);
-  g_object_set (G_OBJECT (disksrc), "location", argv[1], NULL);
-  gst_bin_add (GST_BIN (pipeline), disksrc);
+  filesrc = gst_elementfactory_make ("filesrc", "disk_source");
+  g_assert (filesrc != NULL);
+  g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
+  gst_bin_add (GST_BIN (pipeline), filesrc);
 
   autobin = gst_bin_new ("autobin");
   cache = gst_elementfactory_make ("autoplugcache", "cache");
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
   gst_element_add_ghost_pad (autobin, gst_element_get_pad (cache, "sink"), "sink");
 
   gst_bin_add (GST_BIN( pipeline), autobin);
-  gst_element_connect (disksrc, "src", autobin, "sink");
+  gst_element_connect (filesrc, "src", autobin, "sink");
 
   /* start playing */
   gst_element_set_state( GST_ELEMENT (pipeline), GST_STATE_PLAYING);

diff --git a/tests/old/examples/launch/mp3parselaunch.c b/tests/old/examples/launch/mp3parselaunch.c
index 4ac3577..41c28e8 100644 (file)
--- a/tests/old/examples/launch/mp3parselaunch.c
+++ b/tests/old/examples/launch/mp3parselaunch.c
@@ -4,7 +4,7 @@ int
 main (int argc, char *argv[]) 
 {
   GstElement *pipeline;
-  GstElement *disksrc;
+  GstElement *filesrc;
 
   gst_init (&argc, &argv);
 
@@ -14,10 +14,10 @@ main (int argc, char *argv[])
   }
   pipeline = gst_pipeline_new ("my_pipeline");
 
-  gst_parse_launch ("disksrc[my_disksrc] ! mp3parse ! mpg123 ! osssink", GST_BIN (pipeline));
+  gst_parse_launch ("filesrc[my_filesrc] ! mp3parse ! mpg123 ! osssink", GST_BIN (pipeline));
 
-  disksrc = gst_bin_get_by_name (GST_BIN (pipeline), "my_disksrc");
-  g_object_set (G_OBJECT (disksrc), "location", argv[1], NULL);
+  filesrc = gst_bin_get_by_name (GST_BIN (pipeline), "my_filesrc");
+  g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
 
   gst_element_set_state (pipeline, GST_STATE_PLAYING);
 

diff --git a/tests/old/examples/mixer/mixer.c b/tests/old/examples/mixer/mixer.c
index 0f72231..f0dbfcd 100644 (file)
--- a/tests/old/examples/mixer/mixer.c
+++ b/tests/old/examples/mixer/mixer.c
@@ -264,20 +264,20 @@ create_input_channel (int id, char* location)
     
   /* create elements */
 
-  GST_DEBUG(0, "c_i_p : creating disksrc\n");
+  GST_DEBUG(0, "c_i_p : creating filesrc\n");
 
-  sprintf (buffer, "disksrc%d", id);
-  channel->disksrc = gst_elementfactory_make ("disksrc", buffer);
-  g_assert(channel->disksrc != NULL);    
+  sprintf (buffer, "filesrc%d", id);
+  channel->filesrc = gst_elementfactory_make ("filesrc", buffer);
+  g_assert(channel->filesrc != NULL);    
 
   GST_DEBUG(0, "c_i_p : setting location\n");
-  g_object_set(G_OBJECT(channel->disksrc),"location", location, NULL);
+  g_object_set(G_OBJECT(channel->filesrc),"location", location, NULL);
 
-  /* add disksrc to the bin before autoplug */
-  gst_bin_add(GST_BIN(channel->pipe), channel->disksrc);
+  /* add filesrc to the bin before autoplug */
+  gst_bin_add(GST_BIN(channel->pipe), channel->filesrc);
 
-  /* connect signal to eos of disksrc */
-  g_signal_connect (G_OBJECT(channel->disksrc),"eos",
+  /* connect signal to eos of filesrc */
+  g_signal_connect (G_OBJECT(channel->filesrc),"eos",
                      G_CALLBACK(eos),NULL);
 
 
@@ -296,7 +296,7 @@ create_input_channel (int id, char* location)
 #endif
 
 #ifdef WITH_BUG
-  srccaps = gst_play_typefind (GST_BIN (channel->pipe), channel->disksrc);
+  srccaps = gst_play_typefind (GST_BIN (channel->pipe), channel->filesrc);
 #endif
 #ifdef WITH_BUG2
   {
@@ -364,7 +364,7 @@ create_input_channel (int id, char* location)
   gst_bin_add (GST_BIN(channel->pipe), channel->volenv);
   gst_bin_add (GST_BIN (channel->pipe), new_element);
   
-  gst_element_connect (channel->disksrc, "src", new_element, "sink");
+  gst_element_connect (channel->filesrc, "src", new_element, "sink");
   gst_element_connect (new_element, "src_00", channel->volenv, "sink");
   
   /* add a ghost pad */

diff --git a/tests/old/examples/mixer/mixer.h b/tests/old/examples/mixer/mixer.h
index b967141..4cae18e 100644 (file)
--- a/tests/old/examples/mixer/mixer.h
+++ b/tests/old/examples/mixer/mixer.h
@@ -5,7 +5,7 @@
 
 typedef struct 
 {
-  GstElement *pipe, *disksrc, *volenv;
+  GstElement *pipe, *filesrc, *volenv;
   
   char *location;
   int channel_id;

diff --git a/tests/old/examples/queue/queue.c b/tests/old/examples/queue/queue.c
index 763a035..15dd327 100644 (file)
--- a/tests/old/examples/queue/queue.c
+++ b/tests/old/examples/queue/queue.c
@@ -3,7 +3,7 @@
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink, *parse, *decode, *queue;
+  GstElement *filesrc, *osssink, *parse, *decode, *queue;
   GstElement *bin;
   GstElement *thread;
 
@@ -23,9 +23,9 @@ int main(int argc,char *argv[])
   g_assert(bin != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
 
   parse = gst_elementfactory_make("mp3parse", "parse");
   decode = gst_elementfactory_make("mpg123", "decode");
@@ -37,7 +37,7 @@ int main(int argc,char *argv[])
   g_assert(osssink != NULL);
 
   /* add objects to the main pipeline */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), parse);
   gst_bin_add(GST_BIN(bin), decode);
   gst_bin_add(GST_BIN(bin), queue);
@@ -46,7 +46,7 @@ int main(int argc,char *argv[])
 
   gst_bin_add(GST_BIN(bin), thread);
   
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(parse,"sink"));
   gst_pad_connect(gst_element_get_pad(parse,"src"),
                   gst_element_get_pad(decode,"sink"));

diff --git a/tests/old/examples/queue2/queue2.c b/tests/old/examples/queue2/queue2.c
index f4b2a9a..f92eed4 100644 (file)
--- a/tests/old/examples/queue2/queue2.c
+++ b/tests/old/examples/queue2/queue2.c
@@ -13,7 +13,7 @@ void eos(GstElement *element, gpointer data)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink, *queue;
+  GstElement *filesrc, *osssink, *queue;
   GstElement *pipeline;
   GstElement *thread;
 
@@ -33,10 +33,10 @@ int main(int argc,char *argv[])
   g_assert(pipeline != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect (G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect (G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos), thread);
 
   queue = gst_elementfactory_make("queue", "queue");
@@ -47,7 +47,7 @@ int main(int argc,char *argv[])
 
   /* add objects to the main pipeline */
   /*
-  gst_pipeline_add_src(GST_PIPELINE(pipeline), disksrc);
+  gst_pipeline_add_src(GST_PIPELINE(pipeline), filesrc);
   gst_pipeline_add_sink(GST_PIPELINE(pipeline), queue);
 
   gst_bin_add(GST_BIN(thread), osssink);

diff --git a/tests/old/examples/queue3/queue3.c b/tests/old/examples/queue3/queue3.c
index 083b101..553846f 100644 (file)
--- a/tests/old/examples/queue3/queue3.c
+++ b/tests/old/examples/queue3/queue3.c
@@ -13,7 +13,7 @@ void eos(GstElement *element, gpointer data)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink, *queue, *parse, *decode;
+  GstElement *filesrc, *osssink, *queue, *parse, *decode;
   GstElement *bin;
   GstElement *thread;
 
@@ -33,10 +33,10 @@ int main(int argc,char *argv[])
   g_assert(bin != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect(G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect(G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos), thread);
 
   queue = gst_elementfactory_make("queue", "queue");
@@ -49,14 +49,14 @@ int main(int argc,char *argv[])
   decode = gst_elementfactory_make("mpg123", "decode");
 
   /* add objects to the main bin */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), queue);
 
   gst_bin_add(GST_BIN(thread), parse);
   gst_bin_add(GST_BIN(thread), decode);
   gst_bin_add(GST_BIN(thread), osssink);
   
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(queue,"sink"));
 
   gst_pad_connect(gst_element_get_pad(queue,"src"),

diff --git a/tests/old/examples/queue4/queue4.c b/tests/old/examples/queue4/queue4.c
index 2feac14..8e28592 100644 (file)
--- a/tests/old/examples/queue4/queue4.c
+++ b/tests/old/examples/queue4/queue4.c
@@ -13,7 +13,7 @@ void eos(GstElement *element, gpointer data)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink, *queue, *queue2, *parse, *decode;
+  GstElement *filesrc, *osssink, *queue, *queue2, *parse, *decode;
   GstElement *bin;
   GstElement *thread, *thread2;
 
@@ -35,10 +35,10 @@ int main(int argc,char *argv[])
   g_assert(bin != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect(G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect(G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos), thread);
 
   queue = gst_elementfactory_make("queue", "queue");
@@ -52,7 +52,7 @@ int main(int argc,char *argv[])
   decode = gst_elementfactory_make("mpg123", "decode");
 
   /* add objects to the main bin */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), queue);
 
   gst_bin_add(GST_BIN(thread), parse);
@@ -61,7 +61,7 @@ int main(int argc,char *argv[])
 
   gst_bin_add(GST_BIN(thread2), osssink);
   
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(queue,"sink"));
 
   gst_pad_connect(gst_element_get_pad(queue,"src"),

diff --git a/tests/old/examples/thread/thread.c b/tests/old/examples/thread/thread.c
index 3a0c713..7011880 100644 (file)
--- a/tests/old/examples/thread/thread.c
+++ b/tests/old/examples/thread/thread.c
@@ -14,7 +14,7 @@ void eos(GstElement *element, gpointer data)
 
 int main(int argc,char *argv[]) 
 {
-  GstElement *disksrc, *osssink;
+  GstElement *filesrc, *osssink;
   GstElement *pipeline;
   GstElement *thread;
 
@@ -34,10 +34,10 @@ int main(int argc,char *argv[])
   g_assert(pipeline != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
-  g_signal_connect(G_OBJECT(disksrc),"eos",
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
+  g_signal_connect(G_OBJECT(filesrc),"eos",
                      G_CALLBACK(eos), thread);
 
   /* and an audio sink */
@@ -46,7 +46,7 @@ int main(int argc,char *argv[])
 
   /* add objects to the main pipeline */
   /*
-  gst_pipeline_add_src(GST_PIPELINE(pipeline), disksrc);
+  gst_pipeline_add_src(GST_PIPELINE(pipeline), filesrc);
   gst_pipeline_add_sink(GST_PIPELINE(pipeline), osssink);
 
   if (!gst_pipeline_autoplug(GST_PIPELINE(pipeline))) {
@@ -55,9 +55,9 @@ int main(int argc,char *argv[])
   }
   */
 
-  //gst_bin_remove(GST_BIN(pipeline), disksrc);
+  //gst_bin_remove(GST_BIN(pipeline), filesrc);
 
-  //gst_bin_add(GST_BIN(thread), disksrc);
+  //gst_bin_add(GST_BIN(thread), filesrc);
   gst_bin_add(GST_BIN(thread), GST_ELEMENT(pipeline));
 
   /* make it ready */

diff --git a/tests/old/examples/xml/createxml.c b/tests/old/examples/xml/createxml.c
index 50f20f1..7dd4326 100644 (file)
--- a/tests/old/examples/xml/createxml.c
+++ b/tests/old/examples/xml/createxml.c
@@ -15,7 +15,7 @@ object_saved (GstObject *object, xmlNodePtr parent, gpointer data)
 
 int main(int argc,char *argv[])
 {
-  GstElement *disksrc, *osssink, *queue, *queue2, *parse, *decode;
+  GstElement *filesrc, *osssink, *queue, *queue2, *parse, *decode;
   GstElement *bin;
   GstElement *thread, *thread2;
 
@@ -48,9 +48,9 @@ int main(int argc,char *argv[])
   g_assert(bin != NULL);
 
   /* create a disk reader */
-  disksrc = gst_elementfactory_make("disksrc", "disk_source");
-  g_assert(disksrc != NULL);
-  g_object_set(G_OBJECT(disksrc),"location", argv[1],NULL);
+  filesrc = gst_elementfactory_make("filesrc", "disk_source");
+  g_assert(filesrc != NULL);
+  g_object_set(G_OBJECT(filesrc),"location", argv[1],NULL);
 
   queue = gst_elementfactory_make("queue", "queue");
   queue2 = gst_elementfactory_make("queue", "queue2");
@@ -63,7 +63,7 @@ int main(int argc,char *argv[])
   decode = gst_elementfactory_make("mpg123", "decode");
 
   /* add objects to the main bin */
-  gst_bin_add(GST_BIN(bin), disksrc);
+  gst_bin_add(GST_BIN(bin), filesrc);
   gst_bin_add(GST_BIN(bin), queue);
 
   gst_bin_add(GST_BIN(thread), parse);
@@ -72,7 +72,7 @@ int main(int argc,char *argv[])
 
   gst_bin_add(GST_BIN(thread2), osssink);
 
-  gst_pad_connect(gst_element_get_pad(disksrc,"src"),
+  gst_pad_connect(gst_element_get_pad(filesrc,"src"),
                   gst_element_get_pad(queue,"sink"));
 
   gst_pad_connect(gst_element_get_pad(queue,"src"),