From ce0d40b634a08aec047f8fd3fb059c1eb4480e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 10 Jul 2009 18:45:28 +0100
Subject: [PATCH] kate: change media type to subtitle/x-kate and update define
 accordingly

---
 ext/kate/gstkate.c      | 6 +++---
 ext/kate/gstkate.h      | 2 +-
 ext/kate/gstkatedec.c   | 2 +-
 ext/kate/gstkateenc.c   | 2 +-
 ext/kate/gstkateparse.c | 4 ++--
 ext/kate/gstkatetiger.c | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/kate/gstkate.c b/ext/kate/gstkate.c
index 5e60d18710..9d6867a5fb 100644
--- a/ext/kate/gstkate.c
+++ b/ext/kate/gstkate.c
@@ -69,7 +69,7 @@ GST_DEBUG_CATEGORY (gst_katetiger_debug);
 #endif
 
 
-static GstStaticCaps kate_caps = GST_STATIC_CAPS (GST_KATE_MIME_TYPE);
+static GstStaticCaps kate_caps = GST_STATIC_CAPS (GST_KATE_MEDIA_TYPE);
 
 #define KATE_CAPS (gst_static_caps_get(&kate_caps))
 static void
@@ -95,8 +95,8 @@ plugin_init (GstPlugin * plugin)
 {
   GstCaps *caps;
 
-  caps = gst_caps_new_simple (GST_KATE_MIME_TYPE, NULL);
-  if (!gst_type_find_register (plugin, GST_KATE_MIME_TYPE, GST_RANK_PRIMARY,
+  caps = gst_caps_new_simple (GST_KATE_MEDIA_TYPE, NULL);
+  if (!gst_type_find_register (plugin, GST_KATE_MEDIA_TYPE, GST_RANK_PRIMARY,
           gst_kate_type_find, NULL, caps, NULL, NULL)) {
     GST_WARNING ("kate: failed to register typefind");
     gst_caps_unref (caps);
diff --git a/ext/kate/gstkate.h b/ext/kate/gstkate.h
index ee69590f9b..fbccfea1bb 100644
--- a/ext/kate/gstkate.h
+++ b/ext/kate/gstkate.h
@@ -48,7 +48,7 @@
 
 G_BEGIN_DECLS
 
-#define GST_KATE_MIME_TYPE "application/x-kate"
+#define GST_KATE_MEDIA_TYPE "subtitle/x-kate"
 
 G_END_DECLS
 
diff --git a/ext/kate/gstkatedec.c b/ext/kate/gstkatedec.c
index 851bab2c13..8becb27efe 100644
--- a/ext/kate/gstkatedec.c
+++ b/ext/kate/gstkatedec.c
@@ -103,7 +103,7 @@ enum
 static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_KATE_MIME_TYPE)
+    GST_STATIC_CAPS (GST_KATE_MEDIA_TYPE)
     );
 
 static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
diff --git a/ext/kate/gstkateenc.c b/ext/kate/gstkateenc.c
index 26eff02bca..8e1b2ec138 100644
--- a/ext/kate/gstkateenc.c
+++ b/ext/kate/gstkateenc.c
@@ -133,7 +133,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
 static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_KATE_MIME_TYPE)
+    GST_STATIC_CAPS (GST_KATE_MEDIA_TYPE)
     );
 
 static void gst_kate_enc_set_property (GObject * object, guint prop_id,
diff --git a/ext/kate/gstkateparse.c b/ext/kate/gstkateparse.c
index 84a752b7a7..b44eea91d4 100644
--- a/ext/kate/gstkateparse.c
+++ b/ext/kate/gstkateparse.c
@@ -79,14 +79,14 @@ static GstStaticPadTemplate gst_kate_parse_sink_factory =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_KATE_MIME_TYPE)
+    GST_STATIC_CAPS (GST_KATE_MEDIA_TYPE)
     );
 
 static GstStaticPadTemplate gst_kate_parse_src_factory =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_KATE_MIME_TYPE)
+    GST_STATIC_CAPS (GST_KATE_MEDIA_TYPE)
     );
 
 GST_BOILERPLATE (GstKateParse, gst_kate_parse, GstElement, GST_TYPE_ELEMENT);
diff --git a/ext/kate/gstkatetiger.c b/ext/kate/gstkatetiger.c
index 28360dbee8..20df048128 100644
--- a/ext/kate/gstkatetiger.c
+++ b/ext/kate/gstkatetiger.c
@@ -115,7 +115,7 @@ static GstStaticPadTemplate kate_sink_factory =
 GST_STATIC_PAD_TEMPLATE ("kate_sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_KATE_MIME_TYPE)
+    GST_STATIC_CAPS (GST_KATE_MEDIA_TYPE)
     );
 
 static GstStaticPadTemplate video_sink_factory =