Skip to content

Commit f4a725c

Browse files
sadko4usadko4u
committed
Release 1.0.22
* Added experimental support of VST3 plugin format. * Added helper functions to ui::Module. * Added possibility to build and launch without builtin resources. * Updated module versions in dependencies.
2 parents 2eb8555 + ecb8a6e commit f4a725c

File tree

128 files changed

+15533
-2235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+15533
-2235
lines changed

‎.cproject‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.834488426" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
8686
<option defaultValue="gnu.c.debugging.level.max" id="gnu.c.compiler.exe.debug.option.debugging.level.1949011073" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
8787
<option id="gnu.c.compiler.option.dialect.std.556082744" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
88-
<option id="gnu.c.compiler.option.misc.other.1411096904" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags cairo freetype2 xrandr)" valueType="string"/>
89-
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.56789161" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
88+
<option id="gnu.c.compiler.option.misc.other.1411096904" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 $(shell pkg-config --cflags cairo freetype2 xrandr)" valueType="string"/>
89+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.56789161" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
9090
<listOptionValue builtIn="false" value="LSP_TESTING"/>
9191
<listOptionValue builtIn="false" value="USE_LADSPA"/>
9292
<listOptionValue builtIn="false" value="USE_LIBFREETYPE"/>
@@ -116,6 +116,12 @@
116116
</tool>
117117
</toolChain>
118118
</folderInfo>
119+
<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.619973679.453499462" name="avx512.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/avx512.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.162163419.1873304544">
120+
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.162163419.1873304544" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.162163419">
121+
<option id="gnu.cpp.compiler.option.other.other.2082959243" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -mavx512f -mavx512vl" valueType="string"/>
122+
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.52373481" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
123+
</tool>
124+
</fileInfo>
119125
<sourceEntries>
120126
<entry excluding="modules/lsp-tk-lib/src/test/main.cpp|modules/lsp-test-fw/src/test|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-plugins-shared/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-3rd-party/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-dsp-units/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-ws-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
121127
</sourceEntries>
@@ -223,6 +229,12 @@
223229
</tool>
224230
</toolChain>
225231
</folderInfo>
232+
<fileInfo id="cdt.managedbuild.config.gnu.exe.release.1298618321.125772270" name="avx512.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/avx512.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.442760585.1216677568">
233+
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.442760585.1216677568" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.442760585">
234+
<option id="gnu.cpp.compiler.option.other.other.470914169" superClass="gnu.cpp.compiler.option.other.other" value="-c -mavx512f -mavx512vl" valueType="string"/>
235+
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.321057973" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
236+
</tool>
237+
</fileInfo>
226238
<sourceEntries>
227239
<entry excluding="modules/lsp-tk-lib/src/test/main.cpp|modules/lsp-test-fw/src/test|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-plugins-shared/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-3rd-party/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-dsp-units/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-ws-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
228240
</sourceEntries>

‎CHANGELOG‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.22 ===
6+
* Added experimental support of VST3 plugin format.
7+
* Added helper functions to ui::Module.
8+
* Added possibility to build and launch without builtin resources.
9+
* Updated module versions in dependencies.
10+
511
=== 1.0.21 ===
612
* Fixed configuration file serialization.
713
* Code updates that could cause potential problems related to using another

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ help:
148148
echo " ladspa LADSPA plugin format binaries"
149149
echo " lv2 LV2 plugin format binaries"
150150
echo " vst2 VST 2.x plugin format binaries"
151+
echo " vst3 VST 3.x plugin format binaries"
151152
echo " xdg Desktop integration icons"
152153

153154

‎dependencies.mk‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#------------------------------------------------------------------------------
2222
# Features enabled by default
23-
DEFAULT_FEATURES = clap doc ladspa lv2 vst2 xdg
23+
DEFAULT_FEATURES = clap doc ladspa lv2 vst2 vst3 xdg
2424

2525
#------------------------------------------------------------------------------
2626
# Plugin dependencies
@@ -90,6 +90,11 @@ DEPENDENCIES_VST2_WRAP = \
9090
LSP_COMMON_LIB \
9191
LSP_3RD_PARTY
9292

