New metronome callback

include/reaper/WDL/db2val.h

@@ -0,0 +1,17 @@
+#ifndef _WDL_DB2VAL_H_
+#define _WDL_DB2VAL_H_
+
+#include <math.h>
+
+#define TWENTY_OVER_LN10 8.6858896380650365530225783783321
+#define LN10_OVER_TWENTY 0.11512925464970228420089957273422
+#define DB2VAL(x) exp((x)*LN10_OVER_TWENTY)
+static inline double VAL2DB(double x)
+{
+  if (x < 0.0000000298023223876953125) return -150.0;
+  double v=log(x)*TWENTY_OVER_LN10;
+  return v<-150.0?-150.0:v;
+}
+
+
+#endif

readme.md

@@ -1,69 +1,24 @@
-# ReaKontrol
-
-- Author: James Teh <[email protected]> & other contributors
-- Copyright: 2018-2019 James Teh & other contributors
-- License: GNU General Public License version 2.0
-
-ReaKontrol is a [REAPER](https://www.reaper.fm/) extension which provides advanced host integration for [Native Instruments Komplete Kontrol keyboards](https://www.native-instruments.com/en/products/komplete/keyboards/).
-It currently only runs on Windows and requires REAPER 5.92 or later.
-
-ReaKontrol supports Komplete Kontrol S-series Mk2, A-series and M-series keyboards.
-While some initial work has been done to support S-series Mk1 keyboards, this is not yet functional.
-
-## Supported Functionality
-The following functionality is currently supported:
-
-- Focus follow; i.e. the Komplete Kontrol instance is switched automatically when a track is selected.
-- Transport buttons: Play, Restart, Record, Stop, Metronome, Tempo
-- Edit buttons: Undo, Redo
-- Track navigation
-- Clip navigation: moves between project markers
-- Mixer view: volume/pan adjustment with the 8 knobs
-- The track name and mute, solo and armed states are displayed as appropriate.
-
-## Download and Installation
-For now, there is no installer.
-You can [download the latest build of the extension here](https://osara.reaperaccessibility.com/reaper_kontrol.dll).
-
-Once downloaded, simply copy the `reaper_kontrol.dll` file you downloaded to the `%appdata%\REAPER\UserPlugins` folder using Windows File Explorer.
-You can get to this folder by copying the name above and pasting it into either the Windows Run dialog or the File Explorer address bar.
-
-You do not need to add a control surface or perform any other configuration in REAPER.
-Komplete Kontrol Host integration should work as soon as you start REAPER with a Komplete Kontrol keyboard connected.
-
-## Reporting Issues
-Issues should be reported [on GitHub](https://github.com/jcsteh/reaKontrol/issues).
-
-## Building
-This section is for those interested in building ReaKontrol from source code.
-
-### Getting the Source Code
-The ReaKontrol Git repository is located at https://github.com/jcsteh/reaKontrol.git.
-You can clone it with the following command, which will place files in a directory named reaKontrol:
-
-```
-git clone https://github.com/jcsteh/reaKontrol.git
-```
-
-### Dependencies
-To build ReaKontrol, you will need:
-
-- Microsoft Visual Studio 2017 Community:
-	* Visual Studio 2019 is not yet supported.
-	* [Download Visual Studio 2017 Community](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community&rel=15)
-	* When installing Visual Studio, you need to enable the following:
-		- On the Workloads tab, in the Windows group: Desktop development with C++
-- Python, version 2.7:
-	* This is needed by SCons.
-	* Python 3 and later are not yet supported.
-	* [Download Python](https://www.python.org/downloads/)
-- [SCons](https://www.scons.org/), version 3.0.4 or later:
-	* Once Python is installed, you should be able to install SCons by simply running this at the command line: `pip install scons`
-
-### How to Build
-To build ReaKontrol, from a command prompt, simply change to the ReaKontrol checkout directory and run `scons`.
-The resulting dll can be found in the `build` directory.
-
-## Contributors
-- James Teh
-- Leonard de Ruijter
+# ReaKontrol-Fork
+- Fork of the excellent ReaKontrol repository published by James Teh: https://github.com/jcsteh/reaKontrol
+- Fork Author: brumbear@pacificpeaks
+- Fork Copyright: 2019 Pacific Peaks Studio, see individual copyrights in source code
+- License: GNU General Public License version 2.0.
+- License Notes: As the original work is published under GPLv2 the modified programs are also licensed under GPLv2. May be updated to GPLv3 if copyright holder of original work agrees to update too.
+
+## Feature Integration & Releases
+This fork is mainly a bleeding edge development branch aiming to continuously add functionality to ReaKontrol. 
+- New features will be merged continously into this fork's master @ https://github.com/brummbrum/reaKontrol
+- Testing and calibration is done with NI S-Series Mk2 Komplete Kontrol Keyboard.
+- When a critcial amount of functionality has been reached there will be stable releases in a dedicated release branch.
+- Binaries are available for releases (Windows only): https://github.com/brummbrum/reaKontrol/releases
+
+## Upstream Integration into Parent Repository
+- New features are also offered to the upstream repository @ https://github.com/jcsteh/reaKontrol
+- Some updated features may or may not be merged with the upstream master due to possibly different priorities
+- The sequence in which new features are published may be different between this fork and the upstream repository due to possibly different priorities
+
+## Which branch should you follow?
+- To the extent that features are integrated into the upstream master it is recommended to stick to the parent repository @ https://github.com/jcsteh/reaKontrol. The parent repository also takes into account dependencies to OSARA relevant for users using screen readers.
+
+## Build instructions and additional description
+- Please refer to the parent repository @ https://github.com/jcsteh/reaKontrol

src/main.cpp

@@ -145,6 +145,17 @@ 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()
+	const int METER_UPDATE = 0; // Update on every call for now (approx. 30/s)
+	static int simpleTimer = 0;
+	if (simpleTimer < METER_UPDATE) {
+		++simpleTimer;
+	}
+	else {
+		simpleTimer = 0;
+		this->_peakMixerUpdate();
+	}	
+	// --------------------------------------------------------------------------------
 	if (!this->_midiIn) {
 		return;
 	}

src/mcu.cpp

@@ -103,6 +103,10 @@ class McuSurface: public BaseSurface {
 		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.