Emu de MIDI tweaks

edge-classic · Oct 23, 2024 · 6d9756f · 6d9756f
1 parent 6d8643f
commit 6d9756f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 36 deletions.
diff --git a/libraries/libemidi/source/CEnvelope.cpp b/libraries/libemidi/source/CEnvelope.cpp
@@ -1,11 +1,5 @@
 #include "CEnvelope.hpp"
 
-#if defined(_MSC_VER)
-#if defined(_DEBUG)
-#define new new (_CLIENT_BLOCK, __FILE__, __LINE__)
-#endif
-#endif
-
 using namespace dsa;
 
 #define GETA_BITS 20

diff --git a/libraries/libemidi/source/CMIDIModule.cpp b/libraries/libemidi/source/CMIDIModule.cpp
@@ -1,11 +1,5 @@
 #include "CMIDIModule.hpp"
 
-#if defined(_MSC_VER)
-#if defined(_DEBUG)
-#define new new (_NORMAL_BLOCK, __FILE__, __LINE__)
-#endif
-#endif
-
 using namespace dsa;
 
 CMIDIModule::CMIDIModule() : m_device(NULL)

diff --git a/libraries/libemidi/source/COpllDevice.cpp b/libraries/libemidi/source/COpllDevice.cpp
@@ -5,12 +5,6 @@
 
 #include <cstdio>
 
-#if defined(_MSC_VER)
-#if defined(_DEBUG)
-#define new new (_NORMAL_BLOCK, __FILE__, __LINE__)
-#endif
-#endif
-
 using namespace dsa;
 using namespace dsa::C;
 
@@ -87,7 +81,11 @@ COpllDevice::COpllDevice(uint32_t rate, uint32_t nch)
         m_nch = 1;
 
     for (uint32_t i = 0; i < m_nch; i++)
+    {
         m_opll[i] = OPLL_new(3579545, rate);
+        memset(m_reg_cache[i],0,128);
+        m_rbuf[i].clear();
+    }
     Reset();
 }
 
@@ -344,25 +342,27 @@ void COpllDevice::PercSetVelocity(uint8_t note, uint8_t velo)
 {
     note = perc_table[note];
     if (0 < note)
+    {
         m_pi.velocity[note - 1] = velo;
-    _PercUpdateVolume(note);
+        _PercUpdateVolume(note);
+    }
 }
 
 void COpllDevice::_PercUpdateVolume(uint8_t note)
 {
 
-    if (note > 5)
+    if (note < 1 || note > 5)
         return;
 
-    int vol = 13 - m_pi.volume / 16 - m_pi.velocity[note] / 16;
+    int vol = 13 - m_pi.volume / 16 - m_pi.velocity[note-1] / 16;
     if (vol < 0)
-        m_pi.vcache[note] = 0;
+        m_pi.vcache[note-1] = 0;
     else if (15 < vol)
-        m_pi.vcache[note] = 15;
+        m_pi.vcache[note-1] = 15;
     else
-        m_pi.vcache[note] = vol;
+        m_pi.vcache[note-1] = vol;
 
-    switch (note)
+    switch (note-1)
     {
     case 4: // B.D
         _WriteReg(0x30 + 6, m_pi.vcache[4]);
@@ -389,7 +389,7 @@ void COpllDevice::PercSetProgram(uint8_t bank, uint8_t prog)
 void COpllDevice::PercSetVolume(uint8_t vol)
 {
     m_pi.volume = vol;
-    for (int i = 0; i < 5; i++)
+    for (int i = 1; i < 6; i++)
         _PercUpdateVolume(i);
 }
 

diff --git a/libraries/libemidi/source/CPSGDrum.cpp b/libraries/libemidi/source/CPSGDrum.cpp
@@ -119,8 +119,10 @@ bool CPSGDrum::Render(int32_t buf[2])
             }
         }
         else
+        {
             buf[0] += m_rbuf[i].front();
-        m_rbuf[i].pop_front();
+            m_rbuf[i].pop_front();
+        }
     }
     buf[0] <<= 1;
     buf[1] = buf[0];

diff --git a/libraries/libemidi/source/CSMFPlay.cpp b/libraries/libemidi/source/CSMFPlay.cpp
@@ -2,6 +2,7 @@
 #include <limits.h>
 #include "CSMFPlay.hpp"
 #include "COpllDevice.hpp"
+#include "CPSGDrum.hpp"
 #include "CSccDevice.hpp"
 
 using namespace dsa;

diff --git a/libraries/libemidi/source/CSccDevice.cpp b/libraries/libemidi/source/CSccDevice.cpp
@@ -4,12 +4,6 @@
 #include <math.h>
 #include <string.h>
 
-#if defined(_MSC_VER)
-#if defined(_DEBUG)
-#define new new (_CLIENT_BLOCK, __FILE__, __LINE__)
-#endif
-#endif
-
 using namespace dsa;
 using namespace dsa::C;
 
@@ -155,7 +149,7 @@ bool CSccDevice::Reset(void)
         {
             SCC_reset(m_scc[i]);
             SCC_set_type(m_scc[i], SCC_ENHANCED);
-            memset(m_reg_cache[i], 0, 128);
+            memset(m_reg_cache[i],0,256);
             m_rbuf[i].clear();
         }
     }

diff --git a/libraries/libemidi/source/device/emu2212.c b/libraries/libemidi/source/device/emu2212.c
@@ -524,8 +524,10 @@ EMU2212_API void SCC_calc_stereo(SCC *scc, e_int16 buf[2])
                 else if (scc->ch_pan[i] == 2)
                     buf[1] += b;
                 else
+                {
                     buf[0] += b;
-                buf[1] += b;
+                    buf[1] += b;
+                }
             }
         }
     }

diff --git a/source_files/edge/s_emidi.cc b/source_files/edge/s_emidi.cc
@@ -123,7 +123,7 @@ class EMIDIPlayer : public AbstractMusicPlayer
     static void rtPitchBend(void *userdata, uint8_t channel, uint8_t msb, uint8_t lsb)
     {
         EMIDIPlayer *player = (EMIDIPlayer *)userdata;
-        player->emidi_synth_->SendMIDIMessage({dsa::CMIDIMsg::PITCH_BEND_CHANGE, channel, msb, lsb});
+        player->emidi_synth_->SendMIDIMessage({dsa::CMIDIMsg::PITCH_BEND_CHANGE, channel, lsb, msb});
     }
 
     static void rtSysEx(void *userdata, const uint8_t *msg, size_t size)