diff options
Diffstat (limited to 'sound/softsynth')
-rw-r--r-- | sound/softsynth/adlib.cpp | 4 | ||||
-rw-r--r-- | sound/softsynth/mt32/module.mk | 2 | ||||
-rw-r--r-- | sound/softsynth/mt32/structures.h | 8 | ||||
-rw-r--r-- | sound/softsynth/ym2612.cpp | 20 |
4 files changed, 17 insertions, 17 deletions
diff --git a/sound/softsynth/adlib.cpp b/sound/softsynth/adlib.cpp index 6b0dbca5bb..90f411b1df 100644 --- a/sound/softsynth/adlib.cpp +++ b/sound/softsynth/adlib.cpp @@ -675,8 +675,8 @@ void AdlibPart::pitchBend(int16 bend) { void AdlibPart::controlChange(byte control, byte value) { switch (control) { - case 0: - case 32: + case 0: + case 32: break; // Bank select. Not supported case 1: modulationWheel(value); break; case 7: volume(value); break; diff --git a/sound/softsynth/mt32/module.mk b/sound/softsynth/mt32/module.mk index ac208a563f..4d5d899ac3 100644 --- a/sound/softsynth/mt32/module.mk +++ b/sound/softsynth/mt32/module.mk @@ -10,5 +10,5 @@ MODULE_OBJS := \ tables.o \ freeverb.o -# Include common rules +# Include common rules include $(srcdir)/rules.mk diff --git a/sound/softsynth/mt32/structures.h b/sound/softsynth/mt32/structures.h index 7c6e5f131d..ef58c1d20f 100644 --- a/sound/softsynth/mt32/structures.h +++ b/sound/softsynth/mt32/structures.h @@ -143,7 +143,7 @@ struct MemParams { Bit8u panpot; // PANPOT 0-14 (R-L) Bit8u dummyv[6]; } MT32EMU_ALIGN_PACKED; - + PatchTemp patchSettings[9]; struct RhythmTemp { @@ -152,7 +152,7 @@ struct MemParams { Bit8u panpot; // PANPOT 0-14 (R-L) Bit8u reverbSwitch; // REVERB SWITCH 0-1 (OFF,ON) } MT32EMU_ALIGN_PACKED; - + RhythmTemp rhythmSettings[85]; TimbreParam timbreSettings[8]; @@ -164,7 +164,7 @@ struct MemParams { TimbreParam timbre; Bit8u padding[10]; } MT32EMU_ALIGN_PACKED; - + PaddedTimbre timbres[64 + 64 + 64 + 64]; // Group A, Group B, Memory, Rhythm struct SystemArea { @@ -176,7 +176,7 @@ struct MemParams { Bit8u chanAssign[9]; // MIDI CHANNEL (PART1) 0-16 (1-16,OFF) Bit8u masterVol; // MASTER VOLUME 0-100 } MT32EMU_ALIGN_PACKED; - + SystemArea system; }; diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp index e3aa9d2528..57ad0f1c62 100644 --- a/sound/softsynth/ym2612.cpp +++ b/sound/softsynth/ym2612.cpp @@ -96,8 +96,8 @@ void Operator2612::setInstrument(byte const *instrument) { void Operator2612::keyOn() { _state = _s_attacking; _tickCount = 0; - _phase = 0; - _currentLevel = ((int32)0x7f << 15); + _phase = 0; + _currentLevel = ((int32)0x7f << 15); } void Operator2612::keyOff() { @@ -124,7 +124,7 @@ void Operator2612::frequency(int freq) { else { value = powtbl[(r&3) << 7]; value *= 1 << (r >> 2); - value *= 41; + value *= 41; value /= 1 << (15 + 5); value *= 127 - _specifiedTotalLevel; value /= 127; @@ -228,11 +228,11 @@ void Operator2612::nextTick(const int *phasebuf, int *outbuf, int buflen) { } if (level < zero_level) { - int phaseShift = *phasebuf >> 2; + int phaseShift = *phasebuf >> 2; if (_feedbackLevel) phaseShift += (output << (_feedbackLevel - 1)) / 1024; output = sintbl[((_phase >> 7) + phaseShift) & 0x7ff]; - output >>= (level >> 18); + output >>= (level >> 18); // Here is the original code, which requires 64-bit ints // output *= powtbl[511 - ((level>>25)&511)]; // output >>= 16; @@ -437,9 +437,9 @@ void Voice2612::pitchBend(int value) { } void Voice2612::recalculateFrequency() { - // - // - // + // + // + // int32 basefreq = frequencyTable[_note]; int cfreq = frequencyTable[_note - (_note % 12)]; int oct = _note / 12; @@ -696,7 +696,7 @@ void MidiDriver_YM2612::createLookupTables() { }; // (int)(880.0 * 256.0 * pow(2.0, (note-0x51)/12.0)) - // + // frequencyTable = new int [120]; for (block = -1; block < 9; block++) { for (i = 0; i < 12; i++) { @@ -706,7 +706,7 @@ void MidiDriver_YM2612::createLookupTables() { } keycodeTable = new int [120]; - // detune + // detune for (block = -1; block < 9; block++) { for (i = 0; i < 12; i++) { // see p.204 |