diff --git a/README.md b/README.md index 3ffebe24..09c8f1b3 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,14 @@ Tested in - Eureka (my own work-in-progress VST host) - Cockos Reaper - Propellerhead Reason 10 + - according to users: works in Cubase + - according to users: works in Bitwig # Downloads The current release can be found in the [vst2_bin/](vst2_bin/) folder. -Here's a snapshot of it: [veeseevstrack_0_6_1_win64_bin-02Jul2018c.7z](dist/veeseevstrack_0_6_1_win64_bin-02Jul2018c.7z) +Here's a snapshot of it: [veeseevstrack_0_6_1_win64_bin-05Jul2018.7z](dist/veeseevstrack_0_6_1_win64_bin-05Jul2018.7z) # Demo Video @@ -158,6 +160,23 @@ The following add-on modules are statically linked with the VST plugin: - ESeries.E340 - ErraticInstruments.MPEToCV - ErraticInstruments.QuadMPEToCV + - FrozenWasteland.BPMLFO + - FrozenWasteland.BPMLFO2 + - FrozenWasteland.DamianLillard + - FrozenWasteland.EverlastingGlottalStopper + - FrozenWasteland.HairPick + - FrozenWasteland.LissajousLFO + - FrozenWasteland.MrBlueSky + - FrozenWasteland.TheOneRingModulator + - FrozenWasteland.PhasedLockedLoop + - FrozenWasteland.PortlandWeather + - FrozenWasteland.QuadEuclideanRhythm + - FrozenWasteland.QuadGolombRulerRhythm + - FrozenWasteland.QuantussyCell + - FrozenWasteland.RouletteLFO + - FrozenWasteland.SeriouslySlowLFO + - FrozenWasteland.VoxInhumana + - FrozenWasteland.CDCSeriouslySlowLFO - Fundamentals.8vert - Fundamentals.ADSR - Fundamentals.Delay @@ -195,6 +214,8 @@ The following add-on modules are statically linked with the VST plugin: - HetrickCV.Rotator - HetrickCV.Scanner - HetrickCV.Waveshape + - huaba.EQ3 + - huaba.ABBus - Koralfx.Beatovnik - Koralfx.Mixovnik - Koralfx.Nullovnik4 @@ -208,6 +229,29 @@ The following add-on modules are statically linked with the VST plugin: - LindenbergResearch.ReShaper - LindenbergResearch.BlankPanel - LindenbergResearch.BlankPanelM1 + - ML_modules.Quantizer + - ML_modules.Quantum + - ML_modules.TrigBuf + - ML_modules.SeqSwitch + - ML_modules.SeqSwitch2 + - ML_modules.ShiftRegister + - ML_modules.ShiftRegister2 + - ML_modules.FreeVerb + - ML_modules.Sum8 + - ML_modules.Sum8mk2 + - ML_modules.SH8 + - ML_modules.Constants + - ML_modules.Counter + - ML_modules.TrigDelay + - ML_modules.BPMdetect + - ML_modules.VoltMeter + - ML_modules.OctaFlop + - ML_modules.OctaTrig + - ML_modules.OctaSwitch + - ML_modules.TrigSwitch + - ML_modules.TrigSwitch2 + - ML_modules.TrigSwitch3 + - ML_modules.TrigSwitch3_2 - Qwelk.Automaton - Qwelk.Byte - Qwelk.Chaos @@ -282,6 +326,12 @@ The following add-on modules are statically linked with the VST plugin: - SubmarineFree.BP124 - SubmarineFree.BP132 - Template.MyModule + - trowaSoft.TrigSeq + - trowaSoft.TrigSeq64 + - trowaSoft.VoltSeq + - trowaSoft.OscCV + - trowaSoft.MultiScope + - trowaSoft.MultiOscillator - Valley.Topograph - Valley.UGraph - Valley.Dexter diff --git a/include/global_ui.hpp b/include/global_ui.hpp index 045c133a..ec1a6540 100644 --- a/include/global_ui.hpp +++ b/include/global_ui.hpp @@ -87,6 +87,10 @@ struct GlobalUI { struct { volatile int b_close_window; volatile int b_hide_window; +#ifdef WIN32 + void *parent_hwnd; + bool b_queued_maximize_window; +#endif // WIN32 } vst2; #endif // USE_VST2 @@ -129,6 +133,10 @@ struct GlobalUI { #ifdef USE_VST2 vst2.b_close_window = 0; vst2.b_hide_window = 0; +#ifdef WIN32 + vst2.parent_hwnd = 0; + vst2.b_queued_maximize_window = false; +#endif #endif // USE_VST2 } diff --git a/makefile_lib.msvc b/makefile_lib.msvc index 5b930edb..94bb5dce 100644 --- a/makefile_lib.msvc +++ b/makefile_lib.msvc @@ -7,7 +7,7 @@ include dep/yac/install_msvc.mk TARGET_BASENAME=Rack -EXTRAFLAGS= -DVERSION=0.6.1 -DARCH_WIN -D_USE_MATH_DEFINES -DRACK_HOST -DUSE_VST2 -Iinclude/ -Idep/include +EXTRAFLAGS= -DVERSION=0.6.1 -DARCH_WIN -D_USE_MATH_DEFINES -DRACK_HOST -DUSE_VST2 -DVST2_REPARENT_WINDOW_HACK -Iinclude/ -Idep/include EXTRALIBS= -LIBPATH:dep/lib/msvc/ jansson.lib # glew.lib glfw.lib gdi32.lib user32.lib kernel32.lib diff --git a/src/main.cpp b/src/main.cpp index 3eaa5442..b8995244 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,6 +21,11 @@ #include "global.hpp" #include "global_ui.hpp" +// #if defined(YAC_WIN32) && defined(VST2_REPARENT_WINDOW_HACK) +// #include +// extern "C" extern HWND __hack__glfwGetHWND (GLFWwindow *window); +// #endif + using namespace rack; diff --git a/src/plugin.cpp b/src/plugin.cpp index e7bff1b4..79ec2000 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -576,14 +576,18 @@ extern void init_plugin_cf (rack::Plugin *p); extern void init_plugin_ErraticInstruments (rack::Plugin *p); extern void init_plugin_ESeries (rack::Plugin *p); extern void init_plugin_Fundamental (rack::Plugin *p); +extern void init_plugin_FrozenWasteland (rack::Plugin *p); extern void init_plugin_HetrickCV (rack::Plugin *p); +extern void init_plugin_huaba (rack::Plugin *p); extern void init_plugin_Koralfx (rack::Plugin *p); extern void init_plugin_LindenbergResearch (rack::Plugin *p); +extern void init_plugin_ML_modules (rack::Plugin *p); extern void init_plugin_Qwelk (rack::Plugin *p); extern void init_plugin_SonusModular (rack::Plugin *p); extern void init_plugin_squinkylabs_plug1 (rack::Plugin *p); extern void init_plugin_SubmarineFree (rack::Plugin *p); extern void init_plugin_Template (rack::Plugin *p); +extern void init_plugin_trowaSoft (rack::Plugin *p); extern void init_plugin_Valley (rack::Plugin *p); extern void init_plugin_VultModules (rack::Plugin *p); } @@ -623,18 +627,21 @@ void vst2_load_static_rack_plugins(void) { vst2_load_static_rack_plugin("ErraticInstruments", &init_plugin_ErraticInstruments); vst2_load_static_rack_plugin("ESeries", &init_plugin_ESeries); vst2_load_static_rack_plugin("Fundamental", &init_plugin_Fundamental); + vst2_load_static_rack_plugin("FrozenWasteland", &init_plugin_FrozenWasteland); vst2_load_static_rack_plugin("HetrickCV", &init_plugin_HetrickCV); + vst2_load_static_rack_plugin("huaba", &init_plugin_huaba); vst2_load_static_rack_plugin("Koralfx-Modules", &init_plugin_Koralfx); vst2_load_static_rack_plugin("LindenbergResearch", &init_plugin_LindenbergResearch); + vst2_load_static_rack_plugin("ML_modules", &init_plugin_ML_modules); vst2_load_static_rack_plugin("Qwelk", &init_plugin_Qwelk); vst2_load_static_rack_plugin("SonusModular", &init_plugin_SonusModular); vst2_load_static_rack_plugin("squinkylabs-plug1", &init_plugin_squinkylabs_plug1); vst2_load_static_rack_plugin("SubmarineFree", &init_plugin_SubmarineFree); vst2_load_static_rack_plugin("Template", &init_plugin_Template); + vst2_load_static_rack_plugin("trowaSoft", &init_plugin_trowaSoft); vst2_load_static_rack_plugin("Valley", &init_plugin_Valley); vst2_load_static_rack_plugin("VultModules", &init_plugin_VultModules); } #endif // USE_VST2 - } // namespace rack diff --git a/src/vst2_main.cpp b/src/vst2_main.cpp index a1d322d3..462bd0a3 100644 --- a/src/vst2_main.cpp +++ b/src/vst2_main.cpp @@ -73,8 +73,8 @@ extern void vst2_get_param_name (int uniqueParamId, char *s, int sMaxLen); EXTERN_C IMAGE_DOS_HEADER __ImageBase; -// // HWND g_glfw_vst2_parent_hwnd; // read by modified version of GLFW (see glfw/src/win32_window.c) - +extern "C" extern HWND g_glfw_vst2_parent_hwnd; // read by modified version of GLFW (see glfw/src/win32_window.c) +extern "C" extern HWND __hack__glfwGetHWND (GLFWwindow *window); // Windows: @@ -577,13 +577,19 @@ public: #ifdef YAC_WIN32 void openEditor(HWND _hwnd) { - // // g_glfw_vst2_parent_hwnd = _hwnd; + //g_glfw_vst2_parent_hwnd = _hwnd; + g_glfw_vst2_parent_hwnd = 0; #else #error implement me (openEditor) #endif printf("xxx vstrack_plugin: openEditor()\n"); b_queued_open_editor = true; +#ifdef YAC_WIN32 + rack::global_ui->vst2.parent_hwnd = (void*)_hwnd; + printf("xxx vstrack_plugin: DAW parent hwnd=%p\n", rack::global_ui->vst2.parent_hwnd); +#endif // YAC_WIN32 + int iter = 0; while(iter++ < 50) { @@ -803,10 +809,30 @@ static DWORD WINAPI vst2_ui_thread_entry(VSTPluginWrapper *_wrapper) { // printf("xxx vstrack_plugin: idle loop\n"); if(_wrapper->b_queued_open_editor && !_wrapper->b_editor_open) { + if(!_wrapper->b_editor_created) + { + } + _wrapper->b_queued_open_editor = YAC_FALSE; // Show previously hidden window +#if defined(YAC_WIN32) && defined(VST2_REPARENT_WINDOW_HACK) +#if 0 + HWND glfwHWND = __hack__glfwGetHWND(rack::global_ui->window.gWindow); + ::SetParent(glfwHWND, + (HWND)rack::global_ui->vst2.parent_hwnd + ); + printf("xxx vstrack: SetParent(glfwHWND=%p, dawParentHWND=%p)\n", (void*)glfwHWND, rack::global_ui->vst2.parent_hwnd); +#endif +#endif // YAC_WIN32 + glfwShowWindow(rack::global_ui->window.gWindow); + +#ifdef VST2_REPARENT_WINDOW_HACK + // maximize window once it starts to receive events (see window.cpp) + rack::global_ui->vst2.b_queued_maximize_window = true; +#endif // VST2_REPARENT_WINDOW_HACK + _wrapper->b_editor_open = YAC_TRUE; rack::global_ui->vst2.b_close_window = 0; @@ -827,8 +853,14 @@ static DWORD WINAPI vst2_ui_thread_entry(VSTPluginWrapper *_wrapper) { } else if(_wrapper->b_queued_destroy_editor) { + printf("xxx vstrack: _wrapper->b_queued_destroy_editor is 1, b_editor_created=%d\n", _wrapper->b_editor_created); if(_wrapper->b_editor_created) { +#if 0 +#if defined(YAC_WIN32) && defined(VST2_REPARENT_WINDOW_HACK) + ::SetParent(__hack__glfwGetHWND(rack::global_ui->window.gWindow), NULL); // [bsp 04Jul2018] reparent hack (fix hang up when DAW editor is closed) +#endif // VST2_REPARENT_WINDOW_HACK +#endif vst2_editor_destroy(); _wrapper->b_editor_created = YAC_FALSE; } @@ -1370,10 +1402,16 @@ VstIntPtr VSTPluginDispatcher(VSTPlugin *vstPlugin, if(NULL != ptr) // yeah, this should never be NULL { // ... - wrapper->editor_rect.top = 20; - wrapper->editor_rect.left = 20; - wrapper->editor_rect.bottom = 50; - wrapper->editor_rect.right = 80; +#define EDITWIN_X 20 +#define EDITWIN_Y 20 +// #define EDITWIN_W 1200 +// #define EDITWIN_H 800 +#define EDITWIN_W 60 +#define EDITWIN_H 21 + wrapper->editor_rect.left = EDITWIN_X; + wrapper->editor_rect.top = EDITWIN_Y; + wrapper->editor_rect.right = EDITWIN_X + EDITWIN_W; + wrapper->editor_rect.bottom = EDITWIN_Y + EDITWIN_H; *(void**)ptr = (void*) &wrapper->editor_rect; r = 1; } @@ -1549,6 +1587,25 @@ void vst2_handle_ui_param(int uniqueParamId, float normValue) { rack::global->vst2.wrapper->handleUIParam(uniqueParamId, normValue); } +#ifdef VST2_REPARENT_WINDOW_HACK +#ifdef YAC_WIN32 +void vst2_maximize_reparented_window(void) { +#if 0 + HWND glfwHWND = __hack__glfwGetHWND(rack::global_ui->window.gWindow); + HWND parentHWND = (HWND)rack::global_ui->vst2.parent_hwnd; + printf("xxx vstrack_plugin:vst2_maximize_reparented_window: hwnd=%p\n", (void*)glfwHWND); + RECT rect; + (void)::GetClientRect(parentHWND, &rect); + ///(void)::AdjustWindowRect(..) + printf("xxx vstrack_plugin:vst2_maximize_reparented_window: new size=(%d; %d)\n", rect.right-rect.left, rect.bottom-rect.top); + ::MoveWindow(glfwHWND, 0, 0, rect.right-rect.left, rect.bottom-rect.top, TRUE/*bRepaint*/); + // ::ShowWindow(glfwHWND, SW_MAXIMIZE); + // // ::ShowWindow(glfwHWND, SW_SHOWMAXIMIZED); +#endif // 0 +} +#endif // YAC_WIN32 +#endif // VST2_REPARENT_WINDOW_HACK + /** * Implementation of the main entry point of the plugin */ diff --git a/src/window.cpp b/src/window.cpp index 00d690e4..625d38c7 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -37,6 +37,11 @@ #ifdef USE_VST2 extern void vst2_handle_queued_set_program_chunk (void); + +#if defined(VST2_REPARENT_WINDOW_HACK) +extern void vst2_maximize_reparented_window(void); +extern "C" extern int __glfw_hack__b_queued_maximize_window; +#endif // VST2_REPARENT_WINDOW_HACK #endif // USE_VST2 namespace rack { @@ -541,6 +546,14 @@ void windowRun() { global_ui->vst2.b_hide_window = 0; break; } +#if defined(YAC_WIN32) && defined(VST2_REPARENT_WINDOW_HACK) + else if(rack::global_ui->vst2.b_queued_maximize_window || __glfw_hack__b_queued_maximize_window) + { + rack::global_ui->vst2.b_queued_maximize_window = false; + __glfw_hack__b_queued_maximize_window = false; + vst2_maximize_reparented_window(); + } +#endif // VST2_REPARENT_WINDOW_HACK #endif // USE_VST2 } diff --git a/vst2_bin/CHANGELOG_VST.txt b/vst2_bin/CHANGELOG_VST.txt index b657165c..40198daf 100644 --- a/vst2_bin/CHANGELOG_VST.txt +++ b/vst2_bin/CHANGELOG_VST.txt @@ -1,3 +1,53 @@ +** July 5th, 2018 +- add module huaba.EQ3 +- add module huaba.ABBus +- add module FrozenWasteland.BPMLFO +- add module FrozenWasteland.BPMLFO2 +- add module FrozenWasteland.DamianLillard +- add module FrozenWasteland.EverlastingGlottalStopper +- add module FrozenWasteland.HairPick +- add module FrozenWasteland.LissajousLFO +- add module FrozenWasteland.MrBlueSky +- add module FrozenWasteland.TheOneRingModulator +- add module FrozenWasteland.PhasedLockedLoop +- add module FrozenWasteland.PortlandWeather +- add module FrozenWasteland.QuadEuclideanRhythm +- add module FrozenWasteland.QuadGolombRulerRhythm +- add module FrozenWasteland.QuantussyCell +- add module FrozenWasteland.RouletteLFO +- add module FrozenWasteland.SeriouslySlowLFO +- add module FrozenWasteland.VoxInhumana +- add module FrozenWasteland.CDCSeriouslySlowLFO +- add module ML_modules.Quantizer +- add module ML_modules.Quantum +- add module ML_modules.TrigBuf +- add module ML_modules.SeqSwitch +- add module ML_modules.SeqSwitch2 +- add module ML_modules.ShiftRegister +- add module ML_modules.ShiftRegister2 +- add module ML_modules.FreeVerb +- add module ML_modules.Sum8 +- add module ML_modules.Sum8mk2 +- add module ML_modules.SH8 +- add module ML_modules.Constants +- add module ML_modules.Counter +- add module ML_modules.TrigDelay +- add module ML_modules.BPMdetect +- add module ML_modules.VoltMeter +- add module ML_modules.OctaFlop +- add module ML_modules.OctaTrig +- add module ML_modules.OctaSwitch +- add module ML_modules.TrigSwitch +- add module ML_modules.TrigSwitch2 +- add module ML_modules.TrigSwitch3 +- add module ML_modules.TrigSwitch3_2 +- add module trowaSoft.TrigSeq +- add module trowaSoft.TrigSeq64 +- add module trowaSoft.VoltSeq +- add module trowaSoft.OscCV +- add module trowaSoft.MultiScope +- add module trowaSoft.MultiOscillator + ** July 2nd, 2018 - remove assertions in Bogaudio oscillator (were triggered when LindenbergResearch.AlmaFilter was connected) diff --git a/vst2_bin/README_vst2.txt b/vst2_bin/README_vst2.txt index fc42c7bf..6d33c018 100644 --- a/vst2_bin/README_vst2.txt +++ b/vst2_bin/README_vst2.txt @@ -153,6 +153,23 @@ The VST2 plugin includes the following add-on modules: - ESeries.E340 - ErraticInstruments.MPEToCV - ErraticInstruments.QuadMPEToCV + - FrozenWasteland.BPMLFO + - FrozenWasteland.BPMLFO2 + - FrozenWasteland.DamianLillard + - FrozenWasteland.EverlastingGlottalStopper + - FrozenWasteland.HairPick + - FrozenWasteland.LissajousLFO + - FrozenWasteland.MrBlueSky + - FrozenWasteland.TheOneRingModulator + - FrozenWasteland.PhasedLockedLoop + - FrozenWasteland.PortlandWeather + - FrozenWasteland.QuadEuclideanRhythm + - FrozenWasteland.QuadGolombRulerRhythm + - FrozenWasteland.QuantussyCell + - FrozenWasteland.RouletteLFO + - FrozenWasteland.SeriouslySlowLFO + - FrozenWasteland.VoxInhumana + - FrozenWasteland.CDCSeriouslySlowLFO - Fundamentals.8vert - Fundamentals.ADSR - Fundamentals.Delay @@ -203,6 +220,29 @@ The VST2 plugin includes the following add-on modules: - LindenbergResearch.ReShaper - LindenbergResearch.BlankPanel - LindenbergResearch.BlankPanelM1 + - ML_modules.Quantizer + - ML_modules.Quantum + - ML_modules.TrigBuf + - ML_modules.SeqSwitch + - ML_modules.SeqSwitch2 + - ML_modules.ShiftRegister + - ML_modules.ShiftRegister2 + - ML_modules.FreeVerb + - ML_modules.Sum8 + - ML_modules.Sum8mk2 + - ML_modules.SH8 + - ML_modules.Constants + - ML_modules.Counter + - ML_modules.TrigDelay + - ML_modules.BPMdetect + - ML_modules.VoltMeter + - ML_modules.OctaFlop + - ML_modules.OctaTrig + - ML_modules.OctaSwitch + - ML_modules.TrigSwitch + - ML_modules.TrigSwitch2 + - ML_modules.TrigSwitch3 + - ML_modules.TrigSwitch3_2 - Qwelk.Automaton - Qwelk.Byte - Qwelk.Chaos @@ -277,6 +317,12 @@ The VST2 plugin includes the following add-on modules: - SubmarineFree.BP124 - SubmarineFree.BP132 - Template.MyModule + - trowaSoft.TrigSeq + - trowaSoft.TrigSeq64 + - trowaSoft.VoltSeq + - trowaSoft.OscCV + - trowaSoft.MultiScope + - trowaSoft.MultiOscillator - Valley.Topograph - Valley.UGraph - Valley.Dexter diff --git a/vst2_bin/log.txt b/vst2_bin/log.txt index 8c73c067..398b4358 100644 --- a/vst2_bin/log.txt +++ b/vst2_bin/log.txt @@ -1,56 +1,77 @@ -[0.000 info src/main.cpp:58] VeeSeeVST Rack 0.6.1 -[0.000 info src/main.cpp:61] Global directory: f:\git\VeeSeeVSTRack\vst2_bin\/ -[0.000 info src/main.cpp:62] Local directory: f:\git\VeeSeeVSTRack\vst2_bin\/ -[0.000 info src/plugin.cpp:614] vcvrack: Loaded static plugin AS 0.6.1 -[0.000 info src/plugin.cpp:614] vcvrack: Loaded static plugin AudibleInstruments 0.6.1 -[0.001 info src/plugin.cpp:614] vcvrack: Loaded static plugin Befaco 0.6.1 -[0.002 info src/plugin.cpp:614] vcvrack: Loaded static plugin Bogaudio 0.6.1 -[0.002 info src/plugin.cpp:614] vcvrack: Loaded static plugin cf 0.6.1 -[0.002 info src/plugin.cpp:614] vcvrack: Loaded static plugin ErraticInstruments 0.6.1 -[0.002 info src/plugin.cpp:614] vcvrack: Loaded static plugin ESeries 0.6.1 -[0.002 info src/plugin.cpp:614] vcvrack: Loaded static plugin Fundamental 0.6.1 -[0.003 info src/plugin.cpp:614] vcvrack: Loaded static plugin HetrickCV 0.6.1 -[0.003 info src/plugin.cpp:614] vcvrack: Loaded static plugin Koralfx-Modules 0.6.1 -[0.003 info src/plugin.cpp:614] vcvrack: Loaded static plugin LindenbergResearch 0.6.1 -[0.003 info src/plugin.cpp:614] vcvrack: Loaded static plugin Qwelk 0.6.1 -[0.003 info src/plugin.cpp:614] vcvrack: Loaded static plugin SonusModular 0.6.1 -[0.003 info src/plugin.cpp:614] vcvrack: Loaded static plugin squinkylabs-plug1 0.6.1 -[0.004 info src/plugin.cpp:614] vcvrack: Loaded static plugin SubmarineFree 0.6.1 -[0.004 info src/plugin.cpp:614] vcvrack: Loaded static plugin Template 0.6.1 -[0.004 info src/plugin.cpp:614] vcvrack: Loaded static plugin Valley 0.6.1 -[0.004 info src/plugin.cpp:614] vcvrack: Loaded static plugin VultModules 0.6.1 -[0.005 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_146097_cc.svg -[0.005 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_31859_cc.svg -[0.005 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1343816_cc.svg -[0.005 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1343811_cc.svg -[0.005 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1084369_cc.svg -[0.006 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1745061_cc.svg -[0.006 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1240789_cc.svg -[0.006 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_305536_cc.svg -[0.006 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_468341_cc.svg -[0.203 info src/window.cpp:690] Loaded font f:\git\VeeSeeVSTRack\vst2_bin\/res/fonts/DejaVuSans.ttf -[0.306 info src/app/RackWidget.cpp:192] Loading patch from string -[0.307 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/Core/AudioInterface.svg -[0.307 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/ScrewSilver.svg -[0.307 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/PJ301M.svg -[0.308 info src/window.cpp:690] Loaded font f:\git\VeeSeeVSTRack\vst2_bin\/res/fonts/ShareTechMono-Regular.ttf -[0.309 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/Core/MIDIToCVInterface.svg -[0.311 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/XCO.svg -[0.312 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/knob_68px.svg -[0.312 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/knob_16px.svg -[0.312 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/button_9px_0.svg -[0.312 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/button_9px_1.svg -[0.312 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/knob_38px.svg -[0.313 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/slider_switch_2_14px_0.svg -[0.313 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/slider_switch_2_14px_1.svg -[0.313 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/port.svg -[0.314 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Fundamental/res/VCA.svg -[0.314 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/RoundLargeBlackKnob.svg -[0.315 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Fundamental/res/VCF.svg -[0.315 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/RoundHugeBlackKnob.svg -[0.316 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/ADSR.svg -[0.317 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-hexscrew.svg -[0.317 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-SlidePot.svg -[0.317 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-SlidePotHandle.svg -[0.317 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-PJ301M.svg -[3.561 info src/app/RackWidget.cpp:154] Saving patch to string +[0.000 info src/main.cpp:63] VeeSeeVST Rack 0.6.1 +[0.000 info src/main.cpp:66] Global directory: f:\git\VeeSeeVSTRack\vst2_bin\/ +[0.000 info src/main.cpp:67] Local directory: f:\git\VeeSeeVSTRack\vst2_bin\/ +[0.001 info src/plugin.cpp:618] vcvrack: Loaded static plugin AS 0.6.1 +[0.002 info src/plugin.cpp:618] vcvrack: Loaded static plugin AudibleInstruments 0.6.1 +[0.003 info src/plugin.cpp:618] vcvrack: Loaded static plugin Befaco 0.6.1 +[0.003 info src/plugin.cpp:618] vcvrack: Loaded static plugin Bogaudio 0.6.1 +[0.003 info src/plugin.cpp:618] vcvrack: Loaded static plugin cf 0.6.1 +[0.004 info src/plugin.cpp:618] vcvrack: Loaded static plugin ErraticInstruments 0.6.1 +[0.004 info src/plugin.cpp:618] vcvrack: Loaded static plugin ESeries 0.6.1 +[0.005 info src/plugin.cpp:618] vcvrack: Loaded static plugin Fundamental 0.6.1 +[0.005 info src/plugin.cpp:618] vcvrack: Loaded static plugin FrozenWasteland 0.6.1 +[0.006 info src/plugin.cpp:618] vcvrack: Loaded static plugin HetrickCV 0.6.1 +[0.006 info src/plugin.cpp:618] vcvrack: Loaded static plugin huaba 0.6.1 +[0.007 info src/plugin.cpp:618] vcvrack: Loaded static plugin Koralfx-Modules 0.6.1 +[0.007 info src/plugin.cpp:618] vcvrack: Loaded static plugin LindenbergResearch 0.6.1 +[0.008 info src/plugin.cpp:618] vcvrack: Loaded static plugin ML_modules 0.6.1 +[0.008 info src/plugin.cpp:618] vcvrack: Loaded static plugin Qwelk 0.6.1 +[0.009 info src/plugin.cpp:618] vcvrack: Loaded static plugin SonusModular 0.6.1 +[0.009 info src/plugin.cpp:618] vcvrack: Loaded static plugin squinkylabs-plug1 0.6.1 +[0.010 info src/plugin.cpp:618] vcvrack: Loaded static plugin SubmarineFree 0.6.1 +[0.010 info src/plugin.cpp:618] vcvrack: Loaded static plugin Template 0.6.1 +[0.011 info src/plugin.cpp:618] vcvrack: Loaded static plugin trowaSoft 0.6.1 +[0.011 info src/plugin.cpp:618] vcvrack: Loaded static plugin Valley 0.6.1 +[0.012 info src/plugin.cpp:618] vcvrack: Loaded static plugin VultModules 0.6.1 +[0.012 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_146097_cc.svg +[0.013 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_31859_cc.svg +[0.013 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1343816_cc.svg +[0.014 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1343811_cc.svg +[0.014 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1084369_cc.svg +[0.015 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1745061_cc.svg +[0.015 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_1240789_cc.svg +[0.016 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_305536_cc.svg +[0.016 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/icons/noun_468341_cc.svg +[0.194 info src/window.cpp:703] Loaded font f:\git\VeeSeeVSTRack\vst2_bin\/res/fonts/DejaVuSans.ttf +[0.297 info src/app/RackWidget.cpp:192] Loading patch from string +[0.299 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/Core/AudioInterface.svg +[0.299 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/ScrewSilver.svg +[0.300 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/PJ301M.svg +[0.300 info src/window.cpp:703] Loaded font f:\git\VeeSeeVSTRack\vst2_bin\/res/fonts/ShareTechMono-Regular.ttf +[0.301 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/Core/MIDIToCVInterface.svg +[0.304 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/XCO.svg +[0.304 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/knob_68px.svg +[0.305 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/knob_16px.svg +[0.305 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/button_9px_0.svg +[0.306 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/button_9px_1.svg +[0.306 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/knob_38px.svg +[0.307 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/slider_switch_2_14px_0.svg +[0.307 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/slider_switch_2_14px_1.svg +[0.308 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/port.svg +[0.309 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Fundamental/res/VCA.svg +[0.309 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/RoundLargeBlackKnob.svg +[0.310 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Fundamental/res/VCF.svg +[0.310 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/RoundHugeBlackKnob.svg +[0.312 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/ADSR.svg +[0.312 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-hexscrew.svg +[0.312 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-SlidePot.svg +[0.313 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-SlidePotHandle.svg +[0.314 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-PJ301M.svg +[5.948 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/trigSeq.svg +[5.949 info src/window.cpp:703] Loaded font f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/Fonts/Digital dream Fat.ttf +[5.949 info src/window.cpp:703] Loaded font f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/Fonts/ZeroesThree-Regular.ttf +[5.950 info src/window.cpp:703] Loaded font f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/Fonts/larabieb.ttf +[5.950 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/ComponentLibrary/TS_pad_btn_0.svg +[5.951 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/ComponentLibrary/TS_pad_btn_1.svg +[5.951 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/ScrewBlack.svg +[5.952 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/RoundSmallBlackKnob.svg +[5.952 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/LEDButton.svg +[5.953 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/ComponentLibrary/TS_Port.svg +[5.953 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/ComponentLibrary/TS_pad_0.svg +[12.871 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/voltSeq.svg +[17.842 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/cvOSCcv.svg +[23.597 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/multiScope.svg +[23.597 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/ComponentLibrary/TS_RoundBlackKnob_20.svg +[28.057 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/multiOscillator.svg +[28.058 info src/window.cpp:754] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/trowaSoft/res/ComponentLibrary/TS_RoundBlackEncoder_20.svg +[32.862 info src/app/RackWidget.cpp:154] Saving patch to string diff --git a/vst2_bin/veeseevstrack_instr.dll__ b/vst2_bin/veeseevstrack_instr.dll__ index e31512c3..82c4e7e3 100644 Binary files a/vst2_bin/veeseevstrack_instr.dll__ and b/vst2_bin/veeseevstrack_instr.dll__ differ diff --git a/vst2_common_msvc_pre.mk b/vst2_common_msvc_pre.mk index d23c720f..9dc98227 100644 --- a/vst2_common_msvc_pre.mk +++ b/vst2_common_msvc_pre.mk @@ -1,6 +1,7 @@ -EXTRAFLAGS+= -DARCH_WIN +EXTRAFLAGS+= -DARCH_WIN +EXTRAFLAGS+= -DVST2_REPARENT_WINDOW_HACK EXTRAFLAGS+= -I../../dev/vstsdk2.4/pluginterfaces/vst2.x/ -EXTRALIBS= Rack.lib -LIBPATH:dep/lib/msvc/ libspeexdsp.lib glew.lib glfw.lib opengl32.lib gdi32.lib user32.lib kernel32.lib Comdlg32.lib Shell32.lib +EXTRALIBS= Rack.lib -LIBPATH:dep/lib/msvc/ libspeexdsp.lib glew.lib glfw.lib opengl32.lib gdi32.lib user32.lib kernel32.lib Comdlg32.lib Shell32.lib ws2_32.lib winmm.lib plugin_lib = $(PLUGIN_DIR)/$(1)/$(1).lib diff --git a/vst2_common_staticlibs.mk b/vst2_common_staticlibs.mk index 5ba7e972..bd21732e 100644 --- a/vst2_common_staticlibs.mk +++ b/vst2_common_staticlibs.mk @@ -6,14 +6,18 @@ EXTRALIBS+= $(call plugin_lib,Bogaudio) EXTRALIBS+= $(call plugin_lib,cf) EXTRALIBS+= $(call plugin_lib,ErraticInstruments) EXTRALIBS+= $(call plugin_lib,ESeries) +EXTRALIBS+= $(call plugin_lib,FrozenWasteland) EXTRALIBS+= $(call plugin_lib,Fundamental) EXTRALIBS+= $(call plugin_lib,HetrickCV) +EXTRALIBS+= $(call plugin_lib,huaba) EXTRALIBS+= $(call plugin_lib,Koralfx-Modules) EXTRALIBS+= $(call plugin_lib,LindenbergResearch) +EXTRALIBS+= $(call plugin_lib,ML_modules) EXTRALIBS+= $(call plugin_lib,Qwelk) EXTRALIBS+= $(call plugin_lib,SonusModular) EXTRALIBS+= $(call plugin_lib,squinkylabs-plug1) EXTRALIBS+= $(call plugin_lib,SubmarineFree) EXTRALIBS+= $(call plugin_lib,Template) +EXTRALIBS+= $(call plugin_lib,trowaSoft) EXTRALIBS+= $(call plugin_lib,Valley) EXTRALIBS+= $(call plugin_lib,VultModules)