summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2009-07-10 18:45:28 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-07-19 16:04:32 +0100
commitce0d40b634a08aec047f8fd3fb059c1eb4480e1c (patch)
treeaf2ea9858095c6317dcccc84026e261022ed7cab
parente88984ccbd4b2b7b5527cbc3ff488c5c85bb1e97 (diff)
kate: change media type to subtitle/x-kate and update define accordingly
-rw-r--r--ext/kate/gstkate.c6
-rw-r--r--ext/kate/gstkate.h2
-rw-r--r--ext/kate/gstkatedec.c2
-rw-r--r--ext/kate/gstkateenc.c2
-rw-r--r--ext/kate/gstkateparse.c4
-rw-r--r--ext/kate/gstkatetiger.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/ext/kate/gstkate.c b/ext/kate/gstkate.c
index 5e60d1871..9d6867a5f 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 ee69590f9..fbccfea1b 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 851bab2c1..8becb27ef 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 26eff02bc..8e1b2ec13 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 84a752b7a..b44eea91d 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 28360dbee..20df04812 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 =