From 95011fd7e8eb3a2ec3a87ff9dad523d18005db42 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Sun, 6 Jul 2003 20:49:52 +0000
Subject: New mimetypes gone into effect today - this commit changes all old
 mimetypes over to the new mimetypes spec as descri...

Original commit message from CVS:
New mimetypes gone into effect today - this commit changes all old mimetypes over to the new mimetypes spec as described in the previous commit's document. Note: some plugins will break, some pipelines will break, expect HEAD to be broken or at least not 100% working for a few days, but don't forget to report bugs
---
 sys/dxr3/dxr3audiosink.c | 9 ++++-----
 sys/dxr3/dxr3spusink.c   | 6 +-----
 sys/dxr3/dxr3videosink.c | 2 ++
 3 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'sys/dxr3')

diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c
index fe8853c8..35e9d99c 100644
--- a/sys/dxr3/dxr3audiosink.c
+++ b/sys/dxr3/dxr3audiosink.c
@@ -75,9 +75,7 @@ GST_PAD_TEMPLATE_FACTORY (dxr3audiosink_pcm_sink_factory,
   GST_PAD_ALWAYS,
   GST_CAPS_NEW (
     "dxr3audiosink_pcm_sink",
-    "audio/raw",
-      "format",            GST_PROPS_STRING ("int"),
-       "law",              GST_PROPS_INT (0),
+    "audio/x-raw-int",
        "endianness",       GST_PROPS_INT (G_BYTE_ORDER),
        "signed",           GST_PROPS_BOOLEAN (TRUE),
        "width",            GST_PROPS_INT (16),
@@ -98,8 +96,9 @@ GST_PAD_TEMPLATE_FACTORY (dxr3audiosink_ac3_sink_factory,
   GST_PAD_ALWAYS,
   GST_CAPS_NEW (
     "dxr3audiosink_ac3_sink",
-    "audio/a52",
+    "audio/x-ac3",
     NULL
+    /* no parameters needed, we don't need a parsed stream */
   )
 )
 
@@ -507,7 +506,7 @@ dxr3audiosink_pcm_sinklink (GstPad *pad, GstCaps *caps)
   }
 
   mimetype = gst_caps_get_mime(caps);
-  if (strcmp (mimetype, "audio/raw") != 0) {
+  if (strcmp (mimetype, "audio/x-raw-int") != 0) {
     return GST_PAD_LINK_REFUSED;
   }
 
diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c
index 04648306..e9142c3c 100644
--- a/sys/dxr3/dxr3spusink.c
+++ b/sys/dxr3/dxr3spusink.c
@@ -68,11 +68,7 @@ GST_PAD_TEMPLATE_FACTORY (dxr3spusink_sink_factory,
   "sink",
   GST_PAD_SINK,
   GST_PAD_ALWAYS,
-  GST_CAPS_NEW (
-    "dxr3spusink_sink",
-    "video/mpeg",
-    NULL
-  )
+  NULL
 );
 
 
diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c
index 9c4d8d56..5f8f953d 100644
--- a/sys/dxr3/dxr3videosink.c
+++ b/sys/dxr3/dxr3videosink.c
@@ -94,6 +94,8 @@ GST_PAD_TEMPLATE_FACTORY (dxr3videosink_sink_factory,
 	                  GST_PROPS_INT (2)
                         ),
       "systemstream",	GST_PROPS_BOOLEAN (FALSE)
+      /* width/height/framerate omitted, we don't
+       * need a parsed stream */
   )
 )
 
-- 
cgit v1.2.1