diff --git a/thirdparty/adlmidi/adlmidi_midiplay.cpp b/thirdparty/adlmidi/adlmidi_midiplay.cpp index 657f825..f77ce81 100644 --- a/thirdparty/adlmidi/adlmidi_midiplay.cpp +++ b/thirdparty/adlmidi/adlmidi_midiplay.cpp @@ -1714,7 +1714,7 @@ size_t MIDIplay::chooseDevice(const std::string &name) size_t n = m_midiDevices.size() * 16; m_midiDevices.insert(std::make_pair(name, n)); m_midiChannels.resize(n + 16); - resetMIDIDefaults(n); + resetMIDIDefaults(static_cast<int>(n)); return n; } diff --git a/thirdparty/adlmidi/adlmidi_opl3.cpp b/thirdparty/adlmidi/adlmidi_opl3.cpp index 9fbb8bb..a3ec71b 100644 --- a/thirdparty/adlmidi/adlmidi_opl3.cpp +++ b/thirdparty/adlmidi/adlmidi_opl3.cpp @@ -394,7 +394,7 @@ static inline double s_dmxFreq(double tone) { uint_fast32_t noteI = (uint_fast32_t)(tone); int_fast32_t bendI = 0; - int_fast32_t outHz = 0.0; + int_fast32_t outHz = 0; double bendDec = tone - (int)tone; bendI = (int_fast32_t)((bendDec * 128.0) / 2.0) + 128; @@ -470,7 +470,7 @@ static inline double s_apogeeFreq(double tone) { uint_fast32_t noteI = (uint_fast32_t)(tone); int_fast32_t bendI = 0; - int_fast32_t outHz = 0.0; + int_fast32_t outHz = 0; double bendDec = tone - (int)tone; int_fast32_t octave; int_fast32_t scaleNote; diff --git a/thirdparty/opnmidi/opnmidi_midiplay.cpp b/thirdparty/opnmidi/opnmidi_midiplay.cpp index f3e4f49..f2a76ab 100644 --- a/thirdparty/opnmidi/opnmidi_midiplay.cpp +++ b/thirdparty/opnmidi/opnmidi_midiplay.cpp @@ -1606,7 +1606,7 @@ size_t OPNMIDIplay::chooseDevice(const std::string &name) size_t n = m_midiDevices.size() * 16; m_midiDevices.insert(std::make_pair(name, n)); m_midiChannels.resize(n + 16); - resetMIDIDefaults(n); + resetMIDIDefaults(static_cast<int>(n)); return n; } diff --git a/thirdparty/opnmidi/opnmidi_opn2.cpp b/thirdparty/opnmidi/opnmidi_opn2.cpp index 26ef352..a58945c 100644 --- a/thirdparty/opnmidi/opnmidi_opn2.cpp +++ b/thirdparty/opnmidi/opnmidi_opn2.cpp @@ -400,7 +400,7 @@ void OPN2::touchNote(size_t c, if(volume > minVolume) { double lv = std::log(static_cast<double>(volume)); - volume = static_cast<uint_fast32_t>(lv * c1 - c2) * 2.0; + volume = static_cast<uint_fast32_t>(lv * c1 - c2) * 2; } else volume = 0;