aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudvig Strigeus2001-12-01 17:25:36 +0000
committerLudvig Strigeus2001-12-01 17:25:36 +0000
commitffdc4102d2d665b6a016ffc201bb9ab48563c081 (patch)
treecc9b2347557e9a08b4eb72178ada7dc4cedfa25b
parent8fa0bb4b29acf5e7d2a5fa8a26a81072d4fa40dd (diff)
downloadscummvm-rg350-ffdc4102d2d665b6a016ffc201bb9ab48563c081.tar.gz
scummvm-rg350-ffdc4102d2d665b6a016ffc201bb9ab48563c081.tar.bz2
scummvm-rg350-ffdc4102d2d665b6a016ffc201bb9ab48563c081.zip
fixed to compile on unix
svn-id: r3512
-rw-r--r--sound.h5
-rw-r--r--sound/gmidi.cpp4
2 files changed, 6 insertions, 3 deletions
diff --git a/sound.h b/sound.h
index b7859c7602..38246ee4ef 100644
--- a/sound.h
+++ b/sound.h
@@ -17,6 +17,9 @@
*
* Change Log:
* $Log$
+ * Revision 1.3 2001/12/01 17:25:36 strigeus
+ * fixed to compile on unix
+ *
* Revision 1.2 2001/12/01 17:06:13 strigeus
* adlib sound support, use USE_ADLIB
*
@@ -393,7 +396,7 @@ public:
};
struct MidiSoundDriver : SoundDriver {
- HMIDIOUT *_mo;
+ void *_mo;
bool _mt32emulate;
SoundEngine *_se;
diff --git a/sound/gmidi.cpp b/sound/gmidi.cpp
index f76a00d708..ec80050110 100644
--- a/sound/gmidi.cpp
+++ b/sound/gmidi.cpp
@@ -82,7 +82,7 @@ static int connect_to_timidity(int port)
return s;
}
-void SoundEngine::midiInit() {
+void MidiSoundDriver::midiInit() {
int s, s2;
int len;
int dummy, newport;
@@ -158,7 +158,7 @@ static inline void MIDI_OUT(void *a, int b) {
#else
#define MIDI_OUT(a,b)
-void SoundEngine::midiInit() { }
+void MidiSoundDriver::midiInit() { }
#endif
void MidiSoundDriver::midiPitchBend(byte chan, int16 pitchbend) {