From b153d8365471db6674623ff0005dbf54adc94f1b Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 28 Sep 2019 13:24:48 +0200
Subject: [PATCH] moved ParseMIDIMessage function to the bottom of the file

---
 src/soundbase.cpp | 101 ++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 48 deletions(-)

diff --git a/src/soundbase.cpp b/src/soundbase.cpp
index 91ed983e..7f27b26e 100755
--- a/src/soundbase.cpp
+++ b/src/soundbase.cpp
@@ -100,54 +100,6 @@ void CSoundBase::run()
     }
 }
 
-void CSoundBase::ParseMIDIMessage ( const CVector<uint8_t>& vMIDIPaketBytes )
-{
-    if ( vMIDIPaketBytes.Size() > 0 )
-    {
-        const uint8_t iStatusByte = vMIDIPaketBytes[0];
-
-        // check if status byte is correct
-        if ( ( iStatusByte >= 0x80 ) && ( iStatusByte < 0xF0 ) )
-        {
-            // zero-based MIDI channel number (i.e. range 0-15)
-            const int iMIDIChannelZB = iStatusByte & 0x0F;
-
-/*
-// debugging
-printf ( "%02X: ", iMIDIChannelZB );
-for ( int i = 0; i < vMIDIPaketBytes.Size(); i++ )
-{
-    printf ( "%02X ", vMIDIPaketBytes[i] );
-}
-printf ( "\n" );
-*/
-
-            // per definition if MIDI channel is 0, we listen to all channels
-            // note that iCtrlMIDIChannel is one-based channel number
-            if ( ( iCtrlMIDIChannel == 0 ) || ( iCtrlMIDIChannel - 1 == iMIDIChannelZB ) )
-            {
-                // we only want to parse controller messages
-                if ( ( iStatusByte >= 0xB0 ) && ( iStatusByte < 0xC0 ) )
-                {
-                    // make sure paket is long enough
-                    if ( vMIDIPaketBytes.Size() > 2 )
-                    {
-                        // we are assuming that the controller number is the same
-                        // as the audio fader index and the range is 0-127
-                        const int iFaderLevel = static_cast<int> ( static_cast<double> (
-                            qMin ( vMIDIPaketBytes[2], uint8_t ( 127 ) ) ) / 127 * AUD_MIX_FADER_MAX );
-
-                        // Behringer X-TOUCH: offset of 0x46
-                        const int iChID = vMIDIPaketBytes[1] - 70;
-
-                        EmitControllerInFaderLevel ( iChID, iFaderLevel );
-                    }
-                }
-            }
-        }
-    }
-}
-
 
 
 /******************************************************************************\
@@ -293,3 +245,56 @@ QVector<QString> CSoundBase::LoadAndInitializeFirstValidDriver()
 
     return vsErrorList;
 }
+
+
+
+/******************************************************************************\
+* MIDI handling                                                                *
+\******************************************************************************/
+void CSoundBase::ParseMIDIMessage ( const CVector<uint8_t>& vMIDIPaketBytes )
+{
+    if ( vMIDIPaketBytes.Size() > 0 )
+    {
+        const uint8_t iStatusByte = vMIDIPaketBytes[0];
+
+        // check if status byte is correct
+        if ( ( iStatusByte >= 0x80 ) && ( iStatusByte < 0xF0 ) )
+        {
+            // zero-based MIDI channel number (i.e. range 0-15)
+            const int iMIDIChannelZB = iStatusByte & 0x0F;
+
+/*
+// debugging
+printf ( "%02X: ", iMIDIChannelZB );
+for ( int i = 0; i < vMIDIPaketBytes.Size(); i++ )
+{
+    printf ( "%02X ", vMIDIPaketBytes[i] );
+}
+printf ( "\n" );
+*/
+
+            // per definition if MIDI channel is 0, we listen to all channels
+            // note that iCtrlMIDIChannel is one-based channel number
+            if ( ( iCtrlMIDIChannel == 0 ) || ( iCtrlMIDIChannel - 1 == iMIDIChannelZB ) )
+            {
+                // we only want to parse controller messages
+                if ( ( iStatusByte >= 0xB0 ) && ( iStatusByte < 0xC0 ) )
+                {
+                    // make sure paket is long enough
+                    if ( vMIDIPaketBytes.Size() > 2 )
+                    {
+                        // we are assuming that the controller number is the same
+                        // as the audio fader index and the range is 0-127
+                        const int iFaderLevel = static_cast<int> ( static_cast<double> (
+                            qMin ( vMIDIPaketBytes[2], uint8_t ( 127 ) ) ) / 127 * AUD_MIX_FADER_MAX );
+
+                        // Behringer X-TOUCH: offset of 0x46
+                        const int iChID = vMIDIPaketBytes[1] - 70;
+
+                        EmitControllerInFaderLevel ( iChID, iFaderLevel );
+                    }
+                }
+            }
+        }
+    }
+}