thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AUDIO: Fix struct and const init, add missing breaks

Browse source
This commit is contained in:
Coen Rampen 2021-07-02 15:37:44 +02:00
parent 5f09a046d1
commit d897fe590e
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
audio/adlib_ms.cpp
View file

@ -320,8 +320,6 @@ const uint8 MidiDriver_ADLIB_Multisource::OPL_VOLUME_LOOKUP[32] = {
0x09, 0x08, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00 0x09, 0x08, 0x07, 0x06, 0x05, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00
}; };
const float MidiDriver_ADLIB_Multisource::OPL_FREQUENCY_CONVERSION_FACTOR = pow(2, 20) / 49716.0f;
MidiDriver_ADLIB_Multisource::MidiChannelControlData::MidiChannelControlData() { MidiDriver_ADLIB_Multisource::MidiChannelControlData::MidiChannelControlData() {
init(); init();
} }
@ -384,7 +382,8 @@ MidiDriver_ADLIB_Multisource::MidiDriver_ADLIB_Multisource(OPL::Config::OplType
_rhythmBank(OPL_RHYTHM_BANK), _rhythmBank(OPL_RHYTHM_BANK),
_rhythmBankFirstNote(GS_RHYTHM_FIRST_NOTE), _rhythmBankFirstNote(GS_RHYTHM_FIRST_NOTE),
_rhythmBankLastNote(GS_RHYTHM_LAST_NOTE), _rhythmBankLastNote(GS_RHYTHM_LAST_NOTE),
_noteCounter(1) { _noteCounter(1),
_oplFrequencyConversionFactor(pow(2, 20) / 49716.0f) {
memset(_channelAllocations, 0xFF, sizeof(_channelAllocations)); memset(_channelAllocations, 0xFF, sizeof(_channelAllocations));
Common::fill(_shadowRegisters, _shadowRegisters + sizeof(_shadowRegisters), 0); Common::fill(_shadowRegisters, _shadowRegisters + sizeof(_shadowRegisters), 0);
} }
@ -783,6 +782,7 @@ void MidiDriver_ADLIB_Multisource::dataEntry(uint8 channel, uint8 dataMsb, uint8
} }
// Apply the new pitch bend sensitivity to any active notes. // Apply the new pitch bend sensitivity to any active notes.
recalculateFrequencies(channel, source); recalculateFrequencies(channel, source);
break;
case MIDI_RPN_MASTER_TUNING_FINE: case MIDI_RPN_MASTER_TUNING_FINE:
// MSB and LSB are combined to a fraction of a semitone. // MSB and LSB are combined to a fraction of a semitone.
if (dataMsb != 0xFF) { if (dataMsb != 0xFF) {
@ -795,6 +795,7 @@ void MidiDriver_ADLIB_Multisource::dataEntry(uint8 channel, uint8 dataMsb, uint8
} }
// Apply the new master tuning to any active notes. // Apply the new master tuning to any active notes.
recalculateFrequencies(channel, source); recalculateFrequencies(channel, source);
break;
case MIDI_RPN_MASTER_TUNING_COARSE: case MIDI_RPN_MASTER_TUNING_COARSE:
// MSB = semitones, LSB is ignored. // MSB = semitones, LSB is ignored.
if (dataMsb != 0xFF) { if (dataMsb != 0xFF) {
@ -802,8 +803,11 @@ void MidiDriver_ADLIB_Multisource::dataEntry(uint8 channel, uint8 dataMsb, uint8
} }
// Apply the new master tuning to any active notes. // Apply the new master tuning to any active notes.
recalculateFrequencies(channel, source); recalculateFrequencies(channel, source);
break;
default:
// Ignore data entry if null or an unknown RPN is active.
break;
} }
// Ignore data entry if null or an unknown RPN is active.
} }
void MidiDriver_ADLIB_Multisource::volume(uint8 channel, uint8 volume, uint8 source) { void MidiDriver_ADLIB_Multisource::volume(uint8 channel, uint8 volume, uint8 source) {
@ -1064,7 +1068,7 @@ void MidiDriver_ADLIB_Multisource::recalculateVolumes(uint8 channel, uint8 sourc
} }
MidiDriver_ADLIB_Multisource::InstrumentInfo MidiDriver_ADLIB_Multisource::determineInstrument(uint8 channel, uint8 source, uint8 note) { MidiDriver_ADLIB_Multisource::InstrumentInfo MidiDriver_ADLIB_Multisource::determineInstrument(uint8 channel, uint8 source, uint8 note) {
InstrumentInfo instrument = { 0 }; InstrumentInfo instrument = { 0, 0, 0 };
if (channel == MIDI_RHYTHM_CHANNEL) { if (channel == MIDI_RHYTHM_CHANNEL) {
// On the rhythm channel, the note played indicates which instrument // On the rhythm channel, the note played indicates which instrument
@ -1225,7 +1229,7 @@ uint16 MidiDriver_ADLIB_Multisource::calculateFrequency(uint8 channel, uint8 sou
// Note that the resulting value is double the actual frequency because // Note that the resulting value is double the actual frequency because
// of the use of block 0 (which halves the frequency). This allows for // of the use of block 0 (which halves the frequency). This allows for
// slightly higher precision in the pitch bend calculation. // slightly higher precision in the pitch bend calculation.
oplFrequency = round(noteFrequency * OPL_FREQUENCY_CONVERSION_FACTOR); oplFrequency = round(noteFrequency * _oplFrequencyConversionFactor);
block = 0; block = 0;
} }

10
audio/adlib_ms.h
View file

@ -387,13 +387,6 @@ protected:
*/ */
static const uint8 OPL_VOLUME_LOOKUP[]; static const uint8 OPL_VOLUME_LOOKUP[];
/**
* Factor to convert a frequency in Hertz to the format used by the OPL
* registers (F-num).
*/
static const float OPL_FREQUENCY_CONVERSION_FACTOR;
/** /**
* Contains the current controller settings for a MIDI channel. * Contains the current controller settings for a MIDI channel.
*/ */
@ -1039,6 +1032,9 @@ protected:
// The amount of notes played since the driver was opened / reset. // The amount of notes played since the driver was opened / reset.
uint32 _noteCounter; uint32 _noteCounter;
// Factor to convert a frequency in Hertz to the format used by the OPL
// registers (F - num).
float _oplFrequencyConversionFactor;
// The values last written to each OPL register. // The values last written to each OPL register.
uint8 _shadowRegisters[0x200]; uint8 _shadowRegisters[0x200];