Much debugging.

gogins · Jan 7, 2024 · 6749e66 · 6749e66
1 parent 1ee947b
commit 6749e66
Show file tree

Hide file tree

Showing 6 changed files with 206 additions and 131 deletions.
diff --git a/csound b/csound
diff --git a/examples/CollidingComb.csd b/examples/CollidingComb.csd
@@ -18,7 +18,7 @@ This Csound piece demonstrates how to use the following vst3 opcodes:
 
 </CsLicense>
 <CsOptions>
--m195 --opcode-lib="/home/mkg/csound-vst3-opcodes/build/lib/Debug/libvst3_plugins.so" -z1
+-dm162 -odac --sample-accurate
 </CsOptions>
 <CsInstruments>
 
@@ -36,10 +36,10 @@ alwayson "CollidingCombSynth_Output"
 alwayson "Piano_Output"
 alwayson "Master_Output"
 
-gi_vst3_handle_CollidingCombSynth vst3init "/usr/lib/vst3/CollidingCombSynth.vst3", "CollidingCombSynth", 1
+gi_vst3_handle_CollidingCombSynth vst3init "/Users/michaelgogins/code/vst/VSTPlugins/build/VST3/Release/CollidingCombSynth.vst3", "CollidingCombSynth", 1
 vst3info gi_vst3_handle_CollidingCombSynth
 
-gi_vst3_handle_piano vst3init "/home/mkg/csound-vst3-opcodes/build/VST3/Debug/mda-vst3.vst3", "mda Piano", 1
+gi_vst3_handle_piano vst3init "/Library/Audio/Plug-Ins/VST3/mda-vst3.vst3", "mda Piano", 1
 vst3info gi_vst3_handle_piano
 
 // Array of instrument plugins indexed by instrument number, for sending 

diff --git a/examples/pianoteq8_macos_test.csd b/examples/pianoteq8_macos_test.csd
@@ -16,7 +16,7 @@ connect "Piano_Output", "outright", "Master_Output", "inright"
 alwayson "Piano_Output"
 alwayson "Master_Output"
 
-gi_vst3_handle_piano vst3init "/Library/Audio/Plug-Ins/VST3/Pianoteq 8.vst3", "Pianoteq 8", 1
+gi_vst3_handle_piano vst3init "/Library/Audio/Plug-Ins/VST3/Pianoteq 8.vst3", "Pianoteq 8", "",  1
 vst3info gi_vst3_handle_piano
 
 // Score generating instrument.

diff --git a/examples/vst3-opcodes-minimal.csd b/examples/vst3-opcodes-minimal.csd
@@ -24,7 +24,7 @@ several other plugins in the VST3 SDK. Parameters and presets also are used.
 
 </CsLicense>
 <CsOptions>
--m195 --opcode-lib="~/csound-vst3-opcodes/build/lib/Release/libvst3_plugins.so" -z1
+-m162 
 </CsOptions>
 <CsInstruments>
 
@@ -38,10 +38,10 @@ connect "JX10_Output", "outright", "Master_Output", "inright"
 connect "Piano_Output", "outleft", "Master_Output", "inleft"
 connect "Piano_Output", "outright", "Master_Output", "inright"
 
-gi_vst3_handle_jx10 vst3init "/Users/michaelgogins/csound-vst3-opcodes/build-macos/VST3/Debug/mda-vst3.vst3", "mda JX10", 1
+gi_vst3_handle_jx10 vst3init "/Users/michaelgogins/csound-vst3-opcodes/build-macos/VST3/Debug/mda-vst3.vst3", "mda JX10", "", 1
 ;vst3info gi_vst3_handle_jx10
 
-gi_vst3_handle_piano vst3init "/Users/michaelgogins/csound-vst3-opcodes/build-macos/VST3/Debug/mda-vst3.vst3", "mda Piano", 1
+gi_vst3_handle_piano vst3init "/Users/michaelgogins/csound-vst3-opcodes/build-macos/VST3/Debug/mda-vst3.vst3", "mda Piano", "", 1
 ;vst3info gi_vst3_handle_piano
 
 // Array of instrument plugins indexed by instrument number, for sending 

