hum, vorbisfile => oggdemux ! vorbisdec ! audioconvert

Original commit message from CVS:

hum, vorbisfile => oggdemux ! vorbisdec ! audioconvert

diff --git a/docs/manual/advanced-threads.xml b/docs/manual/advanced-threads.xml
index 06f5fb1..abea901 100644 (file)
--- a/docs/manual/advanced-threads.xml
+++ b/docs/manual/advanced-threads.xml
@@ -104,7 +104,7 @@ eos (GstElement *src, gpointer data)
 int 
 main (int argc, char *argv[]) 
 {
-  GstElement *filesrc, *demuxer, *decoder, *audiosink;
+  GstElement *filesrc, *demuxer, *decoder, *audioconvert, *audiosink;
   GstElement *thread;
 
   if (argc < 2) {
@@ -133,14 +133,18 @@ main (int argc, char *argv[])
   decoder = gst_element_factory_make ("vorbisdec", "decoder");
   g_assert (decoder != NULL);
 
+  /* create an audio converter */
+  converter = gst_element_factory_make ("audioconvert", "converter");
+  g_assert (decoder != NULL);
+
   /* and an audio sink */
   audiosink = gst_element_factory_make ("osssink", "play_audio");
   g_assert (audiosink != NULL);
 
   /* add objects to the thread */
-  gst_bin_add_many (GST_BIN (thread), filesrc, demuxer, decoder, audiosink, NULL);
+  gst_bin_add_many (GST_BIN (thread), filesrc, demuxer, decoder, converter, audiosink, NULL);
   /* link them in the logical order */
-  gst_element_link_many (filesrc, demuxer, decoder, audiosink, NULL);
+  gst_element_link_many (filesrc, demuxer, decoder, converter, audiosink, NULL);
 
   /* start playing */
   gst_element_set_state (thread, GST_STATE_PLAYING);

diff --git a/docs/manual/threads.xml b/docs/manual/threads.xml
index 06f5fb1..abea901 100644 (file)
--- a/docs/manual/threads.xml
+++ b/docs/manual/threads.xml
@@ -104,7 +104,7 @@ eos (GstElement *src, gpointer data)
 int 
 main (int argc, char *argv[]) 
 {
-  GstElement *filesrc, *demuxer, *decoder, *audiosink;
+  GstElement *filesrc, *demuxer, *decoder, *audioconvert, *audiosink;
   GstElement *thread;
 
   if (argc < 2) {
@@ -133,14 +133,18 @@ main (int argc, char *argv[])
   decoder = gst_element_factory_make ("vorbisdec", "decoder");
   g_assert (decoder != NULL);
 
+  /* create an audio converter */
+  converter = gst_element_factory_make ("audioconvert", "converter");
+  g_assert (decoder != NULL);
+
   /* and an audio sink */
   audiosink = gst_element_factory_make ("osssink", "play_audio");
   g_assert (audiosink != NULL);
 
   /* add objects to the thread */
-  gst_bin_add_many (GST_BIN (thread), filesrc, demuxer, decoder, audiosink, NULL);
+  gst_bin_add_many (GST_BIN (thread), filesrc, demuxer, decoder, converter, audiosink, NULL);
   /* link them in the logical order */
-  gst_element_link_many (filesrc, demuxer, decoder, audiosink, NULL);
+  gst_element_link_many (filesrc, demuxer, decoder, converter, audiosink, NULL);
 
   /* start playing */
   gst_element_set_state (thread, GST_STATE_PLAYING);

diff --git a/tools/README b/tools/README
index 226e6a3..2898a42 100644 (file)
--- a/tools/README
+++ b/tools/README
@@ -35,7 +35,7 @@ Here we convert a Mp3 file into an Ogg Vorbis file:
 
 And then we can play that file with:
 
- gst-launch filesrc location=music.ogg ! oggdemux ! vorbisdec ! osssink
+ gst-launch filesrc location=music.ogg ! oggdemux ! vorbisdec ! audioconvert ! osssink
 
 Some other useful pipelines are..
 Plays wav files (currently there are no wav encoders):

diff --git a/tools/gst-launch.1.in b/tools/gst-launch.1.in
index 8aec37b..21c2cf2 100644 (file)
--- a/tools/gst-launch.1.in
+++ b/tools/gst-launch.1.in
@@ -224,7 +224,7 @@ Play the mp3 music file "music.mp3" using a libmad-based plug-in and
 output to an OSS device
 
 .B
-        gst\-launch filesrc location=music.ogg ! oggdemux ! vorbisdec ! osssink
+        gst\-launch filesrc location=music.ogg ! oggdemux ! vorbisdec ! audioconvert ! osssink
 .br
 Play an Ogg Vorbis format file