From ec45be3bb68bd8c1be7a34c9a547e315071b7bf2 Mon Sep 17 00:00:00 2001
From: Brian Cameron <brian.cameron@sun.com>
Date: Thu, 22 May 2003 11:33:15 +0000
Subject: Corrected modplug and monkeyaudio to build with non-gcc compilers.

Original commit message from CVS:
Corrected modplug and monkeyaudio to build with non-gcc compilers.
---
 gst/modplug/gstmodplug.cc        | 5 ++---
 gst/modplug/libmodplug/sndfile.h | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index e96df4cc..948de81b 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -75,12 +75,11 @@ enum {
   ARG_STREAMINFO
 };
 
-
 GST_PAD_TEMPLATE_FACTORY (modplug_src_template_factory,
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
-  GST_CAPS_NEW ( /* use16bit = TRUE */
+  GST_CAPS_NEW (
     "modplug_src",
     "audio/raw",  
       "format",      GST_PROPS_STRING ("int"),
@@ -92,7 +91,7 @@ GST_PAD_TEMPLATE_FACTORY (modplug_src_template_factory,
       "rate",        GST_PROPS_INT_RANGE (11025, 44100),
       "channels",    GST_PROPS_INT_RANGE (1, 2)
   ),
-  GST_CAPS_NEW ( /* use16bit = FALSE */
+  GST_CAPS_NEW ( 
     "modplug_src",
     "audio/raw",  
       "format",      GST_PROPS_STRING ("int"),
diff --git a/gst/modplug/libmodplug/sndfile.h b/gst/modplug/libmodplug/sndfile.h
index 2dcbe65c..4be08a0f 100644
--- a/gst/modplug/libmodplug/sndfile.h
+++ b/gst/modplug/libmodplug/sndfile.h
@@ -16,6 +16,10 @@
 typedef const BYTE * LPCBYTE;
 #endif
 
+#ifndef __inline
+#define __inline
+#endif
+
 #define MOD_AMIGAC2			0x1AB
 #define MAX_SAMPLE_LENGTH	16000000
 #define MAX_SAMPLE_RATE		50000
@@ -509,7 +513,7 @@ enum {
 	MIDIOUT_VOLUME,
 	MIDIOUT_PAN,
 	MIDIOUT_BANKSEL,
-	MIDIOUT_PROGRAM,
+	MIDIOUT_PROGRAM
 };
 
 
-- 
cgit v1.2.1