diff --git a/examples/vst3-opcodes-test-macos.csd b/examples/vst3-opcodes-test-macos.csd
@@ -32,7 +32,7 @@ to run this piece from the `csound-vst3/vst3-opcodes` subdirectory.
 
 </CsLicense>
 <CsOptions>
--m195 -odac ; --opcode-lib="../../build-macos/lib/Debug/libvst3_plugins.dylib" -z1
+-m162 -odac
 </CsOptions>
 <CsInstruments>
 
@@ -56,16 +56,16 @@ alwayson "Delay"
 alwayson "Reverb"
 alwayson "Master_Output"
 
-gi_vst3_handle_jx10 vst3init "../build-macos/VST3/Debug/mda-vst3.vst3", "mda JX10", 1
+gi_vst3_handle_jx10 vst3init "../build-macos/VST3/Debug/mda-vst3.vst3", "mda JX10", "", 1
 vst3info gi_vst3_handle_jx10
 
-gi_vst3_handle_piano vst3init "../build-macos/VST3/Debug/mda-vst3.vst3", "mda Piano", 1
+gi_vst3_handle_piano vst3init "../build-macos/VST3/Debug/mda-vst3.vst3", "mda Piano", "", 1
 vst3info gi_vst3_handle_piano
 
-gi_vst3_handle_delay vst3init "../build-macos/VST3/Debug/mda-vst3.vst3", "mda Delay", 1
+gi_vst3_handle_delay vst3init "../build-macos/VST3/Debug/mda-vst3.vst3", "mda Delay", "", 1
 vst3info gi_vst3_handle_delay
 
-gi_vst3_handle_ambience vst3init "../build-macos/VST3/Debug/mda-vst3.vst3", "mda Ambience", 1
+gi_vst3_handle_ambience vst3init "../build-macos/VST3/Debug/mda-vst3.vst3", "mda Ambience", "", 1
 vst3info gi_vst3_handle_ambience
 
 // Array of instrument plugins indexed by instrument number, for sending 
@@ -146,14 +146,14 @@ endin
 instr Save_Preset
 i_target_plugin = p4
 S_preset_name init p5
-i_vst3_plugin init gi_plugins[p4]
+i_vst3_plugin init gi_plugins[i_target_plugin]
 vst3presetsave i_vst3_plugin, S_preset_name
 prints "%-24s i %9.4f t %9.4f d %9.4f target: %3d  preset: %s #%3d\n", nstrstr(p1), p1, p2, p3, i_target_plugin, S_preset_name, active(p1)
 endin
 
 instr Program_Change
 i_target_plugin = p4
-i_vst3_plugin init gi_plugins[p4]
+i_vst3_plugin init gi_plugins[i_target_plugin]
 ; May only be relevant to the MDA example plugins.
 k_parameter_id init p5
 k_parameter_value init p6
@@ -165,7 +165,7 @@ endin
 instr Load_Preset
 i_target_plugin = p4
 S_preset_name init p5
-i_vst3_plugin init gi_plugins[p4]
+i_vst3_plugin init gi_plugins[i_target_plugin]
 vst3presetload i_vst3_plugin, S_preset_name
 prints "%-24s i %9.4f t %9.4f d %9.4f target: %3d  preset: %s #%3d\n", nstrstr(p1), p1, p2, p3, i_target_plugin, S_preset_name, active(p1)
 endin
@@ -216,10 +216,10 @@ i "Print_Info" 10.5 1 4
 ; Restores original parameter state.
 i "Load_Preset" 25 1 4 "jx10.vstpreset"
 i "Print_Info" 25.5 1 4
-i "Program_Change" 25 1 4 0 12
-i "Print_Info" 30.0 1 4
-i "Program_Change" 30.1 4 0 5
-i "Print_Info" 30.2 1 3
+;i "Program_Change" 25 1 4 0 12
+;i "Print_Info" 30.0 1 4
+;i "Program_Change" 30.1 4 0 5
+;i "Print_Info" 30.2 1 3
 
 </CsScore>
 </CsoundSynthesizer>
+4 −4		Android/CsoundAndroid/jni/Android.mk
+1 −0		Android/CsoundAndroid/jni/Application.mk
+6 −6		Opcodes/sf.h
+6 −6		Opcodes/sfont.c
+1 −0		Opcodes/sftype.h