this dir is kicking my ass all over the place

Original commit message from CVS:
this dir is kicking my ass all over the place

diff --git a/gst/modplug/Makefile.am b/gst/modplug/Makefile.am
index 847e734..47c72e4 100644 (file)
--- a/gst/modplug/Makefile.am
+++ b/gst/modplug/Makefile.am
@@ -4,10 +4,10 @@ plugindir = $(libdir)/gst
 
 plugin_LTLIBRARIES = libgstmodplug.la
 
-libgstmodplug_la_SOURCES = gstmodplug.cc modplug_types.cc
+libgstmodplug_la_SOURCES = modplug_types.c gstmodplug.cc
 libgstmodplug_la_CFLAGS = $(GST_CFLAGS)
 libgstmodplug_la_CXXFLAGS = $(GST_CFLAGS)
-libgstmodplug_la_LIBADD = libmodplug/libmodplug.la -lstdc++
+libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la
 libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstmodplug.h modplug_types.h

diff --git a/gst/modplug/libmodplug/Makefile.am b/gst/modplug/libmodplug/Makefile.am
index 07097bd..be6698b 100644 (file)
--- a/gst/modplug/libmodplug/Makefile.am
+++ b/gst/modplug/libmodplug/Makefile.am
@@ -2,7 +2,6 @@ noinst_LTLIBRARIES = libmodplug.la
 
 libmodplug_la_CXXFLAGS = -fno-exceptions -Wall -ffast-math -D_REENTRANT
 libmodplug_la_LDFLAGS = -module -avoid-version
-libmodplug_la_LIBS = -lstdc++
 libmodplug_la_SOURCES = tables.cpp         \
                         sndmix.cpp         \
                         sndfile.cpp        \

diff --git a/gst/modplug/modplug_types.c b/gst/modplug/modplug_types.c
new file mode 100644 (file)
index 0000000..a6ca787
--- /dev/null
+++ b/gst/modplug/modplug_types.c
@@ -0,0 +1,221 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+ 
+#include <gst/gst.h>
+#include <string.h>            /* memcmp */
+#include <ctype.h>             /* isdigit */
+
+#include "modplug_types.h"
+
+#define MODULEHEADERSIZE 0x438
+
+ 
+gboolean MOD_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+               
+       data = GST_BUFFER_DATA( buf ) + MODULEHEADERSIZE;       
+       
+       /* Protracker and variants */
+       if (( ! memcmp( data, "M.K.", 4 )) || ( ! memcmp( data, "M!K!", 4 )))
+               return TRUE;
+       
+       /* Star Tracker */
+       if ((( ! memcmp( data, "FLT", 3 )) || ( ! memcmp( data, "EXO", 3 ))) && ( isdigit( data[3] )))
+               return TRUE;
+       
+       /* Oktalyzer (Amiga) */
+       if (! memcmp( data, "OKTA", 4 )) 
+               return TRUE;
+       
+       /* Oktalyser (Atari) */
+       if ( ! memcmp( data, "CD81", 4 ))
+               return TRUE;
+       
+       /* Fasttracker */
+       if (( ! memcmp( data + 1, "CHN", 3 )) && ( isdigit( data[0] ))) 
+               return TRUE;
+               
+       /* Fasttracker or Taketracker */
+       if ((( ! memcmp( data + 2, "CH", 2 )) || ( ! memcmp( data + 2, "CN", 2 ))) && ( isdigit( data[0] )) && ( isdigit( data[1] ))) 
+               return TRUE;
+       
+       return FALSE;
+}
+
+gboolean Mod_669_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+       data = GST_BUFFER_DATA( buf );
+       
+       if( ! memcmp( data, "if", 2 ) || ! memcmp( data, "JN", 2 )) 
+               return TRUE;
+       
+       return FALSE;
+}
+
+gboolean Amf_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+    data = GST_BUFFER_DATA( buf );
+       
+    if( memcmp( data, "AMF", 3) ) 
+      return FALSE;   
+       
+    data = GST_BUFFER_DATA( buf ) + 3;
+               
+       if (( (gint)*data >= 10 ) && ( (gint)*data <= 14 )) 
+         return TRUE;
+       
+       return FALSE;
+}
+
+gboolean Dsm_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+
+     data = GST_BUFFER_DATA( buf );
+       
+     if( ! memcmp( data, "RIFF", 4 ) && ! memcmp( data + 8, "DSMF", 4 )) 
+       return TRUE;
+       
+     return FALSE;
+}
+
+gboolean Fam_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+static unsigned char FARSIG[4+3]={'F','A','R',0xfe,13,10,26};
+
+       data = GST_BUFFER_DATA( buf );
+       
+       if(( memcmp( data, FARSIG, 4 )) || ( memcmp( data + 44, FARSIG + 4, 3 )))
+         return FALSE;
+       
+       return 1;
+}
+
+gboolean Gdm_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+       data = GST_BUFFER_DATA( buf );
+       
+       if ( ! memcmp( data, "GDM\xfe", 4 ) &&  ! memcmp( data + 71, "GMFS", 4 ))
+               return TRUE;
+       
+       return FALSE;
+}
+
+gboolean Imf_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+       data = GST_BUFFER_DATA( buf ) + 0x3c;
+               
+       if( ! memcmp( data, "IM10", 4))
+               return TRUE;
+               
+       return FALSE;
+}
+
+gboolean It_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+       data = GST_BUFFER_DATA( buf );
+               
+       if( ! memcmp( data, "IMPM", 4 )) 
+               return TRUE;
+               
+       return FALSE;
+}
+
+gboolean M15_CheckType( GstBuffer *buf )
+{
+       /* FIXME: M15 CheckType to do */
+       return FALSE;
+}
+
+gboolean Med_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+       data = GST_BUFFER_DATA( buf );
+               
+       if(( ! memcmp(data, "MMD0", 4 )) || ( memcmp( data, "MMD1", 4 )))
+               return TRUE;
+       
+       return FALSE;
+}
+
+gboolean Mtm_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+       data = GST_BUFFER_DATA( buf );
+
+       if( ! memcmp( data, "MTM", 3 ))
+               return TRUE;
+       
+       return FALSE;
+}
+
+gboolean Okt_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+       data = GST_BUFFER_DATA( buf );
+
+       if( ! memcmp( data, "OKTSONG", 8 ))
+               return TRUE;
+       
+       return FALSE;
+}
+
+gboolean S3m_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+       data = GST_BUFFER_DATA( buf ) + 0x2c;
+
+       if( ! memcmp( data, "SCRM", 4 ))
+               return TRUE;
+       
+       return FALSE;
+}
+
+gboolean Xm_CheckType( GstBuffer *buf )
+{
+guint8 *data;
+       
+       data = GST_BUFFER_DATA( buf );
+
+       if( memcmp( data, "Extended Module: ", 17 ))
+               return FALSE;
+       
+       if( data[ 37 ] == 0x1a )
+               return TRUE;
+       
+       return FALSE;
+}
+
+