aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/adlmidi_midiplay.cpp2
-rw-r--r--src/adlmidi_opl3.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp
index 657f825..f77ce81 100644
--- a/src/adlmidi_midiplay.cpp
+++ b/src/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/src/adlmidi_opl3.cpp b/src/adlmidi_opl3.cpp
index 9fbb8bb..a3ec71b 100644
--- a/src/adlmidi_opl3.cpp
+++ b/src/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;