Merge pull request #25 from brummbrum/Restructure_Run_MainLoop

CleanUp

Author: brummbrum

src/main.cpp

@@ -145,9 +145,6 @@ BaseSurface::~BaseSurface() {
 }
 
 void BaseSurface::Run() {
-	// ToDo: Rather than putting this in BaseSurface consider to just override Run() in NiMidiSurface and call the superclass : BaseSurface::Run()
-	this->_peakMixerUpdate();
-	// --------------------------------------------------------------------------------
 	if (!this->_midiIn) {
 		return;
 	}

src/mcu.cpp

@@ -102,11 +102,7 @@ class McuSurface: public BaseSurface {
 		message += MIDI_SYSEX_END;
 		this->_sendRaw(message);
 	}
-
-	void _peakMixerUpdate() override {
-		// DUMMY. Currently only implemented for niMiDi (Mk2). Maybe better to move Run() callback into niMidi.cpp and mcu.cpp?
-	}
-
+	
 	private:
 	void _sendRaw(const string& message) {
 		// MIDI_event_t includes 4 bytes for the message, but we need more.

src/niMidi.cpp

@@ -179,7 +179,14 @@ class NiMidiSurface: public BaseSurface {
 	virtual const char* GetDescString() override {
 		return "Komplete Kontrol S-series Mk2/A-series/M-series";
 	}
-		
+
+	virtual void Run() override {
+		// Moved from main to deal with activities specific to S-Mk2/A/M series and not applicable to S-Mk1 keyboards
+		this->_peakMixerUpdate();
+		// --------------------------------------------------------------------------------
+		BaseSurface::Run();
+	}
+
 	virtual void SetPlayState(bool play, bool pause, bool rec) override {
 #ifdef CALLBACK_DIAGNOSTICS
 		ostringstream s;
@@ -476,6 +483,8 @@ class NiMidiSurface: public BaseSurface {
 		return 1;
 	}
 
+	//===============================================================================================================================
+
 	protected:
 	void _onMidiEvent(MIDI_event_t* event) override {
 		if (event->midi_message[0] != MIDI_CC) {
@@ -621,20 +630,27 @@ class NiMidiSurface: public BaseSurface {
 		}
 	}
 
-	void _peakMixerUpdate() override {
+	//===============================================================================================================================
+
+	private:
+	int _protocolVersion = 0;
+	int _bankStart = 0;
+	int _bankEnd = 0;
+
+	void _peakMixerUpdate() {
 		// Peak meters. Note: Reaper reports peak, NOT VU	
 
 		// ToDo: Peak Hold in KK display shall be erased immediately when changing bank
 		// ToDo: Peak Hold in KK display shall be erased after decay time t when track muted or no signal.
 		// ToDo: Explore the effect of sending CMD_SEL_TRACK_PARAMS_CHANGED after sending CMD_TRACK_VU
 		// ToDo: Consider caching and not sending anything via SysEx if no values have changed.
-		
+
 		// Meter information is sent to KK as array (string of chars) for all 16 channels (8 x stereo) of one bank.
 		// A value of 0 will result in stopping to refresh meters further to right as it is interpretated as "end of string".
 		// peakBank[0]..peakBank[31] are used for data. The array needs one additional last char peakBank[32] set as "end of string" marker.
 		static char peakBank[(BANK_NUM_TRACKS * 2) + 1];
 		int j = 0;
-		double peakValue = 0;		
+		double peakValue = 0;
 		int numInBank = 0;
 		for (int id = this->_bankStart; id <= this->_bankEnd; ++id, ++numInBank) {
 			MediaTrack* track = CSurf_TrackFromID(id, false);
@@ -688,11 +704,6 @@ class NiMidiSurface: public BaseSurface {
 		this->_sendSysex(CMD_TRACK_VU, 2, 0, peakBank);
 	}
 
-	private:
-	int _protocolVersion = 0;
-	int _bankStart = 0;
-	int _bankEnd = 0;
-
 	void _allMixerUpdate() {
 #ifdef CALLBACK_DIAGNOSTICS
 		ostringstream s;

src/reaKontrol.h

@@ -79,7 +79,6 @@ class BaseSurface: public IReaperControlSurface {
 	midi_Input* _midiIn = nullptr;
 	midi_Output* _midiOut = nullptr;
 	virtual void _onMidiEvent(MIDI_event_t* event) = 0;
-	virtual void _peakMixerUpdate() = 0;
 };
 
 IReaperControlSurface* createNiMidiSurface(int inDev, int outDev);