aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sound.h
diff options
context:
space:
mode:
authorJohannes Schickel2008-05-24 22:47:08 +0000
committerJohannes Schickel2008-05-24 22:47:08 +0000
commit335eb1bf0853dbdede70fc4366fd1ff166715198 (patch)
tree40077f06fc91cef4b7937a1af17edfca1f981a87 /engines/kyra/sound.h
parent6866a4e133f2ae505bc142bc4b35e79d48f5191a (diff)
downloadscummvm-rg350-335eb1bf0853dbdede70fc4366fd1ff166715198.tar.gz
scummvm-rg350-335eb1bf0853dbdede70fc4366fd1ff166715198.tar.bz2
scummvm-rg350-335eb1bf0853dbdede70fc4366fd1ff166715198.zip
Committed my fix for bug #1497437 "KYRA1: Subtitles glitch during 'Speech of the Land'".
svn-id: r32260
Diffstat (limited to 'engines/kyra/sound.h')
-rw-r--r--engines/kyra/sound.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/engines/kyra/sound.h b/engines/kyra/sound.h
index 595619c7e9..2427a6cdde 100644
--- a/engines/kyra/sound.h
+++ b/engines/kyra/sound.h
@@ -174,9 +174,9 @@ public:
*
* @param file file to be played
* @param isSfx marks file as sfx instead of voice
- * @return channel the voice file is played on
+ * @return playtime of the voice file (-1 marks unknown playtime)
*/
- virtual bool voicePlay(const char *file, bool isSfx = false);
+ virtual int32 voicePlay(const char *file, bool isSfx = false);
/**
* Checks if a voice is being played.
@@ -186,6 +186,13 @@ public:
bool voiceIsPlaying(const char *file = 0);
/**
+ * Checks how long a voice has been playing
+ *
+ * @return time in milliseconds
+ */
+ uint32 voicePlayedTime(const char *file);
+
+ /**
* Stops playback of the current voice.
*/
void voiceStop(const char *file = 0);
@@ -449,7 +456,7 @@ public:
void haltTrack();
void beginFadeOut();
- bool voicePlay(const char *file, bool isSfx = false);
+ int32 voicePlay(const char *file, bool isSfx = false);
void playSoundEffect(uint8) {}
private: