* Add pitch wheel control

- Pitch +/- 2 semitones per General MIDI
* Increase voice count from 12 to 16

Author: [email protected]

Control.cpp

@@ -0,0 +1,27 @@
+#include "StdAfx.h"
+/*
+MINI VIRTUAL ANALOG SYNTHESIZER
+Copyright 2014 Kenneth D. Miller III
+
+Controllers
+*/
+
+namespace Control
+{
+	// pitch wheel value
+	int pitch_wheel;
+	float pitch_scale;
+
+	void SetPitchWheel(int value)
+	{
+		pitch_wheel = value;
+		pitch_scale = powf(2.0f, float(pitch_wheel * 2) / float(0x2000 * 12));
+	}
+
+	// reset all controllers
+	void ResetAll()
+	{
+		pitch_wheel = 0;
+		pitch_scale = 1;
+	}
+}

Control.h

@@ -0,0 +1,20 @@
+#pragma once
+/*
+MINI VIRTUAL ANALOG SYNTHESIZER
+Copyright 2014 Kenneth D. Miller III
+
+Controllers
+*/
+
+namespace Control
+{
+	// pitch wheel value
+	extern int pitch_wheel;
+	extern float pitch_scale;
+
+	// set pitch wheel value
+	extern void SetPitchWheel(int value);
+
+	// reset all controllers
+	extern void ResetAll();
+}

DisplayOscillatorFrequency.cpp

@@ -9,14 +9,15 @@ Oscillator Frequency Display
 #include "DisplayOscillatorFrequency.h"
 #include "Menu.h"
 #include "Voice.h"
+#include "Control.h"
 #include "Console.h"
 #include "OscillatorNote.h"
 
 // show oscillator frequency
 void UpdateOscillatorFrequencyDisplay(HANDLE hOut, int const v, int const o)
 {
-	// key frequency (taking octave shift into account)
-	float const key_freq = note_frequency[voice_note[v]];
+	// key frequency (taking pitch wheel control into account)
+	float const key_freq = Control::pitch_scale * note_frequency[voice_note[v]];
 
 	// get attributes to use
 	Menu::MenuMode menu = Menu::MenuMode(Menu::MENU_OSC1 + o);

DisplayOscillatorWaveform.cpp

@@ -15,6 +15,7 @@ Oscillator Waveform Display
 #include "Envelope.h"
 #include "Wave.h"
 #include "Voice.h"
+#include "Control.h"
 
 #define WAVEFORM_WIDTH 80
 #define WAVEFORM_HEIGHT 20
@@ -89,7 +90,7 @@ void UpdateOscillatorWaveformDisplay(HANDLE hOut, BASS_INFO const &info, int con
 	float const step_base = cycle / float(WAVEFORM_WIDTH);
 
 	// key frequency
-	float const key_freq = note_frequency[voice_note[v]];
+	float const key_freq = Control::pitch_scale * note_frequency[voice_note[v]];
 
 	// update filter envelope generator
 	float const flt_env_amplitude = flt_env_state[v].amplitude;

Midi.cpp

@@ -1,8 +1,15 @@
+/*
+MINI VIRTUAL ANALOG SYNTHESIZER
+Copyright 2014 Kenneth D. Miller III
+
+MIDI Support
+*/
 #include "StdAfx.h"
 
 #include "Debug.h"
 #include "Midi.h"
 #include "Voice.h"
+#include "Control.h"
 
 // midi messages
 // http://www.midi.org/techspecs/midimessages.php
@@ -78,6 +85,7 @@ namespace Midi
 					break;
 				case MIDI_RESET_ALL_CONTROLLERS:
 					DebugPrint("Reset All Controllers\n");
+					Control::ResetAll();
 					break;
 				case MIDI_LOCAL_CONTROL:
 					DebugPrint("Local Control %s\n", data2 ? "On" : "Off");
@@ -109,6 +117,7 @@ namespace Midi
 				break;
 			case MIDI_PITCH_WHEEL_CHANGE:
 				DebugPrint("Pitch Wheel Change: value=%d\n", (data2 << 7) + data1 - 0x2000);
+				Control::SetPitchWheel((data2 << 7) + data1 - 0x2000);
 				break;
 			case MIDI_SYSTEM:
 				DebugPrint("System %02x %02x %02x\n", data1, data2);

Midi.h

@@ -1,4 +1,10 @@
 #pragma once
+/*
+MINI VIRTUAL ANALOG SYNTHESIZER
+Copyright 2014 Kenneth D. Miller III
+
+MIDI Support
+*/
 
 namespace Midi
 {

Voice.h

@@ -12,7 +12,7 @@ Voice Assignment
 extern float note_frequency[NOTES];
 
 // number of voices
-#define VOICES 12
+#define VOICES 16
 
 // current note assignemnts
 // (via keyboard or midi input)

synth.cpp

@@ -12,6 +12,7 @@ Copyright 2014 Kenneth D. Miller III
 #include "Keys.h"
 #include "Voice.h"
 #include "Midi.h"
+#include "Control.h"
 
 #include "PolyBLEP.h"
 #include "Oscillator.h"
@@ -104,8 +105,8 @@ DWORD CALLBACK WriteStream(HSTREAM handle, short *buffer, DWORD length, void *us
 			// get the voice index
 			int v = index[i];
 
-			// key frequency (taking octave shift into account)
-			float const key_freq = note_frequency[voice_note[v]];
+			// key frequency (taking pitch wheel control into account)
+			float const key_freq = Control::pitch_scale * note_frequency[voice_note[v]];
 
 			// update filter envelope generator
 			float const flt_env_amplitude = flt_env_state[v].Update(flt_env_config, step);
@@ -295,6 +296,9 @@ void main(int argc, char **argv)
 	// enable the first oscillator
 	osc_config[0].enable = true;
 
+	// reset all controllers
+	Control::ResetAll();
+
 	// show all menus
 	for (int i = 0; i < Menu::MENU_COUNT - (info.dsver < 8); ++i)
 		Menu::Handler(hOut, 0, 0, Menu::MenuMode(i));

synth.vcxproj

@@ -93,6 +93,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Console.cpp" />
+    <ClCompile Include="Control.cpp" />
     <ClCompile Include="Debug.cpp" />
     <ClCompile Include="DisplayKeyVolumeEnvelope.cpp" />
     <ClCompile Include="DisplayLowFrequencyOscillator.cpp" />
@@ -131,6 +132,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Console.h" />
+    <ClInclude Include="Control.h" />
     <ClInclude Include="Debug.h" />
     <ClInclude Include="DisplayKeyVolumeEnvelope.h" />
     <ClInclude Include="DisplayLowFrequencyOscillator.h" />