diff options
| author | Paul Gilbert | 2018-05-04 21:46:39 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-05-04 21:46:39 -0400 |
| commit | 9db2f3cd8412faaa4771a17a8479f107e54e148f (patch) | |
| tree | c1f8ed76556fe952139fa2be8017a732b4b227a6 /engines/xeen/sound_driver.h | |
| parent | 8fdf592fe12760150bffd309ed0839d8107c75cb (diff) | |
| download | scummvm-rg350-9db2f3cd8412faaa4771a17a8479f107e54e148f.tar.gz scummvm-rg350-9db2f3cd8412faaa4771a17a8479f107e54e148f.tar.bz2 scummvm-rg350-9db2f3cd8412faaa4771a17a8479f107e54e148f.zip | |
XEEN: In progress splitting of music and sfx volumes in sound driver
Diffstat (limited to 'engines/xeen/sound_driver.h')
| -rw-r--r-- | engines/xeen/sound_driver.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/xeen/sound_driver.h b/engines/xeen/sound_driver.h index c78408b047..d4edd49c05 100644 --- a/engines/xeen/sound_driver.h +++ b/engines/xeen/sound_driver.h @@ -40,8 +40,7 @@ namespace OPL { namespace Xeen { enum MusicCommand { - STOP_SONG = 0, RESTART_SONG = 1, SET_VOLUME = 0x100, - GET_STATUS = 0xFFE0 + STOP_SONG = 0, RESTART_SONG = 1, SET_VOLUME = 0x100, GET_STATUS = 0xFFE0 }; class SoundDriver; @@ -170,7 +169,7 @@ public: /** * Executes special music command */ - virtual int songCommand(uint commandId, byte volume = 0); + virtual int songCommand(uint commandId, byte musicVolume = 0, byte sfxVolume = 0); /** * Returns whether music is currently playing @@ -200,7 +199,7 @@ private: int _field180; int _field181; int _field182; - int _volume; + int _musicVolume, _sfxVolume; private: /** * Initializes the state of the Adlib OPL driver @@ -246,7 +245,7 @@ private: /** * Starts playing an instrument */ - void playInstrument(byte channelNum, const byte *data); + void playInstrument(byte channelNum, const byte *data, byte volume); protected: virtual bool musSetInstrument(const byte *&srcP, byte param); virtual bool musSetPitchWheel(const byte *&srcP, byte param); @@ -301,7 +300,7 @@ public: /** * Executes special music command */ - virtual int songCommand(uint commandId, byte volume = 0); + virtual int songCommand(uint commandId, byte musicVolume = 0, byte sfxVolume = 0); }; } // End of namespace Xeen |