diff --git a/.gitignore b/.gitignore index 48c666c8..62cb4c9b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,8 @@ /patches /design .DS_Store +*~ +.emacs* +*.exp +*.lib +*.map diff --git a/README.md b/README.md index 3de6175c..9b0d2324 100644 --- a/README.md +++ b/README.md @@ -269,6 +269,14 @@ The following add-on modules are statically linked with the VST plugin: - Valley.UGraph - Valley.Dexter - Valley.Plateau + - VultModules.Debriatus + - VultModules.Lateralus + - VultModules.Rescomb + - VultModules.Splie + - VultModules.Stabile + - VultModules.Tangents + - VultModules.Tohe + - VultModules.Trummor Please notice that the Audible/Mutable Instruments modules appear under a different name in the UI. For example, "Clouds" is listed as "Texture Synthesizer". diff --git a/include/app.hpp b/include/app.hpp index 96bf225b..c90d544e 100644 --- a/include/app.hpp +++ b/include/app.hpp @@ -58,8 +58,9 @@ struct ModuleWidget : OpaqueWidget { std::vector outputs; std::vector params; - ModuleWidget(Module *module); + ModuleWidget(Module *module = 0); ~ModuleWidget(); + void setModule__deprecated__(Module *module); // for VultModules // (todo) fix the plugin /** Convenience functions for adding special widgets (calls addChild()) */ void addInput(Port *input); void addOutput(Port *output); diff --git a/plugins/makefile.msvc b/plugins/makefile.msvc index 1b2ecca4..e42d6502 100644 --- a/plugins/makefile.msvc +++ b/plugins/makefile.msvc @@ -27,6 +27,7 @@ bin: $(call run_make,SubmarineFree,bin) $(call run_make,Template,bin) $(call run_make,Valley,bin) + $(call run_make,VultModules,bin) .PHONY: clean: @@ -48,3 +49,4 @@ clean: $(call run_make,SubmarineFree,clean) $(call run_make,Template,clean) $(call run_make,Valley,clean) + $(call run_make,VultModules,clean) diff --git a/src/app/ModuleWidget.cpp b/src/app/ModuleWidget.cpp index 2f010dbe..8131bde0 100644 --- a/src/app/ModuleWidget.cpp +++ b/src/app/ModuleWidget.cpp @@ -28,6 +28,13 @@ ModuleWidget::~ModuleWidget() { } } +void ModuleWidget::setModule__deprecated__(Module *module) { + if (module) { + engineAddModule(module); + } + this->module = module; +} + void ModuleWidget::addInput(Port *input) { assert(input->type == Port::INPUT); inputs.push_back(input); diff --git a/src/plugin.cpp b/src/plugin.cpp index 5a86233e..0b67c885 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -584,6 +584,7 @@ extern void init_plugin_SonusModular (rack::Plugin *p); extern void init_plugin_SubmarineFree (rack::Plugin *p); extern void init_plugin_Template (rack::Plugin *p); extern void init_plugin_Valley (rack::Plugin *p); +extern void init_plugin_VultModules (rack::Plugin *p); } static void vst2_load_static_rack_plugin(const char *_name, InitCallback _initCallback) { @@ -629,6 +630,7 @@ void vst2_load_static_rack_plugins(void) { vst2_load_static_rack_plugin("SubmarineFree", &init_plugin_SubmarineFree); vst2_load_static_rack_plugin("Template", &init_plugin_Template); vst2_load_static_rack_plugin("Valley", &init_plugin_Valley); + vst2_load_static_rack_plugin("VultModules", &init_plugin_VultModules); } #endif // USE_VST2 diff --git a/src/vst2_main.cpp b/src/vst2_main.cpp index 6d3a74c3..9b695774 100644 --- a/src/vst2_main.cpp +++ b/src/vst2_main.cpp @@ -1106,18 +1106,18 @@ VstIntPtr VSTPluginDispatcher(VSTPlugin *vstPlugin, case effGetEffectName: #ifdef VST2_EFFECT - ::strncpy((char*)ptr, "VST Rack 0.6.1", kVstMaxEffectNameLen); + ::strncpy((char*)ptr, "VeeSeeVST Rack 0.6.1", kVstMaxEffectNameLen); #else - ::strncpy((char*)ptr, "VST Rack 0.6.1 I", kVstMaxEffectNameLen); + ::strncpy((char*)ptr, "VeeSeeVST Rack 0.6.1 I", kVstMaxEffectNameLen); #endif // VST2_EFFECT r = 1; break; case effGetProductString: #ifdef VST2_EFFECT - ::strncpy((char*)ptr, "VST Rack 0.6.1 VST2 Plugin v0.4", kVstMaxProductStrLen); + ::strncpy((char*)ptr, "VeeSeeVST Rack 0.6.1 VST2 Plugin v0.4", kVstMaxProductStrLen); #else - ::strncpy((char*)ptr, "VST Rack 0.6.1 I VST2 Plugin v0.4", kVstMaxProductStrLen); + ::strncpy((char*)ptr, "VeeSeeVST Rack 0.6.1 I VST2 Plugin v0.4", kVstMaxProductStrLen); #endif // VST2_EFFECT r = 1; break; diff --git a/vst2_bin/CHANGELOG_VST.txt b/vst2_bin/CHANGELOG_VST.txt index a2081752..9080c871 100644 --- a/vst2_bin/CHANGELOG_VST.txt +++ b/vst2_bin/CHANGELOG_VST.txt @@ -4,6 +4,14 @@ - remove logos from Fundamental.* modules (as requested by the VCV Rack author) - add module Template.MyModule - clean up for GitHub release +- add module VultModules.Debriatus +- add module VultModules.Lateralus +- add module VultModules.Rescomb +- add module VultModules.Splie +- add module VultModules.Stabile +- add module VultModules.Tangents +- add module VultModules.Tohe +- add module VultModules.Trummor ** July 1st, 2018 diff --git a/vst2_bin/log.txt b/vst2_bin/log.txt index b669d117..815ac499 100644 --- a/vst2_bin/log.txt +++ b/vst2_bin/log.txt @@ -1,54 +1,55 @@ [0.000 info src/main.cpp:58] VeeSeeVST Rack 0.6.1 -[0.000 info src/main.cpp:61] Global directory: f:\git\Rack\vst2_bin\/ -[0.000 info src/main.cpp:62] Local directory: f:\git\Rack\vst2_bin\/ -[0.000 info src/plugin.cpp:612] vcvrack: Loaded static plugin AS 0.6.1 -[0.000 info src/plugin.cpp:612] vcvrack: Loaded static plugin AudibleInstruments 0.6.1 -[0.001 info src/plugin.cpp:612] vcvrack: Loaded static plugin Befaco 0.6.1 -[0.001 info src/plugin.cpp:612] vcvrack: Loaded static plugin Bogaudio 0.6.1 -[0.001 info src/plugin.cpp:612] vcvrack: Loaded static plugin cf 0.6.1 -[0.001 info src/plugin.cpp:612] vcvrack: Loaded static plugin ErraticInstruments 0.6.1 -[0.002 info src/plugin.cpp:612] vcvrack: Loaded static plugin ESeries 0.6.1 -[0.002 info src/plugin.cpp:612] vcvrack: Loaded static plugin Fundamental 0.6.1 -[0.002 info src/plugin.cpp:612] vcvrack: Loaded static plugin HetrickCV 0.6.1 -[0.002 info src/plugin.cpp:612] vcvrack: Loaded static plugin Koralfx-Modules 0.6.1 -[0.002 info src/plugin.cpp:612] vcvrack: Loaded static plugin LindenbergResearch 0.6.1 -[0.002 info src/plugin.cpp:612] vcvrack: Loaded static plugin Qwelk 0.6.1 -[0.002 info src/plugin.cpp:612] vcvrack: Loaded static plugin SonusModular 0.6.1 -[0.003 info src/plugin.cpp:612] vcvrack: Loaded static plugin SubmarineFree 0.6.1 -[0.003 info src/plugin.cpp:612] vcvrack: Loaded static plugin Template 0.6.1 -[0.003 info src/plugin.cpp:612] vcvrack: Loaded static plugin Valley 0.6.1 -[0.003 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/icons/noun_146097_cc.svg -[0.003 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/icons/noun_31859_cc.svg -[0.004 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/icons/noun_1343816_cc.svg -[0.004 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/icons/noun_1343811_cc.svg -[0.004 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/icons/noun_1084369_cc.svg -[0.004 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/icons/noun_1745061_cc.svg -[0.004 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/icons/noun_1240789_cc.svg -[0.004 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/icons/noun_305536_cc.svg -[0.005 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/icons/noun_468341_cc.svg -[0.182 info src/window.cpp:690] Loaded font f:\git\Rack\vst2_bin\/res/fonts/DejaVuSans.ttf -[0.284 info src/app/RackWidget.cpp:192] Loading patch from string -[0.286 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/Core/AudioInterface.svg -[0.286 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/ComponentLibrary/ScrewSilver.svg -[0.286 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/ComponentLibrary/PJ301M.svg -[0.286 info src/window.cpp:690] Loaded font f:\git\Rack\vst2_bin\/res/fonts/ShareTechMono-Regular.ttf -[0.287 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/Core/MIDIToCVInterface.svg -[0.290 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Bogaudio/res/XCO.svg -[0.290 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Bogaudio/res/knob_68px.svg -[0.290 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Bogaudio/res/knob_16px.svg -[0.291 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Bogaudio/res/button_9px_0.svg -[0.291 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Bogaudio/res/button_9px_1.svg -[0.291 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Bogaudio/res/knob_38px.svg -[0.291 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Bogaudio/res/slider_switch_2_14px_0.svg -[0.291 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Bogaudio/res/slider_switch_2_14px_1.svg -[0.292 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Bogaudio/res/port.svg -[0.292 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Fundamental/res/VCA.svg -[0.293 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/ComponentLibrary/RoundLargeBlackKnob.svg -[0.293 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/Fundamental/res/VCF.svg -[0.294 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\/res/ComponentLibrary/RoundHugeBlackKnob.svg -[0.295 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/AS/res/ADSR.svg -[0.295 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/AS/res/as-hexscrew.svg -[0.295 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/AS/res/as-SlidePot.svg -[0.295 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/AS/res/as-SlidePotHandle.svg -[0.296 info src/window.cpp:741] Loaded SVG f:\git\Rack\vst2_bin\plugins/AS/res/as-PJ301M.svg -[3.464 info src/app/RackWidget.cpp:154] Saving patch to string +[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:613] vcvrack: Loaded static plugin AS 0.6.1 +[0.001 info src/plugin.cpp:613] vcvrack: Loaded static plugin AudibleInstruments 0.6.1 +[0.001 info src/plugin.cpp:613] vcvrack: Loaded static plugin Befaco 0.6.1 +[0.002 info src/plugin.cpp:613] vcvrack: Loaded static plugin Bogaudio 0.6.1 +[0.002 info src/plugin.cpp:613] vcvrack: Loaded static plugin cf 0.6.1 +[0.002 info src/plugin.cpp:613] vcvrack: Loaded static plugin ErraticInstruments 0.6.1 +[0.002 info src/plugin.cpp:613] vcvrack: Loaded static plugin ESeries 0.6.1 +[0.003 info src/plugin.cpp:613] vcvrack: Loaded static plugin Fundamental 0.6.1 +[0.003 info src/plugin.cpp:613] vcvrack: Loaded static plugin HetrickCV 0.6.1 +[0.003 info src/plugin.cpp:613] vcvrack: Loaded static plugin Koralfx-Modules 0.6.1 +[0.003 info src/plugin.cpp:613] vcvrack: Loaded static plugin LindenbergResearch 0.6.1 +[0.003 info src/plugin.cpp:613] vcvrack: Loaded static plugin Qwelk 0.6.1 +[0.004 info src/plugin.cpp:613] vcvrack: Loaded static plugin SonusModular 0.6.1 +[0.004 info src/plugin.cpp:613] vcvrack: Loaded static plugin SubmarineFree 0.6.1 +[0.004 info src/plugin.cpp:613] vcvrack: Loaded static plugin Template 0.6.1 +[0.004 info src/plugin.cpp:613] vcvrack: Loaded static plugin Valley 0.6.1 +[0.004 info src/plugin.cpp:613] 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.006 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.200 info src/window.cpp:690] Loaded font f:\git\VeeSeeVSTRack\vst2_bin\/res/fonts/DejaVuSans.ttf +[0.303 info src/app/RackWidget.cpp:192] Loading patch from string +[0.304 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/Core/AudioInterface.svg +[0.304 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/ScrewSilver.svg +[0.305 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/PJ301M.svg +[0.305 info src/window.cpp:690] Loaded font f:\git\VeeSeeVSTRack\vst2_bin\/res/fonts/ShareTechMono-Regular.ttf +[0.306 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/Core/MIDIToCVInterface.svg +[0.308 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/XCO.svg +[0.309 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/knob_68px.svg +[0.309 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/knob_16px.svg +[0.309 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/button_9px_0.svg +[0.309 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/button_9px_1.svg +[0.310 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/knob_38px.svg +[0.310 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/slider_switch_2_14px_0.svg +[0.310 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/slider_switch_2_14px_1.svg +[0.310 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Bogaudio/res/port.svg +[0.311 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Fundamental/res/VCA.svg +[0.311 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/RoundLargeBlackKnob.svg +[0.312 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/Fundamental/res/VCF.svg +[0.312 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\/res/ComponentLibrary/RoundHugeBlackKnob.svg +[0.313 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/ADSR.svg +[0.314 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-hexscrew.svg +[0.314 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-SlidePot.svg +[0.314 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-SlidePotHandle.svg +[0.314 info src/window.cpp:741] Loaded SVG f:\git\VeeSeeVSTRack\vst2_bin\plugins/AS/res/as-PJ301M.svg +[3.116 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 948a2ee6..1c9dfe1f 100644 Binary files a/vst2_bin/veeseevstrack_instr.dll__ and b/vst2_bin/veeseevstrack_instr.dll__ differ diff --git a/vst2_common_staticlibs.mk b/vst2_common_staticlibs.mk index 3c00292e..8afa422d 100644 --- a/vst2_common_staticlibs.mk +++ b/vst2_common_staticlibs.mk @@ -15,3 +15,4 @@ EXTRALIBS+= $(call plugin_lib,SonusModular) EXTRALIBS+= $(call plugin_lib,SubmarineFree) EXTRALIBS+= $(call plugin_lib,Template) EXTRALIBS+= $(call plugin_lib,Valley) +EXTRALIBS+= $(call plugin_lib,VultModules)