summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2003-05-22 11:33:15 +0000
committerBrian Cameron <brian.cameron@sun.com>2003-05-22 11:33:15 +0000
commitec45be3bb68bd8c1be7a34c9a547e315071b7bf2 (patch)
tree24d6d8f3bba5c29d3a3ced84399d44320a7b8615 /gst
parent6d19f51c85ea45c0176b80e31429abc80b353641 (diff)
downloadgst-plugins-bad-ec45be3bb68bd8c1be7a34c9a547e315071b7bf2.tar.gz
gst-plugins-bad-ec45be3bb68bd8c1be7a34c9a547e315071b7bf2.tar.bz2
gst-plugins-bad-ec45be3bb68bd8c1be7a34c9a547e315071b7bf2.zip
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.
Diffstat (limited to 'gst')
-rw-r--r--gst/modplug/gstmodplug.cc5
-rw-r--r--gst/modplug/libmodplug/sndfile.h6
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
};