Improviser

jan-van-bergen · Feb 20, 2021 · cda7d14 · cda7d14
1 parent 64f95fb
commit cda7d14
Show file tree

Hide file tree

Showing 21 changed files with 617 additions and 131 deletions.
diff --git a/Synth.vcxproj b/Synth.vcxproj
@@ -186,6 +186,7 @@
     <ClCompile Include="src\components\distortion.cpp" />
     <ClCompile Include="src\components\filter.cpp" />
     <ClCompile Include="src\components\flanger.cpp" />
+    <ClCompile Include="src\components\improviser.cpp" />
     <ClCompile Include="src\components\keyboard.cpp" />
     <ClCompile Include="src\components\oscillator.cpp" />
     <ClCompile Include="src\components\oscilloscope.cpp" />

diff --git a/Synth.vcxproj.filters b/Synth.vcxproj.filters
@@ -103,6 +103,9 @@
     <ClCompile Include="src\components\arp.cpp">
       <Filter>components</Filter>
     </ClCompile>
+    <ClCompile Include="src\components\improviser.cpp">
+      <Filter>components</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\json.h">

diff --git a/midi/nirvana.mid b/midi/nirvana.mid
diff --git a/midi/nirvana_guitar.mid b/midi/nirvana_guitar.mid
diff --git a/projects/arp.json b/projects/arp.json
@@ -5,10 +5,10 @@
 	},
 	"SpeakerComponent": {
 		"id": 0,
-		"pos_x": 1372.000000,
-		"pos_y": 348.000000,
-		"size_x": 100.000000,
-		"size_y": 100.000000
+		"pos_x": 1231.000000,
+		"pos_y": 394.000000,
+		"size_x": 109.000000,
+		"size_y": 132.000000
 	},
 	"PianoRollComponent": {
 		"id": 2,
@@ -26,7 +26,7 @@
 		"size_y": 341.000000,
 		"invert": 0,
 		"phase": 0.000000,
-		"transpose": 0,
+		"transpose": -12,
 		"detune": 0.000000,
 		"portamento": 0.050000,
 		"attack": 0.000000,
@@ -38,8 +38,8 @@
 	},
 	"SamplerComponent": {
 		"id": 5,
-		"pos_x": 706.000000,
-		"pos_y": 578.000000,
+		"pos_x": 672.000000,
+		"pos_y": 590.000000,
 		"size_x": 171.000000,
 		"size_y": 114.000000,
 		"base_note": 36,
@@ -59,7 +59,7 @@
 		"pos_y": 34.000000,
 		"size_x": 177.000000,
 		"size_y": 211.000000,
-		"steps": 1.000000
+		"steps": 3.000000
 	},
 	"SamplerComponent": {
 		"id": 8,
@@ -76,7 +76,7 @@
 		"pos_y": 709.000000,
 		"size_x": 392.000000,
 		"size_y": 116.000000,
-		"pattern": [ 0.000000, 0.660000, 1.000000, 0.520000, 0.000000, 0.560000, 1.000000, 0.640000, 0.000000, 0.640000, 1.000000, 0.600000, 0.000000, 0.660000, 1.000000, 0.480000 ]
+		"pattern": [ 0.000000, 0.660000, 1.000000, 0.520000, 0.180000, 0.560000, 1.000000, 0.640000, 0.000000, 0.640000, 1.000000, 0.600000, 0.280000, 0.660000, 1.000000, 0.480000 ]
 	},
 	"OscillatorComponent": {
 		"id": 10,
@@ -98,8 +98,8 @@
 	},
 	"DistortionComponent": {
 		"id": 12,
-		"pos_x": 959.000000,
-		"pos_y": 556.000000,
+		"pos_x": 952.000000,
+		"pos_y": 582.000000,
 		"size_x": 127.000000,
 		"size_y": 100.000000,
 		"amount": 0.529000
@@ -122,12 +122,19 @@
 		"release": 0.000000,
 		"waveform": 1
 	},
