aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound/music.h
diff options
context:
space:
mode:
authorMartin Kiewitz2010-06-16 21:02:58 +0000
committerMartin Kiewitz2010-06-16 21:02:58 +0000
commitaf65de6e1aaa197e17f10cd976ea2f5d15f0d7c8 (patch)
treebcb472ae1e4c9a7801ef8f6e8ee510712b865173 /engines/sci/sound/music.h
parente7e8808affc1a256b228da859e44ec3071c3a5a4 (diff)
downloadscummvm-rg350-af65de6e1aaa197e17f10cd976ea2f5d15f0d7c8.tar.gz
scummvm-rg350-af65de6e1aaa197e17f10cd976ea2f5d15f0d7c8.tar.bz2
scummvm-rg350-af65de6e1aaa197e17f10cd976ea2f5d15f0d7c8.zip
SCI: implement channel remapping for SCI1
svn-id: r49905
Diffstat (limited to 'engines/sci/sound/music.h')
-rw-r--r--engines/sci/sound/music.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 83cd59e89b..bbafb808cb 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -196,6 +196,8 @@ public:
// where a deadlock can occur
Common::Mutex _mutex;
+ int16 tryToOwnChannel(MusicEntry *caller, int16 bestChannel);
+
protected:
void sortPlayList();
@@ -210,20 +212,11 @@ protected:
bool _bMultiMidi;
private:
static void miditimerCallback(void *p);
- void findUsedChannels();
- int16 getNextUnusedChannel() const {
- for (int i = 0; i < 16; i++) {
- if (!_usedChannels[i])
- return i;
- }
-
- return -1;
- }
MusicList _playList;
bool _soundOn;
byte _masterVolume;
- bool _usedChannels[16];
+ MusicEntry *_usedChannel[16];
};
} // End of namespace Sci