diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/scumm/imuse/imuse_player.cpp | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/scumm/imuse/imuse_player.cpp')
| -rw-r--r-- | engines/scumm/imuse/imuse_player.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index 73aec472e4..a90915e438 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -47,7 +47,6 @@ namespace Scumm { #define PERCUSSION_CHANNEL 9 extern MidiParser *MidiParser_createRO(); -extern MidiParser *MidiParser_createEUP(); uint16 Player::_active_notes[128]; @@ -193,9 +192,6 @@ int Player::start_seq_sound(int sound, bool reset_vars) { if (!memcmp(ptr, "RO", 2)) { // Old style 'RO' resource _parser = MidiParser_createRO(); - } else if (!memcmp(ptr, "SO", 2)) { - // Euphony (FM-TOWNS) resource - _parser = MidiParser_createEUP(); } else if (!memcmp(ptr, "FORM", 4)) { // Humongous Games XMIDI resource _parser = MidiParser::createParser_XMIDI(); |