diff options
| author | Benjamin Haisch | 2008-05-05 12:51:50 +0000 |
|---|---|---|
| committer | Benjamin Haisch | 2008-05-05 12:51:50 +0000 |
| commit | 7191b2c5158615fe46c7587b9645c7f295d993ec (patch) | |
| tree | 2997ab9a58cd6900bba4127c04b6e410717490a2 /engines/made/music.h | |
| parent | 1ddd54b50da3f67f39c7adfa63f6858b85c610e9 (diff) | |
| download | scummvm-rg350-7191b2c5158615fe46c7587b9645c7f295d993ec.tar.gz scummvm-rg350-7191b2c5158615fe46c7587b9645c7f295d993ec.tar.bz2 scummvm-rg350-7191b2c5158615fe46c7587b9645c7f295d993ec.zip | |
Added MIDI playback (which doesn't work yet) and fixed compilation (sorry all)
svn-id: r31873
Diffstat (limited to 'engines/made/music.h')
| -rw-r--r-- | engines/made/music.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/made/music.h b/engines/made/music.h index b9fa1004d5..8ef39b4fd3 100644 --- a/engines/made/music.h +++ b/engines/made/music.h @@ -54,7 +54,8 @@ public: void setNativeMT32(bool b) { _nativeMT32 = b; } bool hasNativeMT32() { return _nativeMT32; } - void play(XmidiResource *midiResource, MusicFlags flags = MUSIC_NORMAL); + void playXMIDI(GenericResource *midiResource, MusicFlags flags = MUSIC_NORMAL); + void playSMF(GenericResource *midiResource, MusicFlags flags = MUSIC_NORMAL); void stop(); void pause(); void resume(); @@ -86,7 +87,7 @@ protected: MidiChannel *_channel[16]; MidiDriver *_driver; - MidiParser *_xmidiParser; + MidiParser *_xmidiParser, *_smfParser; byte _channelVolume[16]; bool _nativeMT32; bool _isGM; |