Remove midi typefinders and require base CVS as they moved there.

Original commit message from CVS:
* configure.ac:
* ext/timidity/gsttimidity.c: (plugin_init):
* ext/timidity/gstwildmidi.c: (plugin_init):
Remove midi typefinders and require base CVS as they moved there.

4 files changed, 8 insertions, 55 deletions

diff --git a/ChangeLog b/ChangeLog
index c6fba0831..8eeb45c20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-25  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* configure.ac:
+	* ext/timidity/gsttimidity.c: (plugin_init):
+	* ext/timidity/gstwildmidi.c: (plugin_init):
+	Remove midi typefinders and require base CVS as they moved there.
+
 2008-02-24  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* ext/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 7b7e1ea5c..4186a3ab7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AM_PROG_LIBTOOL
 dnl *** required versions of GStreamer stuff ***
 dnl *** remove rtpmanager stuff below when this is updated
 GST_REQ=0.10.17
-GSTPB_REQ=0.10.17
+GSTPB_REQ=0.10.17.1
 
 dnl *** autotools stuff ****
 
diff --git a/ext/timidity/gsttimidity.c b/ext/timidity/gsttimidity.c
index 1a51fe381..0561b03c3 100644
--- a/ext/timidity/gsttimidity.c
+++ b/ext/timidity/gsttimidity.c
@@ -799,39 +799,12 @@ gst_timidity_change_state (GstElement * element, GstStateChange transition)
   return ret;
 }
 
-/*
- * http://jedi.ks.uiuc.edu/~johns/links/music/midifile.html
- */
-static void
-gst_timidity_typefind (GstTypeFind * tf, gpointer _data)
-{
-  guint8 *data = gst_type_find_peek (tf, 0, 4);
-
-  if (data && data[0] == 'M' && data[1] == 'T' && data[2] == 'h'
-      && data[3] == 'd') {
-    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM,
-        gst_caps_new_simple ("audio/midi", NULL));
-  }
-}
-
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  static gchar *exts[] = { "mid", "midi", NULL };
-  GstCaps *caps;
-
   GST_DEBUG_CATEGORY_INIT (gst_timidity_debug, "timidity",
       0, "Timidity plugin");
 
-  caps = gst_caps_new_simple ("audio/midi", NULL);
-  if (!gst_type_find_register (plugin, "audio/midi", GST_RANK_PRIMARY,
-          gst_timidity_typefind, exts, caps, NULL, NULL)) {
-    GST_WARNING ("can't register typefind");
-    gst_caps_unref (caps);
-    return FALSE;
-  }
-  gst_caps_unref (caps);
-
   return gst_element_register (plugin, "timidity",
       GST_RANK_PRIMARY, GST_TYPE_TIMIDITY);
 }
diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c
index 80259a909..d6f88d872 100644
--- a/ext/timidity/gstwildmidi.c
+++ b/ext/timidity/gstwildmidi.c
@@ -897,39 +897,12 @@ gst_wildmidi_get_property (GObject * object, guint prop_id,
   }
 }
 
-/*
- * http://jedi.ks.uiuc.edu/~johns/links/music/midifile.html
- */
-static void
-gst_wildmidi_typefind (GstTypeFind * tf, gpointer _data)
-{
-  guint8 *data = gst_type_find_peek (tf, 0, 4);
-
-  if (data && data[0] == 'M' && data[1] == 'T' && data[2] == 'h'
-      && data[3] == 'd') {
-    gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM,
-        gst_caps_new_simple ("audio/midi", NULL));
-  }
-}
-
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  static gchar *exts[] = { "mid", "midi", NULL };
-  GstCaps *caps;
-
   GST_DEBUG_CATEGORY_INIT (gst_wildmidi_debug, "wildmidi",
       0, "Wildmidi plugin");
 
-  caps = gst_caps_new_simple ("audio/midi", NULL);
-  if (!gst_type_find_register (plugin, "audio/midi", GST_RANK_SECONDARY,
-          gst_wildmidi_typefind, exts, caps, NULL, NULL)) {
-    GST_WARNING ("can't register typefind");
-    gst_caps_unref (caps);
-    return FALSE;
-  }
-  gst_caps_unref (caps);
-
   return gst_element_register (plugin, "wildmidi",
       GST_RANK_SECONDARY, GST_TYPE_WILDMIDI);
 }