aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.h
diff options
context:
space:
mode:
authorJerome Fisher2004-11-28 22:15:09 +0000
committerJerome Fisher2004-11-28 22:15:09 +0000
commit45d92a02f4061fbb54baedc66d7d9d233e857125 (patch)
tree8b6777777fd030706fe8de655b38d3ec88916c89 /sound/mixer.h
parent1947aa48accc4fee082a0df0a7f1ec4dd0b29b2a (diff)
downloadscummvm-rg350-45d92a02f4061fbb54baedc66d7d9d233e857125.tar.gz
scummvm-rg350-45d92a02f4061fbb54baedc66d7d9d233e857125.tar.bz2
scummvm-rg350-45d92a02f4061fbb54baedc66d7d9d233e857125.zip
Added a "permanent" field to Channels, which simply prevents them from being deleted during stopAll().
I hope this doesn't step on anyone's toes; it was quite urgent, since loading a saved game stopped MT-32 emulation audio forever. svn-id: r15946
Diffstat (limited to 'sound/mixer.h')
-rw-r--r--sound/mixer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/mixer.h b/sound/mixer.h
index b51f4976b1..b071c7b293 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -131,14 +131,14 @@ public:
/**
* Start playing the given audio input stream.
*/
- void playInputStream(PlayingSoundHandle *handle, AudioStream *input, bool isMusic, byte volume = 255, int8 balance = 0, int id = -1, bool autofreeStream = true);
+ void playInputStream(PlayingSoundHandle *handle, AudioStream *input, bool isMusic, byte volume = 255, int8 balance = 0, int id = -1, bool autofreeStream = true, bool permanent = false);
/**
* Stop all currently playing sounds.
*/
- void stopAll();
+ void stopAll(bool force = false);
/**
* Stop playing the sound with given ID.