aboutsummaryrefslogtreecommitdiff
path: root/sound/softsynth
diff options
context:
space:
mode:
Diffstat (limited to 'sound/softsynth')
-rw-r--r--sound/softsynth/adlib.cpp26
-rw-r--r--sound/softsynth/emumidi.h6
-rw-r--r--sound/softsynth/fluidsynth.cpp2
-rw-r--r--sound/softsynth/mt32.cpp12
-rw-r--r--sound/softsynth/mt32/freeverb.cpp8
-rw-r--r--sound/softsynth/mt32/freeverb.h6
-rw-r--r--sound/softsynth/mt32/part.h2
-rw-r--r--sound/softsynth/mt32/synth.cpp14
-rw-r--r--sound/softsynth/mt32/tables.cpp2
-rw-r--r--sound/softsynth/ym2612.cpp2
10 files changed, 40 insertions, 40 deletions
diff --git a/sound/softsynth/adlib.cpp b/sound/softsynth/adlib.cpp
index 5f0d0435bd..8fb7aea19e 100644
--- a/sound/softsynth/adlib.cpp
+++ b/sound/softsynth/adlib.cpp
@@ -195,7 +195,7 @@ struct AdlibVoice {
Struct11 _s11a;
Struct10 _s10b;
Struct11 _s11b;
-
+
AdlibVoice() { memset(this, 0, sizeof(AdlibVoice)); }
};
@@ -461,14 +461,14 @@ static byte gm_percussion_to_fm[39][30] = {
};
static const byte gm_percussion_lookup[128] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,
- 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0xFF, 0xFF, 0x17, 0x18, 0x19, 0x1A,
- 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x21, 0x22, 0x23, 0xFF, 0xFF,
- 0x24, 0x25, 0xFF, 0xFF, 0xFF, 0x26, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C,
+ 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0xFF, 0xFF, 0x17, 0x18, 0x19, 0x1A,
+ 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x21, 0x22, 0x23, 0xFF, 0xFF,
+ 0x24, 0x25, 0xFF, 0xFF, 0xFF, 0x26, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
};
static byte lookup_table[64][32];
@@ -551,7 +551,7 @@ public:
void send(byte channel, uint32 b); // Supports higher than channel 15
uint32 property(int prop, uint32 param);
- void setPitchBendRange(byte channel, uint range);
+ void setPitchBendRange(byte channel, uint range);
void sysEx_customInstrument(byte channel, uint32 type, byte *instr);
MidiChannel *allocateChannel();
@@ -798,7 +798,7 @@ void AdlibPercussionChannel::noteOn(byte note, byte velocity) {
// MidiDriver method implementations
-MidiDriver_ADLIB::MidiDriver_ADLIB(Audio::Mixer *mixer)
+MidiDriver_ADLIB::MidiDriver_ADLIB(Audio::Mixer *mixer)
: MidiDriver_Emulated(mixer) {
uint i;
@@ -865,7 +865,7 @@ void MidiDriver_ADLIB::close() {
// Turn off the OPL emulation
// YM3812Shutdown();
-
+
free(_adlib_reg_cache);
}
@@ -1308,7 +1308,7 @@ AdlibVoice *MidiDriver_ADLIB::allocate_voice(byte pri) {
}
/* V3 games don't have note priorities, first comes wins. */
- if (_game_SmallHeader)
+ if (_game_SmallHeader)
return NULL;
if (best)
diff --git a/sound/softsynth/emumidi.h b/sound/softsynth/emumidi.h
index 579aebeeff..75559530f3 100644
--- a/sound/softsynth/emumidi.h
+++ b/sound/softsynth/emumidi.h
@@ -46,10 +46,10 @@ protected:
public:
MidiDriver_Emulated(Audio::Mixer *mixer) : _mixer(mixer) {
_isOpen = false;
-
+
_timerProc = 0;
_timerParam = 0;
-
+
_nextTick = 0;
_samplesPerTick = 0;
@@ -89,7 +89,7 @@ public:
step = (_nextTick >> FIXP_SHIFT);
generateSamples(data, step);
-
+
_nextTick -= step << FIXP_SHIFT;
if (!(_nextTick >> FIXP_SHIFT)) {
if (_timerProc)
diff --git a/sound/softsynth/fluidsynth.cpp b/sound/softsynth/fluidsynth.cpp
index 5bcf0993af..563dbd84f1 100644
--- a/sound/softsynth/fluidsynth.cpp
+++ b/sound/softsynth/fluidsynth.cpp
@@ -73,7 +73,7 @@ MidiDriver_FluidSynth::MidiDriver_FluidSynth(Audio::Mixer *mixer)
}
// It ought to be possible to get FluidSynth to generate samples at
- // lower
+ // lower
_outputRate = _mixer->getOutputRate();
if (_outputRate < 22050)
diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp
index 94373b980a..2cef1cbedf 100644
--- a/sound/softsynth/mt32.cpp
+++ b/sound/softsynth/mt32.cpp
@@ -238,7 +238,7 @@ int MidiDriver_MT32::open() {
return MERR_ALREADY_OPEN;
MidiDriver_Emulated::open();
-
+
memset(&prop, 0, sizeof(prop));
prop.sampleRate = getRate();
prop.useReverb = true;
@@ -253,10 +253,10 @@ int MidiDriver_MT32::open() {
_synth = new MT32Emu::Synth();
_initialising = true;
const byte dummy_palette[] = {
- 0, 0, 0, 0,
- 0, 0, 171, 0,
- 0, 171, 0, 0,
- 0, 171, 171, 0,
+ 0, 0, 0, 0,
+ 0, 0, 171, 0,
+ 0, 171, 0, 0,
+ 0, 171, 171, 0,
171, 0, 0, 0
};
@@ -470,7 +470,7 @@ void MidiDriver_ThreadedMT32::onTimer() {
MidiDriver *MidiDriver_MT32_create(Audio::Mixer *mixer) {
// HACK: It will stay here until engine plugin loader overhaul
- if (ConfMan.hasKey("extrapath"))
+ if (ConfMan.hasKey("extrapath"))
Common::File::addDefaultDirectory(ConfMan.get("extrapath"));
return new MidiDriver_MT32(mixer);
}
diff --git a/sound/softsynth/mt32/freeverb.cpp b/sound/softsynth/mt32/freeverb.cpp
index 42865c1e71..0a75e7bc70 100644
--- a/sound/softsynth/mt32/freeverb.cpp
+++ b/sound/softsynth/mt32/freeverb.cpp
@@ -26,7 +26,7 @@
// Comb filter implementation
//
-// Written by
+// Written by
// http://www.dreampoint.co.uk
// This code is public domain
@@ -39,7 +39,7 @@ comb::comb() {
}
void comb::setbuffer(float *buf, int size) {
- buffer = buf;
+ buffer = buf;
bufsize = size;
}
@@ -49,7 +49,7 @@ void comb::mute() {
}
void comb::setdamp(float val) {
- damp1 = val;
+ damp1 = val;
damp2 = 1 - val;
}
@@ -72,7 +72,7 @@ allpass::allpass() {
}
void allpass::setbuffer(float *buf, int size) {
- buffer = buf;
+ buffer = buf;
bufsize = size;
}
diff --git a/sound/softsynth/mt32/freeverb.h b/sound/softsynth/mt32/freeverb.h
index 2a5d662a44..b34413f188 100644
--- a/sound/softsynth/mt32/freeverb.h
+++ b/sound/softsynth/mt32/freeverb.h
@@ -101,10 +101,10 @@ private:
inline float allpass::process(float input) {
float output;
float bufout;
-
+
bufout = buffer[bufidx];
undenormalise(bufout);
-
+
output = -input + bufout;
buffer[bufidx] = input + (bufout * feedback);
@@ -196,7 +196,7 @@ private:
float width;
float mode;
- // The following are all declared inline
+ // The following are all declared inline
// to remove the need for dynamic allocation
// with its subsequent error-checking messiness
diff --git a/sound/softsynth/mt32/part.h b/sound/softsynth/mt32/part.h
index 8a5612e32d..54c4999653 100644
--- a/sound/softsynth/mt32/part.h
+++ b/sound/softsynth/mt32/part.h
@@ -42,7 +42,7 @@ private:
PatchCache patchCache[4];
- float bend; // -1.0 .. +1.0
+ float bend; // -1.0 .. +1.0
dpoly polyTable[MT32EMU_MAX_POLY];
diff --git a/sound/softsynth/mt32/synth.cpp b/sound/softsynth/mt32/synth.cpp
index 66832b0e59..62356dcda9 100644
--- a/sound/softsynth/mt32/synth.cpp
+++ b/sound/softsynth/mt32/synth.cpp
@@ -824,31 +824,31 @@ void Synth::readMemoryRegion(const MemoryRegion *region, Bit32u addr, Bit32u len
switch(region->type) {
case MR_PatchTemp:
- for (m = 0; m < len; m++)
+ for (m = 0; m < len; m++)
data[m] = ((Bit8u *)&mt32ram.patchSettings[first])[off + m];
break;
case MR_RhythmTemp:
- for (m = 0; m < len; m++)
+ for (m = 0; m < len; m++)
data[m] = ((Bit8u *)&mt32ram.rhythmSettings[first])[off + m];
break;
case MR_TimbreTemp:
- for (m = 0; m < len; m++)
+ for (m = 0; m < len; m++)
data[m] = ((Bit8u *)&mt32ram.timbreSettings[first])[off + m];
break;
case MR_Patches:
- for (m = 0; m < len; m++)
+ for (m = 0; m < len; m++)
data[m] = ((Bit8u *)&mt32ram.patches[first])[off + m];
break;
case MR_Timbres:
- for (m = 0; m < len; m++)
+ for (m = 0; m < len; m++)
data[m] = ((Bit8u *)&mt32ram.timbres[first])[off + m];
break;
case MR_System:
- for (m = 0; m < len; m++)
+ for (m = 0; m < len; m++)
data[m] = ((Bit8u *)&mt32ram.system)[m + off];
break;
default:
- for (m = 0; m < len; m += 2) {
+ for (m = 0; m < len; m += 2) {
data[m] = 0xff;
if (m + 1 < len) {
data[m+1] = (Bit8u)region->type;
diff --git a/sound/softsynth/mt32/tables.cpp b/sound/softsynth/mt32/tables.cpp
index e12f306cf9..006f91d0b8 100644
--- a/sound/softsynth/mt32/tables.cpp
+++ b/sound/softsynth/mt32/tables.cpp
@@ -170,7 +170,7 @@ void Tables::initEnvelopes(float samplerate) {
}
envDeltaMaxTime[lf] = (int)cap;
}
-
+
// This (approximately) represents the time durations when the target level is 0.
// Not sure why this is a special case, but it's seen to be from the real thing.
diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp
index e37b50170e..80c0cad8e8 100644
--- a/sound/softsynth/ym2612.cpp
+++ b/sound/softsynth/ym2612.cpp
@@ -106,7 +106,7 @@ protected:
int _frequencyOffs;
int _frequency;
int _algorithm;
-
+
int *_buffer;
int _buflen;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 21:14:40 +0000