[Scummvm-cvs-logs] scummvm master -> ff296175bc558ce5758a0948ab91333a6d3b918e

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ff296175bc KYRA: Fix voicePlay overwrite in PC98 and Amiga sound outputs.


Commit: ff296175bc558ce5758a0948ab91333a6d3b918e
    https://github.com/scummvm/scummvm/commit/ff296175bc558ce5758a0948ab91333a6d3b918e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-01-08T20:54:16-08:00

Commit Message:
KYRA: Fix voicePlay overwrite in PC98 and Amiga sound outputs.

This was forgotten to adapt in e016e7dfc2b1e3cdb39c01d81c5a34eee66a277b.

Changed paths:
    engines/kyra/sound_intern.h



diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h
index c5cf265..1325424 100644
--- a/engines/kyra/sound_intern.h
+++ b/engines/kyra/sound_intern.h
@@ -184,7 +184,7 @@ public:
 	void haltTrack();
 	void beginFadeOut();
 
-	int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, bool isSfx) { return -1; }
+	int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) { return -1; }
 	void playSoundEffect(uint8 track, uint8 volume = 0xff);
 
 	void updateVolumeSettings();
@@ -337,7 +337,7 @@ public:
 	void haltTrack();
 	void beginFadeOut();
 
-	int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, bool isSfx) { return -1; }
+	int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) { return -1; }
 	void playSoundEffect(uint8 track, uint8 volume = 0xff);
 
 protected: