ext/esd/esdsink.c: Remove property that handles osssink fallback.

Original commit message from CVS:
* ext/esd/esdsink.c: (gst_esdsink_class_init): Remove property
that handles osssink fallback.
* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_init),
(gst_audio_convert_getcaps):
* gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
Add audio/x-qdm2 for QDM2 audio.
* gst/sine/gstsinesrc.c: (gst_sinesrc_get):
* gst/sine/gstsinesrc.h: Add example of how to implement tags.
* gst/videoscale/gstvideoscale.c: (gst_videoscale_getcaps):
Decrease minimum size to 16x16.
* gst/wavparse/gstwavparse.c:
Convert disabled pad template caps to new caps.
* sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xcontext_get),
(gst_xvimagesink_chain): Throw element error when display cannot
be opened.  Increase minimum framerate to 1.0.  Check the data
free function on a buffer to make sure it is the type we expect
before manipulating it.

diff --git a/ChangeLog b/ChangeLog
index 131c75f55b8d4e135388effcfa701920bf80cb00..821365d685c58f54a53fea381fc1114ef91d0416 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2004-01-15  David Schleef  <ds@schleef.org>
+
+       * ext/esd/esdsink.c: (gst_esdsink_class_init): Remove property
+       that handles osssink fallback.
+       * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_init),
+       (gst_audio_convert_getcaps):
+       * gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
+       Add audio/x-qdm2 for QDM2 audio.
+       * gst/sine/gstsinesrc.c: (gst_sinesrc_get):
+       * gst/sine/gstsinesrc.h: Add example of how to implement tags.
+       * gst/videoscale/gstvideoscale.c: (gst_videoscale_getcaps):
+       Decrease minimum size to 16x16.
+       * gst/wavparse/gstwavparse.c:
+       Convert disabled pad template caps to new caps.
+       * sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get):
+       * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xcontext_get),
+       (gst_xvimagesink_chain): Throw element error when display cannot
+       be opened.  Increase minimum framerate to 1.0.  Check the data
+       free function on a buffer to make sure it is the type we expect
+       before manipulating it.
+
 2004-01-15  Julien MOUTTE <julien@moutte.net>
 
        * gst/videofilter/gstvideobalance.c: (gst_videobalance_init),

diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index 1ea55453050ff11f91801c2c1aca1e70fb1045f8..f02d3875ae6610f8f47da66df2a8029c26173586 100644 (file)
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -143,9 +143,12 @@ gst_esdsink_class_init (gpointer g_class, gpointer class_data)
   g_object_class_install_property(gobject_class, ARG_SYNC,
     g_param_spec_boolean("sync","sync","Synchronize output to clock",
                          FALSE,G_PARAM_READWRITE));
+#if 0
+  /* This option is disabled because it is dumb in GStreamer's architecture. */
   g_object_class_install_property(gobject_class, ARG_FALLBACK,
     g_param_spec_boolean("fallback","fallback","Fall back to using OSS if Esound daemon is not present",
                          FALSE,G_PARAM_READWRITE));
+#endif
 
   gobject_class->set_property = gst_esdsink_set_property;
   gobject_class->get_property = gst_esdsink_get_property;

diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index cf9bd351cc953740276ceac5b2510c77420e7254..e950d6812c825c2235afe57c0fa6fd262c3b5e7b 100644 (file)
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -1632,10 +1632,11 @@ static GstCaps *qtdemux_audio_caps(GstQTDemux *qtdemux, guint32 fourcc)
       /* MPEG-4 AAC */
       return gst_caps_from_string ("audio/mpeg, "
          "mpegversion = (int) 4");
-    case GST_MAKE_FOURCC('q','t','v','r'):
-      /* ? */
     case GST_MAKE_FOURCC('Q','D','M','2'):
       /* QDesign music version 2 (no constant) */
+      return gst_caps_from_string ("audio/x-qdm2");
+    case GST_MAKE_FOURCC('q','t','v','r'):
+      /* ? */
     case GST_MAKE_FOURCC('Q','D','M','C'):
       /* QDesign music */
     case GST_MAKE_FOURCC('i','m','a','4'):

diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 73468f43ede6794b72081cde61647b1d75e7a786..382192a4fd17e85ebf66e5a7f964a92f6201dcfd 100644 (file)
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -73,49 +73,27 @@ GST_STATIC_PAD_TEMPLATE (
   "wavparse_src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
-  GST_STATIC_CAPS_ANY
-);
-#if 0
-  GST_STATIC_CAPS (
-    "wavparse_raw",
-    "audio/x-raw-int",
-       "endianness",       G_TYPE_INT (G_LITTLE_ENDIAN),
-       "signed",           GST_PROPS_LIST (
-                               G_TYPE_BOOLEAN (FALSE),
-                               G_TYPE_BOOLEAN (TRUE)
-                          ),
-       "width",            GST_PROPS_LIST (
-                            G_TYPE_INT (8),
-                            G_TYPE_INT (16)
-                          ),
-       "depth",            GST_PROPS_LIST (
-                            G_TYPE_INT (8),
-                            G_TYPE_INT (16)
-                          ),
-       "rate",             G_TYPE_INT_RANGE (8000, 48000),
-       "channels",         G_TYPE_INT_RANGE (1, 2)
-  ),
-  GST_STATIC_CAPS (
-    "wavparse_mpeg",
-    "audio/mpeg",
-      "mpegversion",       G_TYPE_INT, 1,
-      "rate",              G_TYPE_INT_RANGE (8000, 48000),
-      "channels",          G_TYPE_INT_RANGE (1, 2),
-      "layer",             G_TYPE_INT_RANGE (1, 3)
-  ),
   GST_STATIC_CAPS (
-    "parsewav_law",
-    "audio/x-alaw",
-      "rate",              G_TYPE_INT_RANGE (8000, 48000),
-      "channels",          G_TYPE_INT_RANGE (1, 2)
-  ),
-  GST_STATIC_CAPS (
-    "parsewav_law",
-    "audio/x-mulaw",
-      "rate",              G_TYPE_INT_RANGE (8000, 48000),
-      "channels",          G_TYPE_INT_RANGE (1, 2)
+    "audio/x-raw-int, "
+      "endianness = (int) little_endian, "
+      "signed = (boolean) { true, false }, "
+      "width = (int) { 8, 16 }, "
+      "depth = (int) { 8, 16 }, "
+      "rate = (int) [ 8000, 48000 ], "
+      "channels = (int) [ 1, 2 ]; "
+    "audio/mpeg, "
+      "mpegversion = (int) 1, "
+      "layer = (int) [ 1, 3 ], "
+      "rate = (int) [ 8000, 48000 ], "
+      "channels = (int) [ 1, 2 ]; "
+    "audio/x-alaw, "
+      "rate = (int) [ 8000, 48000 ], "
+      "channels = (int) [ 1, 2 ]; "
+    "audio/x-mulaw, "
+      "rate = (int) [ 8000, 48000 ], "
+      "channels = (int) [ 1, 2 ]"
   )
-#endif
+);
 
 /* WavParse signals and args */
 enum {