93+
# VST3 dependencies
94+
DEPENDENCIES_VST3 = \
95+
$(DEPENDENCIES_COMMON) \
96+
$(DEPENDENCIES_COMMON_UI)
97+
9398
#------------------------------------------------------------------------------
9499
# Linux-specific dependencies
95100
LINUX_DEPENDENCIES_COMMON =
@@ -169,6 +174,16 @@ LINUX_DEPENDENCIES_VST2 = \
169174

170175
LINUX_DEPENDENCIES_VST2_WRAP = \
171176
LIBDL
177+
178+
# VST3 dependencies
179+
LINUX_DEPENDENCIES_VST3 = \
180+
LIBPTHREAD \
181+
LIBDL \
182+
LIBSNDFILE \
183+
LIBX11 \
184+
LIBXRANDR \
185+
LIBCAIRO \
186+
LIBFREETYPE
172187

173188
ifeq ($(PLATFORM),Linux)
174189
DEFAULT_FEATURES += jack
@@ -192,6 +207,8 @@ ifeq ($(PLATFORM),Linux)
192207

193208
DEPENDENCIES_VST2 += $(LINUX_DEPENDENCIES_VST2)
194209
DEPENDENCIES_VST2_WRAP += $(LINUX_DEPENDENCIES_VST2_WRAP)
210+
211+
DEPENDENCIES_VST3 += $(LINUX_DEPENDENCIES_VST3)
195212
endif
196213

197214
#------------------------------------------------------------------------------
@@ -275,6 +292,16 @@ BSD_DEPENDENCIES_VST2 = \
275292
BSD_DEPENDENCIES_VST2_WRAP = \
276293
LIBDL
277294

295+
# VST3 dependencies
296+
BSD_DEPENDENCIES_VST3 = \
297+
LIBPTHREAD \
298+
LIBDL \
299+
LIBSNDFILE \
300+
LIBX11 \
301+
LIBXRANDR \
302+
LIBCAIRO \
303+
LIBFREETYPE
304+
278305
ifeq ($(PLATFORM),BSD)
279306
DEFAULT_FEATURES += jack
280307

@@ -297,6 +324,8 @@ ifeq ($(PLATFORM),BSD)
297324

298325
DEPENDENCIES_VST2 += $(BSD_DEPENDENCIES_VST2)
299326
DEPENDENCIES_VST2_WRAP += $(BSD_DEPENDENCIES_VST2_WRAP)
327+
328+
DEPENDENCIES_VST3 += $(BSD_DEPENDENCIES_VST3)
300329
endif
301330

302331
#------------------------------------------------------------------------------
@@ -403,6 +432,19 @@ WINDOWS_DEPENDENCIES_VST2 = \
403432
WINDOWS_DEPENDENCIES_VST2_WRAP = \
404433
LIBADVAPI
405434

435+
# VST3 dependencies
436+
WINDOWS_DEPENDENCIES_VST2 = \
437+
LIBSHLWAPI \
438+
LIBWINMM \
439+
LIBMSACM \
440+
LIBMPR \
441+
LIBGDI32 \
442+
LIBD2D1 \
443+
LIBOLE \
444+
LIBWINCODEC \
445+
LIBDWRITE \
446+
LIBUUID
447+
406448
ifeq ($(PLATFORM),Windows)
407449
DEFAULT_FEATURES += jack
408450

@@ -425,6 +467,8 @@ ifeq ($(PLATFORM),Windows)
425467

426468
DEPENDENCIES_VST2 += $(WINDOWS_DEPENDENCIES_VST2)
427469
DEPENDENCIES_VST2_WRAP += $(WINDOWS_DEPENDENCIES_VST2_WRAP)
470+
471+
DEPENDENCIES_VST3 += $(WINDOWS_DEPENDENCIES_VST3)
428472
endif
429473

