diff options
Diffstat (limited to 'sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp')
| -rw-r--r-- | sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp index 21e8f9b2e5..3cf4caf0d1 100644 --- a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp +++ b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp @@ -160,7 +160,7 @@ public: void reset(); }; -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL class TownsPC98_MusicChannelPCM : public TownsPC98_MusicChannel { public: TownsPC98_MusicChannelPCM(TownsPC98_AudioDriver *driver, uint8 regOffs, @@ -930,7 +930,7 @@ void TownsPC98_SfxChannel::reset() { _drv->_ssgPatches[i + 12] = src[i + 12]; } -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL 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), controlEvents(0) { @@ -1019,11 +1019,11 @@ bool TownsPC98_MusicChannelPCM::control_ff_endOfTrack(uint8 para) { return false; } } -#endif // ifndef __DS__ +#endif // DISABLE_PC98_RHYTHM_CHANNEL TownsPC98_AudioDriver::TownsPC98_AudioDriver(Audio::Mixer *mixer, EmuType type) : TownsPC98_FmSynth(mixer, type), _channels(0), _ssgChannels(0), _sfxChannels(0), -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL _rhythmChannel(0), #endif _trackPtr(0), _sfxData(0), _sfxOffs(0), _ssgPatches(0), @@ -1035,7 +1035,7 @@ TownsPC98_AudioDriver::TownsPC98_AudioDriver(Audio::Mixer *mixer, EmuType type) _updateChannelsFlag(type == kType26 ? 0x07 : 0x3F), _finishedChannelsFlag(0), _updateSSGFlag(type == kTypeTowns ? 0x00 : 0x07), _finishedSSGFlag(0), _updateRhythmFlag(type == kType86 ? -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL 0x01 #else 0x00 @@ -1075,7 +1075,7 @@ TownsPC98_AudioDriver::~TownsPC98_AudioDriver() { delete _sfxChannels[i]; delete[] _sfxChannels; } -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL delete _rhythmChannel; #endif @@ -1121,7 +1121,7 @@ bool TownsPC98_AudioDriver::init() { } } -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL if (_hasPercussion) { _rhythmChannel = new TownsPC98_MusicChannelPCM(this, 0, 0, 0, 0, 0, 1); _rhythmChannel->init(); @@ -1168,7 +1168,7 @@ void TownsPC98_AudioDriver::loadMusicData(uint8 *data, bool loadPaused) { } if (_hasPercussion) { -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL _rhythmChannel->loadData(data + READ_LE_UINT16(src_a)); #endif src_a += 2; @@ -1230,7 +1230,7 @@ void TownsPC98_AudioDriver::reset() { memcpy(_ssgPatches, _drvTables + 156, 256); } -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL if (_rhythmChannel) _rhythmChannel->reset(); #endif @@ -1253,7 +1253,7 @@ void TownsPC98_AudioDriver::fadeStep() { if (!_fading) { _fading = 19; -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL if (_hasPercussion) { if (_updateRhythmFlag & _rhythmChannel->_idFlag) _rhythmChannel->reset(); @@ -1285,7 +1285,7 @@ void TownsPC98_AudioDriver::timerCallbackB() { } } -#ifndef __DS__ +#ifndef DISABLE_PC98_RHYTHM_CHANNEL if (_hasPercussion) if (_updateRhythmFlag & _rhythmChannel->_idFlag) _rhythmChannel->processEvents(); |