+	"DecibelComponent": {
+		"id": 14,
+		"pos_x": 1396.000000,
+		"pos_y": 87.000000,
+		"size_x": 135.000000,
+		"size_y": 218.000000
+	},
 	"Connection": {
 		"component_out": 4,
 		"component_in": 0,
 		"offset_out": 0,
 		"offset_in": 0,
-		"weight": 0.300000
+		"weight": 0.400000
 	},
 	"Connection": {
 		"component_out": 8,
@@ -155,7 +162,7 @@
 		"component_in": 0,
 		"offset_out": 0,
 		"offset_in": 0,
-		"weight": 0.100000
+		"weight": 0.200000
 	},
 	"Connection": {
 		"component_out": 7,
@@ -205,5 +212,12 @@
 		"offset_out": 0,
 		"offset_in": 0,
 		"weight": 1.000000
+	},
+	"Connection": {
+		"component_out": 0,
+		"component_in": 14,
+		"offset_out": 0,
+		"offset_in": 0,
+		"weight": 1.000000
 	}
 }
diff --git a/projects/debug.json b/projects/debug.json
@@ -1,7 +1,7 @@
 {
 	"Settings": {
 		"tempo": 130,
-		"master_volume": 1.000000
+		"master_volume": 0.800000
 	},
 	"SpeakerComponent": {
 		"id": 0,
@@ -10,56 +10,34 @@
 		"size_x": 100.000000,
 		"size_y": 100.000000
 	},
-	"KeyboardComponent": {
-		"id": 1,
+	"ImproviserComponent": {
+		"id": 3,
 		"pos_x": 60.000000,
 		"pos_y": 60.000000,
-		"size_x": 100.000000,
-		"size_y": 100.000000
+		"size_x": 156.000000,
+		"size_y": 124.000000,
+		"tonality": 0,
+		"num_notes": 3
 	},
-	"ArpComponent": {
-		"id": 2,
-		"pos_x": 225.000000,
-		"pos_y": 132.000000,
-		"size_x": 142.000000,
-		"size_y": 338.000000,
-		"steps": 1.000100
-	},
-	"OscillatorComponent": {
-		"id": 3,
-		"pos_x": 483.000000,
-		"pos_y": 78.000000,
-		"size_x": 181.000000,
-		"size_y": 348.000000,
-		"invert": 0,
-		"phase": 0.000000,
-		"transpose": 12,
-		"detune": 0.000000,
-		"portamento": 0.000000,
-		"attack": 0.100000,
-		"hold": 0.500000,
-		"decay": 1.000000,
-		"sustain": 0.600000,
-		"release": 0.600000,
-		"waveform": 2
+	"SamplerComponent": {
+		"id": 4,
+		"pos_x": 360.000000,
+		"pos_y": 165.000000,
+		"size_x": 246.000000,
+		"size_y": 111.000000,
+		"base_note": 36,
+		"filename": "samples/piano.wav"
 	},
 	"Connection": {
-		"component_out": 3,
+		"component_out": 4,
 		"component_in": 0,
 		"offset_out": 0,
 		"offset_in": 0,
 		"weight": 1.000000
 	},
 	"Connection": {
-		"component_out": 1,
-		"component_in": 2,
-		"offset_out": 0,
-		"offset_in": 0,
-		"weight": 1.000000
-	},
-	"Connection": {
-		"component_out": 2,
-		"component_in": 3,
+		"component_out": 3,
+		"component_in": 4,
 		"offset_out": 0,
 		"offset_in": 0,
 		"weight": 1.000000

diff --git a/projects/default.json b/projects/default.json
@@ -7,7 +7,7 @@
 		"id": 0,
 		"pos_x": 1372.000000,
 		"pos_y": 348.000000,
-		"size_x": 100.000000,
-		"size_y": 100.000000
+		"size_x": 101.000000,
+		"size_y": 113.000000
 	}
 }