aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorEugene Sandulenko2016-10-09 15:02:02 +0200
committerEugene Sandulenko2016-10-09 15:02:02 +0200
commit355c4fa646c375c2ac42450871ff3d9221d1719d (patch)
tree81ef00feaedcd66821c56b7ae576ca068f8c997b /audio
parentdead4aa01446da2bf711e64a4e681be460fa1202 (diff)
downloadscummvm-rg350-355c4fa646c375c2ac42450871ff3d9221d1719d.tar.gz
scummvm-rg350-355c4fa646c375c2ac42450871ff3d9221d1719d.tar.bz2
scummvm-rg350-355c4fa646c375c2ac42450871ff3d9221d1719d.zip
JANITORIAL: Remove more trailing spaces
Diffstat (limited to 'audio')
-rw-r--r--audio/alsa_opl.cpp4
-rw-r--r--audio/fmopl.cpp2
-rw-r--r--audio/miles_adlib.cpp6
-rw-r--r--audio/softsynth/fmtowns_pc98/towns_euphony.cpp8
-rw-r--r--audio/softsynth/fmtowns_pc98/towns_euphony.h8
5 files changed, 14 insertions, 14 deletions
diff --git a/audio/alsa_opl.cpp b/audio/alsa_opl.cpp
index 6b9e48e987..faad4018cd 100644
--- a/audio/alsa_opl.cpp
+++ b/audio/alsa_opl.cpp
@@ -123,7 +123,7 @@ void OPL::clear() {
} else if (_type == Config::kOpl2) {
for (int i = 0; i < kOpl2Operators; ++i) {
_oper[i].left = 1;
- _oper[i].right = 1;
+ _oper[i].right = 1;
}
}
}
@@ -152,7 +152,7 @@ bool OPL::init() {
while (!snd_ctl_hwdep_next_device(ctl, &dev) && dev >= 0) {
name = Common::String::format("hw:%d,%d", card, dev);
- if (snd_hwdep_open(&_opl, name.c_str(), SND_HWDEP_OPEN_WRITE) < 0)
+ if (snd_hwdep_open(&_opl, name.c_str(), SND_HWDEP_OPEN_WRITE) < 0)
continue;
if (!snd_hwdep_info(_opl, info)) {
diff --git a/audio/fmopl.cpp b/audio/fmopl.cpp
index cc00ace264..a43b08c422 100644
--- a/audio/fmopl.cpp
+++ b/audio/fmopl.cpp
@@ -248,7 +248,7 @@ void RealOPL::onTimer() {
if (_baseFreq > kMaxFreq) {
// We run faster than our max, so run the callback multiple
// times to approximate the actual timer callback frequency.
- uint totalTicks = _baseFreq + _remainingTicks;
+ uint totalTicks = _baseFreq + _remainingTicks;
callbacks = totalTicks / kMaxFreq;
_remainingTicks = totalTicks % kMaxFreq;
}
diff --git a/audio/miles_adlib.cpp b/audio/miles_adlib.cpp
index 0693d1e7ac..790e38932d 100644
--- a/audio/miles_adlib.cpp
+++ b/audio/miles_adlib.cpp
@@ -561,7 +561,7 @@ void MidiDriver_Miles_AdLib::noteOff(byte midiChannel, byte note) {
_virtualFmVoices[virtualFmVoice].sustained = true;
continue;
}
- //
+ //
releaseFmVoice(virtualFmVoice);
}
}
@@ -601,7 +601,7 @@ void MidiDriver_Miles_AdLib::prioritySort() {
}
}
- //
+ //
while (virtualFmVoicesCount) {
uint16 unvoicedHighestPriority = 0;
byte unvoicedHighestFmVoice = 0;
@@ -688,7 +688,7 @@ void MidiDriver_Miles_AdLib::releaseFmVoice(byte virtualFmVoice) {
// One less voice active on this MIDI channel
assert(_midiChannels[midiChannel].currentActiveVoicesCount);
- _midiChannels[midiChannel].currentActiveVoicesCount--;
+ _midiChannels[midiChannel].currentActiveVoicesCount--;
}
void MidiDriver_Miles_AdLib::releaseSustain(byte midiChannel) {
diff --git a/audio/softsynth/fmtowns_pc98/towns_euphony.cpp b/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
index aea714f68f..d63f990282 100644
--- a/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_euphony.cpp
@@ -62,7 +62,7 @@ bool EuphonyPlayer::init() {
}
}
}
-
+
if (!_drivers[0] || !_drivers[1])
return false;
@@ -323,7 +323,7 @@ bool EuphonyPlayer::parseEvent() {
EVENT(programChange_channelAftertouch),
EVENT(programChange_channelAftertouch),
EVENT(controlChange_pitchWheel),
-
+
EVENT(sysex),
EVENT(advanceBar),
EVENT(notImpl),
@@ -661,7 +661,7 @@ bool EuphonyDriver::init() {
delete[] _channels;
delete[] _partToChanMapping;
delete[] _sustainChannels;
-
+
_channels = new Channel[128];
_partToChanMapping = new int8[16];
_sustainChannels = new int8[16];
@@ -674,7 +674,7 @@ void EuphonyDriver::reset() {
_intf->callback(74);
_intf->callback(70, 0);
_intf->callback(75, 3);
-
+
_currentEvent.clear();
memset(_sustainChannels, 0, 16);
memset(_partToChanMapping, -1, 16);
diff --git a/audio/softsynth/fmtowns_pc98/towns_euphony.h b/audio/softsynth/fmtowns_pc98/towns_euphony.h
index 76aa153a37..65e55fac40 100644
--- a/audio/softsynth/fmtowns_pc98/towns_euphony.h
+++ b/audio/softsynth/fmtowns_pc98/towns_euphony.h
@@ -120,7 +120,7 @@ public:
int setTempo(int tempo);
void setLoopStatus(bool loop);
-
+
bool isPlaying() {return _playing; }
int configPart_enable(int part, int val);
@@ -148,10 +148,10 @@ private:
void updateHangingNotes();
void clearHangingNotes();
-
+
void resetAllControls();
void allPartsOff();
-
+
uint8 appendEvent(uint8 evt, uint8 chan);
typedef bool(EuphonyPlayer::*EuphonyEvent)();
@@ -190,7 +190,7 @@ private:
uint16 len;
SavedEvent *next;
};
-
+
SavedEvent *_savedEventsChain;
uint8 _defaultBarLength;