From 77a81a80b4157acd7e8e580c2648ec3b3ef6bc64 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 00:46:58 +0100
Subject: KYRA: (AdLib Driver) - implement sound effects volume

(also make internal driver version more flexible)
---
 engines/kyra/sound.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/kyra/sound.h')

diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index f3de56520e..88454e4878 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -128,7 +128,7 @@ public:
 	 *
 	 * @param track sound effect id
 	 */
-	virtual void playSoundEffect(uint8 track) = 0;
+	virtual void playSoundEffect(uint8 track, uint8 volume = 0xff) = 0;
 
 	/**
 	 * Stop playback of all sfx tracks.
@@ -273,7 +273,7 @@ public:
 	virtual void haltTrack();
 	virtual bool isPlaying() const;
 
-	virtual void playSoundEffect(uint8 track);
+	virtual void playSoundEffect(uint8 track, uint8 volume = 0xff);
 
 	virtual void stopAllSoundEffects();
 
-- 
cgit v1.2.3


From 4098feff57239102a7519e5b7bc1ef8f41465dc2 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sun, 6 Nov 2011 00:55:37 +0100
Subject: KYRA: (AdLib Driver) - allow sound trigger query

---
 engines/kyra/sound.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'engines/kyra/sound.h')

diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 88454e4878..63cec48d00 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -217,6 +217,16 @@ public:
 	 * Stops playback of the current voice.
 	 */
 	void voiceStop(const Audio::SoundHandle *handle = 0);
+
+	/**
+	 * Receive notifications from a song at certain points.
+	 */
+	virtual int checkTrigger() { return 0; }
+
+	/**
+	 * Reset sound trigger.
+	 */
+	virtual void resetTrigger() {}
 protected:
 	const char *fileListEntry(int file) const { return (_soundDataList != 0 && file >= 0 && file < _soundDataList->fileListLen) ? _soundDataList->fileList[file] : ""; }
 	int fileListLen() const { return _soundDataList->fileListLen; }
-- 
cgit v1.2.3