diff options
| author | Max Horn | 2003-12-16 15:34:17 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-16 15:34:17 +0000 |
| commit | de51f631be939a9da9ef0dd2e5f33fc605bdd01b (patch) | |
| tree | e261edf3012da48b8cfbd506a39694497cc02dfc /sound/mixer.cpp | |
| parent | 0c681181b80d77f11963ec7b5705db6364e403ae (diff) | |
| download | scummvm-rg350-de51f631be939a9da9ef0dd2e5f33fc605bdd01b.tar.gz scummvm-rg350-de51f631be939a9da9ef0dd2e5f33fc605bdd01b.tar.bz2 scummvm-rg350-de51f631be939a9da9ef0dd2e5f33fc605bdd01b.zip | |
cleanup
svn-id: r11686
Diffstat (limited to 'sound/mixer.cpp')
| -rw-r--r-- | sound/mixer.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 805d16a8a7..4937c91934 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -57,22 +57,24 @@ public: virtual ~Channel(); void destroy(); virtual void mix(int16 *data, uint len); - virtual void pause(bool paused) { + + virtual bool isMusicChannel() const = 0; + + void pause(bool paused) { _paused = paused; } - virtual bool isPaused() { + bool isPaused() { return _paused; } - virtual void setChannelVolume(const byte volume) { + void setChannelVolume(const byte volume) { _volume = volume; } - virtual void setChannelPan(const int8 pan) { + void setChannelPan(const int8 pan) { _pan = pan; } - virtual int getVolume() const { + int getVolume() const { return isMusicChannel() ? _mixer->getMusicVolume() : _mixer->getVolume(); } - virtual bool isMusicChannel() const = 0; }; class ChannelRaw : public Channel { |