diff options
author | Travis Howell | 2003-08-14 02:28:19 +0000 |
---|---|---|
committer | Travis Howell | 2003-08-14 02:28:19 +0000 |
commit | cd40c899b2da2b9f0bf857946ac74be119b90bd6 (patch) | |
tree | e3bcaf370898ebbc97279909443c445b7d53451c /scumm/player_v2.h | |
parent | 03524d071e0ab4491165bde7277604468c58c6c1 (diff) | |
download | scummvm-rg350-cd40c899b2da2b9f0bf857946ac74be119b90bd6.tar.gz scummvm-rg350-cd40c899b2da2b9f0bf857946ac74be119b90bd6.tar.bz2 scummvm-rg350-cd40c899b2da2b9f0bf857946ac74be119b90bd6.zip |
Inital support for v1 maniac sound from Hoenicke
Had to move music init for v1/v2 games to get this working
svn-id: r9675
Diffstat (limited to 'scumm/player_v2.h')
-rw-r--r-- | scumm/player_v2.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/scumm/player_v2.h b/scumm/player_v2.h index 6aec549407..c023237ea6 100644 --- a/scumm/player_v2.h +++ b/scumm/player_v2.h @@ -73,18 +73,18 @@ class SoundMixer; class Player_V2 { public: Player_V2(Scumm *scumm); - ~Player_V2(); + virtual ~Player_V2(); - void set_pcjr(bool pcjr); - void set_master_volume(int vol); + virtual void set_pcjr(bool pcjr); + virtual void set_master_volume(int vol); - void startSound(int nr, byte *data); - void stopSound(int nr); - void stopAllSounds(); - bool getSoundStatus(int nr) const; - int getMusicTimer() const; + virtual void startSound(int nr, byte *data); + virtual void stopSound(int nr); + virtual void stopAllSounds(); + virtual bool getSoundStatus(int nr) const; + virtual int getMusicTimer() const; -private: +protected: bool _isV3Game; SoundMixer *_mixer; OSystem *_system; @@ -121,15 +121,15 @@ private: void mutex_up() { _system->lock_mutex (_mutex); } void mutex_down() { _system->unlock_mutex (_mutex); } - void restartSound(); + virtual void restartSound(); void execute_cmd(ChannelInfo *channel); - void next_freqs(ChannelInfo *channel); - void clear_channel(int i); - void chainSound(int nr, byte *data); - void chainNextSound(); + virtual void next_freqs(ChannelInfo *channel); + virtual void clear_channel(int i); + virtual void chainSound(int nr, byte *data); + virtual void chainNextSound(); static void premix_proc(void *param, int16 *buf, uint len); - void do_mix (int16 *buf, uint len); + virtual void do_mix (int16 *buf, uint len); void lowPassFilter(int16 *data, uint len); void squareGenerator(int channel, int freq, int vol, |