diff options
| author | Alyssa Milburn | 2011-11-14 20:39:00 +0100 |
|---|---|---|
| committer | Alyssa Milburn | 2011-11-14 20:45:00 +0100 |
| commit | 7a12796bba3a6aabba9c239dc596b33de1bb7b02 (patch) | |
| tree | 37e1cc54c629df98ff3cd22f7f3122c0628015b1 /engines/sky/music/musicbase.h | |
| parent | 66c740ceea29f97e631e794a7ccdec5865fbb92d (diff) | |
| download | scummvm-rg350-7a12796bba3a6aabba9c239dc596b33de1bb7b02.tar.gz scummvm-rg350-7a12796bba3a6aabba9c239dc596b33de1bb7b02.tar.bz2 scummvm-rg350-7a12796bba3a6aabba9c239dc596b33de1bb7b02.zip | |
SKY: Support external digital music tracks.
This allows replacement of the supplied MIDI music with tracks from
the Music Enhancement Project.
Diffstat (limited to 'engines/sky/music/musicbase.h')
| -rw-r--r-- | engines/sky/music/musicbase.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h index c175876380..066ebe593c 100644 --- a/engines/sky/music/musicbase.h +++ b/engines/sky/music/musicbase.h @@ -27,6 +27,8 @@ #include "common/scummsys.h" #include "common/mutex.h" +#include "audio/mixer.h" + namespace Sky { class Disk; @@ -48,7 +50,7 @@ private: class MusicBase { public: - MusicBase(Disk *pDisk); + MusicBase(Audio::Mixer *pMixer, Disk *pDisk); virtual ~MusicBase(); void loadSection(uint8 pSection); void startMusic(uint16 param); @@ -60,6 +62,7 @@ public: protected: + Audio::Mixer *_mixer; Disk *_skyDisk; uint8 *_musicData; @@ -75,6 +78,7 @@ protected: Actions _onNextPoll; ChannelBase *_channels[10]; Common::Mutex _mutex; + Audio::SoundHandle _musicHandle; virtual void setupPointers() = 0; virtual void setupChannels(uint8 *channelData) = 0; |