oggdemux: don't expose Annodex CMML streams any more

This never really took off - it's hardly used anywhere
and deprecated in favour of Kate. Exposing pads just
leads to confusing 'you are missing a plug-in' messages
when people come across such streams. We could still post
the data on the bus for applications to parse.

diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 646fe86ace78040f7d1ebc300e35732c32e65a76..e9d19e2b2f5ab8fed31cb07196f98d7839e4c0af 100644 (file)
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -2549,7 +2549,7 @@ gst_ogg_demux_activate_chain (GstOggDemux * ogg, GstOggChain * chain,
     gst_ogg_pad_mark_discont (pad);
     pad->last_ret = GST_FLOW_OK;
 
-    if (pad->map.is_skeleton || pad->added
+    if (pad->map.is_skeleton || pad->map.is_cmml || pad->added
         || !gst_pad_has_current_caps (GST_PAD_CAST (pad)))
       continue;
 
@@ -2870,7 +2870,7 @@ gst_ogg_demux_do_seek (GstOggDemux * ogg, GstSegment * segment,
     if (pad == NULL)
       continue;
 
-    if (pad->map.is_skeleton)
+    if (pad->map.is_skeleton || pad->map.is_cmml)
       goto next;
 
     granulepos = ogg_page_granulepos (&og);

diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c
index 460f507f8befe969c05513d4e5bd9b1226bc608b..2190b270676c34632f09c5814bcb8159c1f0d885 100644 (file)
--- a/ext/ogg/gstoggstream.c
+++ b/ext/ogg/gstoggstream.c
@@ -1717,6 +1717,7 @@ setup_cmml_mapper (GstOggStream * pad, ogg_packet * packet)
   pad->caps = gst_caps_new_empty_simple ("text/x-cmml");
   pad->always_flush_page = TRUE;
   pad->is_sparse = TRUE;
+  pad->is_cmml = TRUE;
 
   return TRUE;
 }

diff --git a/ext/ogg/gstoggstream.h b/ext/ogg/gstoggstream.h
index c06bc51d6d858f80a9e6e6430fdf6df67e065ace..b7353a6fcd7a40d7b8d7ac8453fd86bcc4348822 100644 (file)
--- a/ext/ogg/gstoggstream.h
+++ b/ext/ogg/gstoggstream.h
@@ -96,6 +96,8 @@ struct _GstOggStream
   /* OGM stuff */
   gboolean is_ogm;
   gboolean is_ogm_text;
+  /* CMML */
+  gboolean is_cmml;
   /* fishead stuff */
   guint16 skeleton_major, skeleton_minor;
   gint64 prestime;