From 7a12796bba3a6aabba9c239dc596b33de1bb7b02 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Mon, 14 Nov 2011 20:39:00 +0100
Subject: SKY: Support external digital music tracks.

This allows replacement of the supplied MIDI music with tracks from
the Music Enhancement Project.
---
 engines/sky/music/musicbase.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines/sky/music/musicbase.h')

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;
-- 
cgit v1.2.3