Merge branch 'main' into SSD1306-rotation

pull/423/head^2
probonopd 2 years ago committed by GitHub
commit 77ad300dd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      src/minidexed.cpp
  2. 8
      src/serialmididevice.cpp

@ -948,13 +948,7 @@ void CMiniDexed::ProcessSound (void)
assert (CConfig::ToneGenerators == 8);
// swap stereo channels if needed
uint8_t indexL=0, indexR=1;
if (m_bChannelsSwapped)
{
indexL=1;
indexR=0;
}
// BEGIN TG mixing
float32_t tmp_float[nFrames*2];
@ -1003,6 +997,13 @@ void CMiniDexed::ProcessSound (void)
}
// END adding reverb
// swap stereo channels if needed prior to writing back out
if (m_bChannelsSwapped)
{
indexL=1;
indexR=0;
}
// Convert dual float array (left, right) to single int16 array (left/right)
for(uint16_t i=0; i<nFrames;i++)
{

@ -98,7 +98,13 @@ void CSerialMIDIDevice::Process (void)
continue;
}
if(m_nSysEx > 0)
// System Real Time messages may appear anywhere in the byte stream, so handle them specially
if(uchData == 0xF8 || uchData == 0xFA || uchData == 0xFB || uchData == 0xFC || uchData == 0xFE || uchData == 0xFF)
{
MIDIMessageHandler (&uchData, 1);
continue;
}
else if(m_nSysEx > 0)
{
m_SerialMessage[m_nSysEx++]=uchData;
if ((uchData & 0x80) == 0x80 || m_nSysEx >= MAX_MIDI_MESSAGE)

Loading…
Cancel
Save