aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.h
diff options
context:
space:
mode:
authorMax Horn2003-09-06 10:47:30 +0000
committerMax Horn2003-09-06 10:47:30 +0000
commit0be019601319c8536cf42a64e97408ba6fb1716b (patch)
tree47516a70382359f83871ad61b2e56700fd26aad6 /sound/mixer.h
parentc951e5f8420c858b6253b05fecf362646c872c8a (diff)
downloadscummvm-rg350-0be019601319c8536cf42a64e97408ba6fb1716b.tar.gz
scummvm-rg350-0be019601319c8536cf42a64e97408ba6fb1716b.tar.bz2
scummvm-rg350-0be019601319c8536cf42a64e97408ba6fb1716b.zip
removed pauseMixer method from mixer, and renamed stop to stopChannel
svn-id: r10042
Diffstat (limited to 'sound/mixer.h')
-rw-r--r--sound/mixer.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/mixer.h b/sound/mixer.h
index 8fd7883418..d688513d01 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -72,7 +72,7 @@ private:
int _globalVolume;
int _musicVolume;
- bool _paused, _channelsPaused;
+ bool _paused;
Channel *_channels[NUM_CHANNELS];
@@ -112,7 +112,7 @@ public:
void stopAll();
/** stop playing the given channel */
- void stop(int channel);
+ void stopChannel(int channel);
/** stop playing the sound with given ID */
void stopID(int id);
@@ -120,9 +120,6 @@ public:
/** stop playing the channel for the given handle */
void stopHandle(PlayingSoundHandle handle);
- /** pause/unpause all mixing (including adlib) */
- void pauseMixer(bool paused);
-
/** pause/unpause all channels */
void pauseAll(bool paused);