diff options
author | Jordi Vilalta Prat | 2010-10-12 02:18:11 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2010-10-12 02:18:11 +0000 |
commit | 8388e0dfea4ae0d80e51368acd12685c740c5bb5 (patch) | |
tree | f960376a145a830cd77b08264c1412f71ec02f7e /sound/softsynth/fmtowns_pc98 | |
parent | 43161858ac14bae4ac6dea114d8b3e7a8c1b293b (diff) | |
download | scummvm-rg350-8388e0dfea4ae0d80e51368acd12685c740c5bb5.tar.gz scummvm-rg350-8388e0dfea4ae0d80e51368acd12685c740c5bb5.tar.bz2 scummvm-rg350-8388e0dfea4ae0d80e51368acd12685c740c5bb5.zip |
JANITORAL: Clean trailing whitespaces.
svn-id: r53160
Diffstat (limited to 'sound/softsynth/fmtowns_pc98')
-rw-r--r-- | sound/softsynth/fmtowns_pc98/towns_audio.cpp | 16 | ||||
-rw-r--r-- | sound/softsynth/fmtowns_pc98/towns_euphony.cpp | 4 | ||||
-rw-r--r-- | sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp | 2 | ||||
-rw-r--r-- | sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sound/softsynth/fmtowns_pc98/towns_audio.cpp b/sound/softsynth/fmtowns_pc98/towns_audio.cpp index 9823015a2d..aa6df1db5a 100644 --- a/sound/softsynth/fmtowns_pc98/towns_audio.cpp +++ b/sound/softsynth/fmtowns_pc98/towns_audio.cpp @@ -228,7 +228,7 @@ TownsAudioInterface::TownsAudioInterface(Audio::Mixer *mixer, TownsAudioInterfac TownsAudioInterface::~TownsAudioInterface() { reset(); _ready = false; - deinit(); + deinit(); delete[] _fmSaveReg[0]; delete[] _fmSaveReg[1]; @@ -495,7 +495,7 @@ int TownsAudioInterface::intf_enableTimerB(va_list &args) { int TownsAudioInterface::intf_loadSamples(va_list &args) { uint32 dest = va_arg(args, uint32); int size = va_arg(args, int); - uint8 *src = va_arg(args, uint8*); + uint8 *src = va_arg(args, uint8*); if (dest >= 65536 || size == 0 || size > 65536) return 3; @@ -567,7 +567,7 @@ int TownsAudioInterface::intf_loadWaveTable(va_list &args) { TownsAudio_WaveTable *s = &_waveTables[_numWaveTables++]; s->readHeader(data); - + _waveTablesTotalDataSize += s->size; callback(32, _waveTablesTotalDataSize, s->size, data + 32); @@ -723,11 +723,11 @@ int TownsAudioInterface::intf_setOutputVolume(va_list &args) { static const uint8 flags[] = { 0x0C, 0x30, 0x40, 0x80 }; uint8 chan = (chanType & 0x40) ? 8 : 12; - + chanType &= 3; left = (left & 0x7e) >> 1; right = (right & 0x7e) >> 1; - + if (chan) _outputVolumeFlags |= flags[chanType]; else @@ -1399,13 +1399,13 @@ void TownsAudioInterface::updateOutputVolume() { // FM Towns seems to support volumes of 0 - 63 for each channel. // We recalculate sane values for our 0 to 255 volume range and // balance values for our -128 to 127 volume range - + // CD-AUDIO uint32 maxVol = MAX(_outputLevel[12], _outputLevel[13]); - + int volume = (int)(((float)(maxVol * 255) / 63.0f)); int balance = maxVol ? (int)( ( ((int)_outputLevel[13] - _outputLevel[12]) * 127) / (float)maxVol) : 0; - + AudioCD.setVolume(volume); AudioCD.setBalance(balance); } diff --git a/sound/softsynth/fmtowns_pc98/towns_euphony.cpp b/sound/softsynth/fmtowns_pc98/towns_euphony.cpp index 626c0166e5..7b52b4594f 100644 --- a/sound/softsynth/fmtowns_pc98/towns_euphony.cpp +++ b/sound/softsynth/fmtowns_pc98/towns_euphony.cpp @@ -131,7 +131,7 @@ void TownsEuphonyDriver::unloadWaveTable(int id) { void TownsEuphonyDriver::reserveSoundEffectChannels(int num) { _intf->callback(33, num); uint32 volMask = 0; - + if (num > 8) return; @@ -139,7 +139,7 @@ void TownsEuphonyDriver::reserveSoundEffectChannels(int num) { volMask |= v; v >>= 1; } - + _intf->setSoundEffectChanMask(volMask); } diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp index 4676ed774a..8047616dbf 100644 --- a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp +++ b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp @@ -1055,7 +1055,7 @@ TownsPC98_AudioDriver::TownsPC98_AudioDriver(Audio::Mixer *mixer, EmuType type) TownsPC98_AudioDriver::~TownsPC98_AudioDriver() { reset(); _ready = false; - deinit(); + deinit(); if (_channels) { for (int i = 0; i < _numChan; i++) diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp index 541d582c1c..e779812c42 100644 --- a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp +++ b/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp @@ -845,7 +845,7 @@ TownsPC98_FmSynth::TownsPC98_FmSynth(Audio::Mixer *mixer, EmuType type) : memset(&_timers[1], 0, sizeof(ChipTimer)); _timers[0].cb = _timers[1].cb = &TownsPC98_FmSynth::idleTimerCallback; - _timerbase = (uint32)(_baserate * 1000000.0f); + _timerbase = (uint32)(_baserate * 1000000.0f); } TownsPC98_FmSynth::~TownsPC98_FmSynth() { @@ -1179,7 +1179,7 @@ int TownsPC98_FmSynth::readBuffer(int16 *buffer, const int numSamples) { void TownsPC98_FmSynth::deinit() { _ready = false; - _mixer->stopHandle(_soundHandle); + _mixer->stopHandle(_soundHandle); Common::StackLock lock(_mutex); _timers[0].cb = _timers[1].cb = &TownsPC98_FmSynth::idleTimerCallback; } |