diff options
| author | athrxx | 2019-03-20 21:48:26 +0100 |
|---|---|---|
| committer | athrxx | 2019-03-22 21:03:54 +0100 |
| commit | 1cfa6c087a88eb795dc0ae46cbeb5a578318a317 (patch) | |
| tree | fe8bf6b8dbc7d47f8b24edf0277410c5c839c047 /audio | |
| parent | 73678257b95f49319f7789943e4a8b1855e18c8b (diff) | |
| download | scummvm-rg350-1cfa6c087a88eb795dc0ae46cbeb5a578318a317.tar.gz scummvm-rg350-1cfa6c087a88eb795dc0ae46cbeb5a578318a317.tar.bz2 scummvm-rg350-1cfa6c087a88eb795dc0ae46cbeb5a578318a317.zip | |
AUDIO: (FM-TOWNS/PC-98) - silence some compiler warnings
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/softsynth/fmtowns_pc98/pc98_audio.cpp | 8 | ||||
| -rw-r--r-- | audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp | 4 | ||||
| -rw-r--r-- | audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/audio/softsynth/fmtowns_pc98/pc98_audio.cpp b/audio/softsynth/fmtowns_pc98/pc98_audio.cpp index d6c6fc94e3..3ad100911a 100644 --- a/audio/softsynth/fmtowns_pc98/pc98_audio.cpp +++ b/audio/softsynth/fmtowns_pc98/pc98_audio.cpp @@ -61,8 +61,6 @@ private: const uint16 _port1, _port2, _port3, _port4; uint8 _address[2]; - uint16 _frequency; - PC98AudioPluginDriver *_drv; void *_drvOwner; bool _ready; @@ -77,8 +75,8 @@ PC98AudioCoreInternal::PC98AudioCoreInternal(Audio::Mixer *mixer, PC98AudioCore _musicVolume(Audio::Mixer::kMaxMixerVolume), _sfxVolume(Audio::Mixer::kMaxMixerVolume), _port1(type == PC98AudioPluginDriver::kTypeTowns ? 0x4D8 : 0x188), _port2(type == PC98AudioPluginDriver::kTypeTowns ? 0x4DA : 0x18A), _port3(type == PC98AudioPluginDriver::kTypeTowns ? 0x4DC : 0x18C), _port4(type == PC98AudioPluginDriver::kTypeTowns ? 0x4DE : 0x18E), - _frequency(0), _ready(false) { - _address[0] = _address[1] = 0xFF; + _ready(false) { + _address[0] = _address[1] = 0xFF; } PC98AudioCoreInternal::~PC98AudioCoreInternal() { @@ -287,4 +285,4 @@ PC98AudioCore::MutexLock::MutexLock(PC98AudioCoreInternal *pc98int) : _pc98int(p PC98AudioCore::MutexLock::~MutexLock() { if (_pc98int) _pc98int->mutex().unlock(); -}
\ No newline at end of file +} diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp index b5e8c84491..ed1b85170b 100644 --- a/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp +++ b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.cpp @@ -184,8 +184,6 @@ private: bool control_f1_prcStart(uint8 para); bool control_ff_endOfTrack(uint8 para); - uint8 _algorithm; - typedef Common::Functor1Mem<uint8, bool, TownsPC98_MusicChannelPCM> ControlEvent; Common::Array<const ControlEvent*> _controlEvents; }; @@ -983,7 +981,7 @@ void TownsPC98_SfxChannel::reset() { #ifndef DISABLE_PC98_RHYTHM_CHANNEL #define CONTROL(x) _controlEvents.push_back(new ControlEvent(this, &TownsPC98_MusicChannelPCM::control_##x)) TownsPC98_MusicChannelPCM::TownsPC98_MusicChannelPCM(TownsPC98_AudioDriver *driver, uint8 regOffs, uint8 flgs, uint8 num, uint8 key, uint8 prt, uint8 id) : -TownsPC98_MusicChannel(driver, regOffs, flgs, num, key, prt, id), _algorithm(0x80) { +TownsPC98_MusicChannel(driver, regOffs, flgs, num, key, prt, id) { CONTROL(dummy); CONTROL(f1_prcStart); CONTROL(dummy); diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h index 58b7ccb230..0c4a77875f 100644 --- a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h +++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h @@ -142,8 +142,6 @@ private: int32 *_oprLevelOut; int32 *_oprDetune; - bool _regProtectionFlag; - typedef void (TownsPC98_FmSynth::*ChipTimerProc)(); void idleTimerCallback() {} |