430474
#------------------------------------------------------------------------------
@@ -439,6 +483,7 @@ DEPENDENCIES = \
439483
$(DEPENDENCIES_LV2_UI) \
440484
$(DEPENDENCIES_LV2TTL_GEN) \
441485
$(DEPENDENCIES_VST2) \
486+
$(DEPENDENCIES_VST3) \
442487
$(DEPENDENCIES_CLAP)
443488

444489
#------------------------------------------------------------------------------
@@ -460,6 +505,7 @@ ALL_DEPENDENCIES = \
460505
$(DEPENDENCIES_LV2_UI) \
461506
$(DEPENDENCIES_LV2TTL_GEN) \
462507
$(DEPENDENCIES_VST2) \
508+
$(DEPENDENCIES_VST3) \
463509
\
464510
$(LINUX_DEPENDENCIES_COMMON) \
465511
$(LINUX_DEPENDENCIES_COMMON_UI) \
@@ -475,6 +521,7 @@ ALL_DEPENDENCIES = \
475521
$(LINUX_DEPENDENCIES_LV2_UI) \
476522
$(LINUX_DEPENDENCIES_LV2TTL_GEN) \
477523
$(LINUX_DEPENDENCIES_VST2) \
524+
$(LINUX_DEPENDENCIES_VST3) \
478525
\
479526
$(BSD_DEPENDENCIES_COMMON) \
480527
$(BSD_DEPENDENCIES_COMMON_UI) \
@@ -490,6 +537,7 @@ ALL_DEPENDENCIES = \
490537
$(BSD_DEPENDENCIES_LV2_UI) \
491538
$(BSD_DEPENDENCIES_LV2TTL_GEN) \
492539
$(BSD_DEPENDENCIES_VST2) \
540+
$(BSD_DEPENDENCIES_VST3) \
493541
\
494542
$(WINDOWS_DEPENDENCIES_COMMON) \
495543
$(WINDOWS_DEPENDENCIES_COMMON_UI) \
@@ -504,5 +552,6 @@ ALL_DEPENDENCIES = \
504552
$(WINDOWS_DEPENDENCIES_LV2) \
505553
$(WINDOWS_DEPENDENCIES_LV2_UI) \
506554
$(WINDOWS_DEPENDENCIES_LV2TTL_GEN) \
507-
$(WINDOWS_DEPENDENCIES_VST2)
555+
$(WINDOWS_DEPENDENCIES_VST2) \
556+
$(WINDOWS_DEPENDENCIES_VST3)
508557

‎include/lsp-plug.in/plug-fw/const.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,12 @@
5151

5252
// Prefix for built-in resource
5353
#define LSP_BUILTIN_PREFIX "builtin://"
54+
#define LSP_RESOURCE_PATH_VAR "LSP_RESOURCE_PATH"
55+
56+
#ifdef LSP_IDE_DEBUG
57+
#ifndef LSP_NO_BUILTIN_RESOURCES
58+
#define LSP_NO_BUILTIN_RESOURCES
59+
#endif /* LSP_NO_BUILTIN_RESOURCES */
60+
#endif /* LSP_IDE_DEBUG */
5461

5562
#endif /* LSP_PLUG_IN_PLUG_FW_CONST_H_ */

‎include/lsp-plug.in/plug-fw/core/KVTDispatcher.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,16 @@ namespace lsp
5151
explicit KVTDispatcher(KVTStorage *kvt, ipc::Mutex *mutex);
5252
KVTDispatcher(const KVTDispatcher &) = delete;
5353
KVTDispatcher(KVTDispatcher &&) = delete;
54-
virtual ~KVTDispatcher();
54+
virtual ~KVTDispatcher() override;
5555

5656
KVTDispatcher & operator = (const KVTDispatcher &) = delete;
5757
KVTDispatcher & operator = (KVTDispatcher &) = delete;
5858

5959
public:
60-
virtual status_t run();
60+
virtual status_t run() override;
61+
62+
public:
63+
ssize_t iterate();
6164

6265
status_t submit(const void *data, size_t size);
6366
status_t submit(const osc::packet_t *packet);

‎include/lsp-plug.in/plug-fw/ctl.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,12 @@
9797
#include <lsp-plug.in/plug-fw/ctl/3d/Model3D.h>
9898

