From 4e0df2c4135c2bdd7aa960a7ce662959a58b1519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Loeuillet?= Date: Mon, 10 May 2004 00:14:40 +0000 Subject: [PATCH] testsuite/caps/caps_strings: audio/ac3 => audio/x-ac3 Original commit message from CVS: * testsuite/caps/caps_strings : audio/ac3 => audio/x-ac3 * docs/manual/pads-api.xml : audio/wav => audio/x-wav * docs/random/uraeus/gstreamer_and_midi.txt : audio/wav => audio/x-wav --- ChangeLog | 6 ++++++ docs/manual/pads-api.xml | 6 +++--- docs/random/uraeus/gstreamer_and_midi.txt | 2 +- tests/old/testsuite/caps/caps_strings | 2 +- testsuite/caps/caps_strings | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 387237a6b7..058e9a54d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-05-10 Stephane Loeuillet + + * testsuite/caps/caps_strings : audio/ac3 => audio/x-ac3 + * docs/manual/pads-api.xml : audio/wav => audio/x-wav + * docs/random/uraeus/gstreamer_and_midi.txt : audio/wav => audio/x-wav + 2004-05-09 Thomas Vander Stichele * tests/Makefile.am: fix am16 issue diff --git a/docs/manual/pads-api.xml b/docs/manual/pads-api.xml index e0c6202535..f7af5f9aac 100644 --- a/docs/manual/pads-api.xml +++ b/docs/manual/pads-api.xml @@ -201,7 +201,7 @@ GstCaps* gst_caps_new (const gchar *name, const gchar *mime, GstProps *props) GstCaps *newcaps; - newcaps = gst_caps_new ("my_caps", "audio/wav", NULL); + newcaps = gst_caps_new ("my_caps", "audio/x-wav", NULL); @@ -268,7 +268,7 @@ GstProps* gst_props_new (const gchar *firstname, ...); GstCaps *newcaps; newcaps = gst_caps_new ("my_caps", - "audio/wav", + "audio/x-wav", gst_props_new ( "bitrate", GST_PROPS_INT_RANGE (11025,22050), "depth", GST_PROPS_INT (16), @@ -285,7 +285,7 @@ GstProps* gst_props_new (const gchar *firstname, ...); GstCaps *newcaps; newcaps = GST_CAPS_NEW ("my_caps", - "audio/wav", + "audio/x-wav", "bitrate", GST_PROPS_INT_RANGE (11025,22050), "depth", GST_PROPS_INT (16), "signed", GST_PROPS_LIST ( diff --git a/docs/random/uraeus/gstreamer_and_midi.txt b/docs/random/uraeus/gstreamer_and_midi.txt index a1a4addba8..4631d58ef3 100644 --- a/docs/random/uraeus/gstreamer_and_midi.txt +++ b/docs/random/uraeus/gstreamer_and_midi.txt @@ -112,7 +112,7 @@ Types : - MIDI being passed to/from a text file : audio/midi (This is in my midi.types file, associated with a .midi or .mid extension. It seems analogous to a .wav - file, which contains audio/wav-type information.) + file, which contains "audio/x-wav" type information.) - MIDI in a pipeline : audio/x-gst-midi ? diff --git a/tests/old/testsuite/caps/caps_strings b/tests/old/testsuite/caps/caps_strings index c1af70b683..ee7348b45a 100644 --- a/tests/old/testsuite/caps/caps_strings +++ b/tests/old/testsuite/caps/caps_strings @@ -103,7 +103,7 @@ application/x-pn-realmedia, systemstream=(boolean)true audio/x-gsm, rate=(int)[ 1000, 48000 ], channels=(int)1 audio/x-speex, rate=(int)[ 1000, 48000 ], channels=(int)1 video/mpeg, mpegversion=(int)1, systemstream=(boolean)false -audio/ac3, channels=(int)[ 1, 6 ], rate=(int)[ 32000, 48000 ] +audio/x-ac3, channels=(int)[ 1, 6 ], rate=(int)[ 32000, 48000 ] audio/x-alaw, rate=(int)[ 8000, 192000 ], channels=(int)[ 1, 2 ] audio/x-mulaw, rate=(int)[ 8000, 192000 ], channels=(int)[ 1, 2 ] video/mpeg, mpegversion=(int)[ 1, 2 ], systemstream=(boolean)true diff --git a/testsuite/caps/caps_strings b/testsuite/caps/caps_strings index c1af70b683..ee7348b45a 100644 --- a/testsuite/caps/caps_strings +++ b/testsuite/caps/caps_strings @@ -103,7 +103,7 @@ application/x-pn-realmedia, systemstream=(boolean)true audio/x-gsm, rate=(int)[ 1000, 48000 ], channels=(int)1 audio/x-speex, rate=(int)[ 1000, 48000 ], channels=(int)1 video/mpeg, mpegversion=(int)1, systemstream=(boolean)false -audio/ac3, channels=(int)[ 1, 6 ], rate=(int)[ 32000, 48000 ] +audio/x-ac3, channels=(int)[ 1, 6 ], rate=(int)[ 32000, 48000 ] audio/x-alaw, rate=(int)[ 8000, 192000 ], channels=(int)[ 1, 2 ] audio/x-mulaw, rate=(int)[ 8000, 192000 ], channels=(int)[ 1, 2 ] video/mpeg, mpegversion=(int)[ 1, 2 ], systemstream=(boolean)true