diff options
| author | Max Horn | 2007-02-20 18:50:17 +0000 |
|---|---|---|
| committer | Max Horn | 2007-02-20 18:50:17 +0000 |
| commit | 227a080e5b25762dc7a5a942dcfbfdbfcd76c372 (patch) | |
| tree | c524092b2e9bb023bbaced29e8a245cf2cf6dff5 /sound/mixer.h | |
| parent | 547858993725af19d2167857c4e7a4a8ba8da185 (diff) | |
| download | scummvm-rg350-227a080e5b25762dc7a5a942dcfbfdbfcd76c372.tar.gz scummvm-rg350-227a080e5b25762dc7a5a942dcfbfdbfcd76c372.tar.bz2 scummvm-rg350-227a080e5b25762dc7a5a942dcfbfdbfcd76c372.zip | |
Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by me
svn-id: r25752
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index f2bec71057..9b10bbf996 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -102,8 +102,6 @@ private: OSystem *_syst; Common::Mutex _mutex; - Channel *_premixChannel; - int _volumeForSoundType[4]; uint32 _handleSeed; @@ -120,8 +118,8 @@ public: /** * Is the mixer ready and setup? This may not be the case on systems which * don't support digital sound output. In that case, the mixer proc may - * never be called. That in turn can cause breakage in games which use the - * premix callback for syncing. In particular, the Adlib MIDI emulation... + * never be called. That in turn can cause breakage in games which try to + * sync with an audio stream. In particular, the Adlib MIDI emulation... * * @return whether the mixer is ready and setup */ @@ -130,15 +128,6 @@ public: /** - * Set the premix stream. This is mainly used for the adlib music, but - * is not limited to it. The premix stream is invoked by the mixer whenever - * it needs to generate any data, before any other mixing takes place. - */ - void setupPremix(AudioStream *stream, SoundType type = kPlainSoundType); - - - - /** * Start playing the given raw sound data. * Internally, this simply creates an audio input stream wrapping the data * (using the makeLinearInputStream factory function), which is then @@ -182,7 +171,7 @@ public: /** * Stop all currently playing sounds. */ - void stopAll(bool force = false); + void stopAll(); /** * Stop playing the sound with given ID. @@ -201,8 +190,8 @@ public: /** - * Pause/unpause all sounds, including all regular channels and the - * premix channel. + * Pause/unpause all sounds, including all regular and permanent + * channels * * @param paused true to pause everything, false to unpause */ |