aboutsummaryrefslogtreecommitdiff
path: root/saga/music.h
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-11-19 07:41:59 +0000
committerTorbjörn Andersson2004-11-19 07:41:59 +0000
commitd173491acc2133497bc22b9728686b6b997ae505 (patch)
tree2614cd995173fc58d891c9b1f9519c58c496d219 /saga/music.h
parentea79c9c5e77c01d0b81174ae8f60029775a3e718 (diff)
downloadscummvm-rg350-d173491acc2133497bc22b9728686b6b997ae505.tar.gz
scummvm-rg350-d173491acc2133497bc22b9728686b6b997ae505.tar.bz2
scummvm-rg350-d173491acc2133497bc22b9728686b6b997ae505.zip
Added music to the partial IHNM intro. I think I picked the correct tune,
but I can't be absolutely sure. I'm also not sure if I'm using the correct music data. I'm fairly sure that the MUSICGM.RES file is the appropriate choice for "General MIDI", but I have no way of verifying that the MUSICFM.RES is really the right choice for MT-32. (Is either of them a good choice for Adlib, or are they both equally bad?) svn-id: r15831
Diffstat (limited to 'saga/music.h')
-rw-r--r--saga/music.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/saga/music.h b/saga/music.h
index f7249628de..853592f4ee 100644
--- a/saga/music.h
+++ b/saga/music.h
@@ -55,7 +55,8 @@ public:
void setVolume(int volume);
int getVolume() { return _masterVolume; }
- void hasNativeMT32(bool b) { _nativeMT32 = b; }
+ void setNativeMT32(bool b) { _nativeMT32 = b; }
+ bool hasNativeMT32() { return _nativeMT32; }
void playMusic();
void stopMusic();
void setLoop(bool loop) { _looping = loop; }
@@ -105,8 +106,9 @@ public:
Music(SoundMixer *mixer, MidiDriver *driver, int enabled);
~Music(void);
- void hasNativeMT32(bool b) { _player->hasNativeMT32(b); }
- void setPassThrough(bool b) { _player->setPassThrough(b); }
+ void setNativeMT32(bool b) { _player->setNativeMT32(b); }
+ bool hasNativeMT32() { return _player->hasNativeMT32(); }
+ void setPassThrough(bool b) { _player->setPassThrough(b); }
int play(uint32 music_rn, uint16 flags = MUSIC_DEFAULT);
int pause(void);