9999
#include <lsp-plug.in/plug-fw/ctl/specific/AudioSample.h>
100-
#include <lsp-plug.in/plug-fw/ctl/specific/DryWetLink.h>
101100
#include <lsp-plug.in/plug-fw/ctl/specific/FileButton.h>
102101
#include <lsp-plug.in/plug-fw/ctl/specific/Fraction.h>
103102
#include <lsp-plug.in/plug-fw/ctl/specific/LedChannel.h>
104103
#include <lsp-plug.in/plug-fw/ctl/specific/LedMeter.h>
105104
#include <lsp-plug.in/plug-fw/ctl/specific/MidiNote.h>
106105
#include <lsp-plug.in/plug-fw/ctl/specific/TempoTap.h>
107-
#include <lsp-plug.in/plug-fw/ctl/specific/Rack.h>
108106
#include <lsp-plug.in/plug-fw/ctl/specific/ThreadComboBox.h>
109107

110108
#undef LSP_PLUG_IN_PLUG_FW_CTL_IMPL_

‎include/lsp-plug.in/plug-fw/ctl/PluginWindow.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ namespace lsp
242242
protected:
243243
void do_destroy();
244244
status_t show_greeting_window();
245-
status_t show_about_window();
246245
status_t show_user_paths_window();
247246
status_t locate_window();
248247
status_t show_menu(tk::Widget *menu, tk::Widget *actor, void *data);
@@ -264,9 +263,9 @@ namespace lsp
264263
status_t scan_presets(const char *location, lltl::darray<resource::resource_t> *presets);
265264
status_t create_main_menu();
266265
status_t create_reset_settings_menu();
266+
void sync_ui_scaling();
267267
bool has_path_ports();
268268
void sync_language_selection();
269-
void sync_ui_scaling();
270269
void sync_font_scaling();
271270
void sync_visual_schemas();
272271
void sync_knob_scale_enabled();
@@ -303,6 +302,11 @@ namespace lsp
303302
*/
304303
virtual void destroy() override;
305304

305+
public:
306+
status_t show_about_window();
307+
status_t show_plugin_manual();
308+
void host_scaling_changed();
309+
306310
public:
307311
virtual void begin(ui::UIContext *ctx) override;
308312
virtual void set(ui::UIContext *ctx, const char *name, const char *value) override;

‎include/lsp-plug.in/plug-fw/ctl/graph/Dot.h‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,15 @@ namespace lsp
6868
ctl::Expression sExpr;
6969
ctl::Boolean sEditable;
7070
tk::RangeFloat *pValue;
71+
tk::Boolean *pEditable;
7172
tk::StepFloat *pStep;
7273
} param_t;
7374

7475
protected:
7576
param_t sX;
7677
param_t sY;
7778
param_t sZ;
79+
bool bEditing;
7880

7981
ctl::Integer sSize;
8082
ctl::Integer sHoverSize;
@@ -91,10 +93,14 @@ namespace lsp
9193
ctl::Color sHoverGapColor;
9294

9395
protected:
94-
static void init_param(param_t *p, tk::RangeFloat *value, tk::StepFloat *step);
95-
void set_dot_param(param_t *p, const char *prefix, const char *name, const char *value);
9696
static status_t slot_change(tk::Widget *sender, void *ptr, void *data);
97+
static status_t slot_begin_edit(tk::Widget *sender, void *ptr, void *data);
98+
static status_t slot_end_edit(tk::Widget *sender, void *ptr, void *data);
9799
static status_t slot_dbl_click(tk::Widget *sender, void *ptr, void *data);
100+
101+
protected:
102+
static void init_param(param_t *p, tk::RangeFloat *value, tk::StepFloat *step, tk::Boolean *editable);
103+
void set_dot_param(param_t *p, const char *prefix, const char *name, const char *value);
98104
void submit_values();
99105
void submit_default_values();
100106
void configure_param(param_t *p, bool axis);

‎include/lsp-plug.in/plug-fw/ctl/specific/DryWetLink.h‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)