diff options
| author | Marisa-Chan | 2015-01-23 11:13:06 +0600 |
|---|---|---|
| committer | Marisa-Chan | 2015-01-23 11:13:06 +0600 |
| commit | d67727a7a452354587fb49e58ac3a61cd4ac1fec (patch) | |
| tree | 15897fa53e0057b271686e483b21103d59ade573 /engines/zvision/scripting/effects/music_effect.h | |
| parent | d75fbe79f064e3ee017764024aac173a7d599583 (diff) | |
| download | scummvm-rg350-d67727a7a452354587fb49e58ac3a61cd4ac1fec.tar.gz scummvm-rg350-d67727a7a452354587fb49e58ac3a61cd4ac1fec.tar.bz2 scummvm-rg350-d67727a7a452354587fb49e58ac3a61cd4ac1fec.zip | |
ZVISION: Fix sound bug #6767 by making pan_track code similar to original
Diffstat (limited to 'engines/zvision/scripting/effects/music_effect.h')
| -rw-r--r-- | engines/zvision/scripting/effects/music_effect.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/engines/zvision/scripting/effects/music_effect.h b/engines/zvision/scripting/effects/music_effect.h index 31d538f668..f6cb4a5a1c 100644 --- a/engines/zvision/scripting/effects/music_effect.h +++ b/engines/zvision/scripting/effects/music_effect.h @@ -48,9 +48,9 @@ public: virtual bool process(uint32 deltaTimeInMillis) = 0; virtual void setVolume(uint8 volume) = 0; - - virtual void setPanTrack(int16 pos) = 0; - virtual void unsetPanTrack() = 0; + virtual uint8 getVolume() = 0; + virtual void setDeltaVolume(uint8 volume) = 0; + virtual void setBalance(int8 balance) = 0; virtual void setFade(int32 time, uint8 target) = 0; }; @@ -70,17 +70,16 @@ public: bool process(uint32 deltaTimeInMillis); void setVolume(uint8 volume); - - void setPanTrack(int16 pos); - void unsetPanTrack(); + uint8 getVolume(); + void setDeltaVolume(uint8 volume); + void setBalance(int8 balance); void setFade(int32 time, uint8 target); private: - bool _pantrack; - int32 _pantrackPosition; - int32 _attenuate; uint8 _volume; + uint8 _deltaVolume; + int8 _balance; bool _loop; bool _crossfade; uint8 _crossfadeTarget; @@ -107,9 +106,9 @@ public: bool process(uint32 deltaTimeInMillis); void setVolume(uint8 volume); - - void setPanTrack(int16 pos); - void unsetPanTrack(); + uint8 getVolume(); + void setDeltaVolume(uint8 volume); + void setBalance(int8 balance); void setFade(int32 time, uint8 target); @@ -126,8 +125,11 @@ public: PanTrackNode(ZVision *engine, uint32 key, uint32 slot, int16 pos); ~PanTrackNode(); + bool process(uint32 deltaTimeInMillis); + private: uint32 _slot; + int16 _position; }; } // End of namespace ZVision |