Fixed some of MSVC warnings

Wohlstand · Oct 1, 2018 · f113f19 · f113f19
1 parent ae41f31
commit f113f19
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/opnmidi.cpp b/src/opnmidi.cpp
@@ -304,9 +304,9 @@ OPNMIDI_EXPORT void opn2_setLfoEnabled(struct OPN2_MIDIPlayer *device, int lfoEn
     MidiPlayer *play = GET_MIDI_PLAYER(device);
     assert(play);
     play->m_setup.lfoEnable = lfoEnable;
-    play->m_synth.m_lfoEnable = lfoEnable < 0 ?
+    play->m_synth.m_lfoEnable = (lfoEnable < 0 ?
                                 play->m_synth.m_insBankSetup.lfoEnable :
-                                (play->m_setup.lfoEnable != 0);
+                                play->m_setup.lfoEnable) != 0;
     play->m_synth.commitLFOSetup();
 }
 

diff --git a/src/opnmidi_midiplay.cpp b/src/opnmidi_midiplay.cpp
@@ -141,9 +141,9 @@ void OPNMIDIplay::applySetup()
     m_synth.m_numChips    = m_setup.numChips;
 
     if(m_setup.lfoEnable < 0)
-        m_synth.m_lfoEnable = m_synth.m_insBankSetup.lfoEnable;
+        m_synth.m_lfoEnable = (m_synth.m_insBankSetup.lfoEnable != 0);
     else
-        m_synth.m_lfoEnable = m_setup.lfoEnable;
+        m_synth.m_lfoEnable = (m_setup.lfoEnable != 0);
 
     if(m_setup.lfoFrequency < 0)
         m_synth.m_lfoFrequency = m_synth.m_insBankSetup.lfoFrequency;

diff --git a/src/opnmidi_opn2.cpp b/src/opnmidi_opn2.cpp
@@ -201,7 +201,7 @@ void OPN2::noteOn(size_t c, double hertz) // Hertz range: 0..131071
     for(size_t op = 0; op < 4; op++)
     {
         uint32_t reg = adli.OPS[op].data[0];
-        uint16_t address = 0x30 + (op * 4) + cc;
+        uint16_t address = static_cast<uint16_t>(0x30 + (op * 4) + cc);
         if(mul_offset > 0) // Increase frequency multiplication value
         {
             uint32_t dt  = reg & 0xF0;