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.
This commit is contained in:
Sebastian Dröge 2008-02-25 06:29:12 +00:00
parent 65c75b862c
commit a49e89d514
4 changed files with 8 additions and 55 deletions

View file

@ -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:

View file

@ -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 ****

View file

@ -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);
}

View file

@ -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);
}