Skip to content

Commit 9bdc48d

Browse files
sadko4usadko4u
committed
Release 1.0.22
* Implemented Dry/Wet balance knob. * Updated build scripts and dependencies.
2 parents 4bc32eb + fb402d8 commit 9bdc48d

24 files changed

+170
-144
lines changed

‎.cproject

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
<option id="gnu.cpp.link.option.flags.372033104" name="Linker flags" superClass="gnu.cpp.link.option.flags" useByScannerDiscovery="false" value="-fsanitize=address $(shell pkg-config --libs jack x11 cairo sndfile gl freetype2 xrandr)" valueType="string"/>
9999
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.link.option.libs.1822061934" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
100100
<listOptionValue builtIn="false" value="pthread"/>
101+
<listOptionValue builtIn="false" value="rt"/>
101102
<listOptionValue builtIn="false" value="dl"/>
102103
</option>
103104
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.860802800" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
@@ -124,7 +125,7 @@
124125
</fileInfo>
125126
<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.619973679.1088520346" 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.1096491537">
126127
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.162163419.1096491537" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.162163419">
127-
<option id="gnu.cpp.compiler.option.other.other.1222783802" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
128+
<option id="gnu.cpp.compiler.option.other.other.1222783802" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
128129
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1645353784" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
129130
</tool>
130131
</fileInfo>
@@ -218,7 +219,7 @@
218219
</fileInfo>
219220
<fileInfo id="cdt.managedbuild.config.gnu.exe.release.1298618321.105933045" 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.995431695">
220221
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.442760585.995431695" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.442760585">
221-
<option id="gnu.cpp.compiler.option.other.other.979097834" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
222+
<option id="gnu.cpp.compiler.option.other.other.979097834" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
222223
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1095124970" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
223224
</tool>
224225
</fileInfo>
@@ -371,7 +372,7 @@
371372
</fileInfo>
372373
<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.619973679.2053448379.347467300" name="avx512.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/avx512.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1345866888.1739376531">
373374
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1345866888.1739376531" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1345866888">
374-
<option id="gnu.cpp.compiler.option.other.other.281150225" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
375+
<option id="gnu.cpp.compiler.option.other.other.281150225" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -mavx512f -mavx512vl" valueType="string"/>
375376
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.878812221" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
376377
</tool>
377378
</fileInfo>

‎CHANGELOG

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

5+
=== 1.0.22 ===
6+
* Implemented Dry/Wet balance knob.
7+
* Updated build scripts and dependencies.
8+
59
=== 1.0.21 ===
610
* Added MIDI codes display for velocity.
711
* Updated build scripts and dependencies.

‎dependencies.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ DEFAULT_FEATURES = clap doc ladspa lv2 vst2 vst3 xdg
4444
LINUX_DEPENDENCIES = \
4545
LIBPTHREAD \
4646
LIBDL \
47+
LIBRT \
4748
LIBSNDFILE \
4849
LIBCAIRO \
4950
LIBFREETYPE \
@@ -66,6 +67,7 @@ endif
6667
BSD_DEPENDENCIES = \
6768
LIBPTHREAD \
6869
LIBDL \
70+
LIBRT \
6971
LIBSNDFILE \
7072
LIBICONV \
7173
LIBCAIRO \

‎include/private/plugins/sampler.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
* (C) 2023 Vladimir Sadovnikov <[email protected]>
2+
* Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
* (C) 2024 Vladimir Sadovnikov <[email protected]>
44
*
55
* This file is part of lsp-plugins-sampler
66
* Created on: 11 июл. 2021 г.
@@ -121,6 +121,7 @@ namespace lsp
121121
plug::IPort *pFadeout; // Note-off fadeout
122122
plug::IPort *pDry; // Dry amount port
123123
plug::IPort *pWet; // Wet amount port
124+
plug::IPort *pDryWet; // Dry/Wet balance
124125
plug::IPort *pGain; // Output gain port
125126
plug::IPort *pDOGain; // Direct output gain flag
126127
plug::IPort *pDOPan; // Direct output panning flag
@@ -138,8 +139,13 @@ namespace lsp
138139

139140
public:
140141
explicit sampler(const meta::plugin_t *metadata, size_t samplers, size_t channels, bool dry_ports);
142+
sampler(const sampler &) = delete;
143+
sampler(sampler &&) = delete;
141144
virtual ~sampler() override;
142145

146+
sampler & operator = (const sampler &) = delete;
147+
sampler & operator = (sampler &&) = delete;
148+
143149
public:
144150
virtual void init(plug::IWrapper *wrapper, plug::IPort **ports) override;
145151
virtual void destroy() override;

‎include/private/plugins/sampler_kernel.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (C) 2021 Linux Studio Plugins Project <https://lsp-plug.in/>
3-
* (C) 2021 Vladimir Sadovnikov <[email protected]>
2+
* Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
3+
* (C) 2024 Vladimir Sadovnikov <[email protected]>
44
*
55
* This file is part of lsp-plugins-sampler
66
* Created on: 12 июл. 2021 г.
@@ -280,8 +280,13 @@ namespace lsp
280280

281281
public:
282282
explicit sampler_kernel();
283+
sampler_kernel(const sampler_kernel &) = delete;
284+
sampler_kernel(sampler_kernel &&) = delete;
283285
virtual ~sampler_kernel();
284286

287+
sampler_kernel & operator = (const sampler_kernel &) = delete;
288+
sampler_kernel & operator = (sampler_kernel &&) = delete;
289+
285290
public:
286291
void trigger_on(size_t timestamp, float level);
287292
void trigger_off(size_t timestamp, bool handle);
@@ -292,8 +297,8 @@ namespace lsp
292297

293298
public:
294299
bool init(ipc::IExecutor *executor, size_t files, size_t channels);
295-
size_t bind(plug::IPort **ports, size_t port_id, bool dynamics);
296-
void bind_activity(plug::IPort *activity);
300+
void bind(plug::IPort **ports, size_t & port_id, bool dynamics);
301+
void bind_activity(plug::IPort **ports, size_t & port_id);
297302
void destroy();
298303

299304
void update_settings();

‎make/tools.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ ifeq ($(PLATFORM),Solaris)
7676
else ifeq ($(PLATFORM),Windows)
7777
FLAG_RELRO =
7878
FLAG_STDLIB =
79+
CFLAGS_EXT += -DWINVER=0x600 -D_WIN32_WINNT=0x600
80+
CXXFLAGS_EXT += -DWINVER=0x600 -D_WIN32_WINNT=0x600
7981
EXE_FLAGS_EXT += -static-libgcc -static-libstdc++
8082
SO_FLAGS_EXT += -static-libgcc -static-libstdc++
8183
LDFLAGS_EXT += -T $(CURDIR)/make/ld-windows.script

‎modules.mk

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,93 +19,93 @@
1919
#
2020

2121
# Variables that describe dependencies
22-
LSP_3RD_PARTY_VERSION := 1.0.15
22+
LSP_3RD_PARTY_VERSION := 1.0.16
2323
LSP_3RD_PARTY_NAME := lsp-3rd-party
2424
LSP_3RD_PARTY_TYPE := hdr
2525
LSP_3RD_PARTY_INC_OPT := -idirafter
2626
LSP_3RD_PARTY_URL_RO := https://github.com/lsp-plugins/$(LSP_3RD_PARTY_NAME).git
2727
LSP_3RD_PARTY_URL_RW := [email protected]:lsp-plugins/$(LSP_3RD_PARTY_NAME).git
2828

29-
LSP_COMMON_LIB_VERSION := 1.0.34
29+
LSP_COMMON_LIB_VERSION := 1.0.36
3030
LSP_COMMON_LIB_NAME := lsp-common-lib
3131
LSP_COMMON_LIB_TYPE := src
3232
LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
3333
LSP_COMMON_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
3434

35-
LSP_DSP_LIB_VERSION := 1.0.21
35+
LSP_DSP_LIB_VERSION := 1.0.23
3636
LSP_DSP_LIB_NAME := lsp-dsp-lib
3737
LSP_DSP_LIB_TYPE := src
3838
LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git
3939
LSP_DSP_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_DSP_LIB_NAME).git
4040

41-
LSP_DSP_UNITS_VERSION := 1.0.20
41+
LSP_DSP_UNITS_VERSION := 1.0.22
4242
LSP_DSP_UNITS_NAME := lsp-dsp-units
4343
LSP_DSP_UNITS_TYPE := src
4444
LSP_DSP_UNITS_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_UNITS_NAME).git
4545
LSP_DSP_UNITS_URL_RW := [email protected]:lsp-plugins/$(LSP_DSP_UNITS_NAME).git
4646

47-
LSP_LLTL_LIB_VERSION := 1.0.17
47+
LSP_LLTL_LIB_VERSION := 1.0.19
4848
LSP_LLTL_LIB_NAME := lsp-lltl-lib
4949
LSP_LLTL_LIB_TYPE := src
5050
LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git
5151
LSP_LLTL_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_LLTL_LIB_NAME).git
5252

53-
LSP_R3D_BASE_LIB_VERSION := 1.0.17
53+
LSP_R3D_BASE_LIB_VERSION := 1.0.18
5454
LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib
5555
LSP_R3D_BASE_LIB_TYPE := src
5656
LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
5757
LSP_R3D_BASE_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
5858

59-
LSP_R3D_IFACE_VERSION := 1.0.17
59+
LSP_R3D_IFACE_VERSION := 1.0.18
6060
LSP_R3D_IFACE_NAME := lsp-r3d-iface
6161
LSP_R3D_IFACE_TYPE := src
6262
LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git
6363
LSP_R3D_IFACE_URL_RW := [email protected]:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
6464

65-
LSP_R3D_GLX_LIB_VERSION := 1.0.17
65+
LSP_R3D_GLX_LIB_VERSION := 1.0.18
6666
LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib
6767
LSP_R3D_GLX_LIB_TYPE := bin
6868
LSP_R3D_GLX_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
6969
LSP_R3D_GLX_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
7070

71-
LSP_R3D_WGL_LIB_VERSION := 1.0.12
71+
LSP_R3D_WGL_LIB_VERSION := 1.0.13
7272
LSP_R3D_WGL_LIB_NAME := lsp-r3d-wgl-lib
7373
LSP_R3D_WGL_LIB_TYPE := bin
7474
LSP_R3D_WGL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
7575
LSP_R3D_WGL_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
7676

77-
LSP_RUNTIME_LIB_VERSION := 1.0.20
77+
LSP_RUNTIME_LIB_VERSION := 1.0.22
7878
LSP_RUNTIME_LIB_NAME := lsp-runtime-lib
7979
LSP_RUNTIME_LIB_TYPE := src
8080
LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
8181
LSP_RUNTIME_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
8282

83-
LSP_TEST_FW_VERSION := 1.0.24
83+
LSP_TEST_FW_VERSION := 1.0.25
8484
LSP_TEST_FW_NAME := lsp-test-fw
8585
LSP_TEST_FW_TYPE := src
8686
LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
8787
LSP_TEST_FW_URL_RW := [email protected]:lsp-plugins/$(LSP_TEST_FW_NAME).git
8888

89-
LSP_TK_LIB_VERSION := 1.0.20
89+
LSP_TK_LIB_VERSION := 1.0.21
9090
LSP_TK_LIB_NAME := lsp-tk-lib
9191
LSP_TK_LIB_TYPE := src
9292
LSP_TK_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_TK_LIB_NAME).git
9393
LSP_TK_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_TK_LIB_NAME).git
9494

95-
LSP_WS_LIB_VERSION := 1.0.20
95+
LSP_WS_LIB_VERSION := 1.0.21
9696
LSP_WS_LIB_NAME := lsp-ws-lib
9797
LSP_WS_LIB_TYPE := src
9898
LSP_WS_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git
9999
LSP_WS_LIB_URL_RW := [email protected]:lsp-plugins/$(LSP_WS_LIB_NAME).git
100100

101101
# Plugin-related module dependencies
102-
LSP_PLUGIN_FW_VERSION := 1.0.22
102+
LSP_PLUGIN_FW_VERSION := 1.0.23
103103
LSP_PLUGIN_FW_NAME := lsp-plugin-fw
104104
LSP_PLUGIN_FW_TYPE := src
105105
LSP_PLUGIN_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGIN_FW_NAME).git
106106
LSP_PLUGIN_FW_URL_RW := [email protected]:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git
107107

108-
LSP_PLUGINS_SHARED_VERSION := 1.0.21
108+
LSP_PLUGINS_SHARED_VERSION := 1.0.22
109109
LSP_PLUGINS_SHARED_NAME := lsp-plugins-shared
110110
LSP_PLUGINS_SHARED_TYPE := src
111111
LSP_PLUGINS_SHARED_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git
@@ -154,15 +154,15 @@ LIBICONV_NAME := libiconv
154154
LIBICONV_TYPE := opt
155155
LIBICONV_LDFLAGS := -liconv
156156

157+
LIBJACK_VERSION := system
158+
LIBJACK_NAME := jack
159+
LIBJACK_TYPE := pkg
160+
157161
LIBMPR_VERSION := system
158162
LIBMPR_NAME := libmpr
159163
LIBMPR_TYPE := opt
160164
LIBMPR_LDFLAGS := -lmpr
161165

162-
LIBJACK_VERSION := system
163-
LIBJACK_NAME := jack
164-
LIBJACK_TYPE := pkg
165-
166166
LIBMSACM_VERSION := system
167167
LIBMSACM_NAME := libmsacm
168168
LIBMSACM_TYPE := opt
@@ -183,6 +183,11 @@ LIBPTHREAD_NAME := libpthread
183183
LIBPTHREAD_TYPE := opt
184184
LIBPTHREAD_LDFLAGS := -lpthread
185185

186+
LIBRT_VERSION := system
187+
LIBRT_NAME := librt
188+
LIBRT_TYPE := opt
189+
LIBRT_LDFLAGS := -lrt
190+
186191
LIBSNDFILE_VERSION := system
187192
LIBSNDFILE_NAME := sndfile
188193
LIBSNDFILE_TYPE := pkg

‎project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug
2525
ARTIFACT_DESC = LSP Sampler Plugin Series
2626
ARTIFACT_HEADERS = lsp-plug.in
2727
ARTIFACT_EXPORT_HEADERS = 0
28-
ARTIFACT_VERSION = 1.0.21
28+
ARTIFACT_VERSION = 1.0.22
2929

3030

3131

‎res/doc/screenshots/multisampler_x12.png

3.1 KB
Loading

‎res/doc/screenshots/multisampler_x12_do.png

3.06 KB
Loading

‎res/doc/screenshots/multisampler_x24.png

3.13 KB
Loading

‎res/doc/screenshots/multisampler_x24_do.png

814 Bytes
Loading

‎res/doc/screenshots/multisampler_x48.png

3 KB
Loading

‎res/doc/screenshots/multisampler_x48_do.png

823 Bytes
Loading

‎res/doc/screenshots/sampler_mono.png

2.75 KB
Loading

‎res/doc/screenshots/sampler_stereo.png

2.65 KB
Loading

‎res/main/ui/sampling/multiple.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,18 +351,21 @@
351351
<cell rows="3">
352352
<vsep/>
353353
</cell>
354-
<grid rows="3" cols="3" bg.color="bg_schema" padding="6">
354+
<grid rows="3" cols="4" bg.color="bg_schema" padding="6">
355355

356356
<label text="labels.signal.dry" pad.b="6"/>
357357
<label text="labels.signal.wet" pad.b="6"/>
358+
<label text="labels.signal.drywet" pad.b="6"/>
358359
<label text="labels.output" pad.b="6"/>
359360

360361
<knob id="dry" pad.b="6" scolor="dry"/>
361362
<knob id="wet" pad.b="6" scolor="wet"/>
363+
<knob id="drywet" pad.b="6" scolor="drywet"/>
362364
<knob id="g_out" pad.b="6"/>
363365

364366
<value id="dry" width.min="54" sline="true"/>
365367
<value id="wet" width.min="54" sline="true"/>
368+
<value id="drywet" width.min="54" sline="true"/>
366369
<value id="g_out" width.min="54" sline="true"/>
367370
</grid>
368371
</grid>

‎res/main/ui/sampling/single/mono.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,18 +316,21 @@
316316
<cell rows="3">
317317
<vsep/>
318318
</cell>
319-
<grid rows="3" cols="3" bg.color="bg_schema" padding="6">
319+
<grid rows="3" cols="4" bg.color="bg_schema" padding="6">
320320

321321
<label text="labels.signal.dry" pad.b="6"/>
322322
<label text="labels.signal.wet" pad.b="6"/>
323+
<label text="labels.signal.drywet" pad.b="6"/>
323324
<label text="labels.output" pad.b="6"/>
324325

325326
<knob id="dry" pad.b="6" scolor="dry"/>
326327
<knob id="wet" pad.b="6" scolor="wet"/>
328+
<knob id="drywet" pad.b="6" scolor="drywet"/>
327329
<knob id="g_out" pad.b="6"/>
328330

329331
<value id="dry" width.min="54" sline="true"/>
330332
<value id="wet" width.min="54" sline="true"/>
333+
<value id="drywet" width.min="54" sline="true"/>
331334
<value id="g_out" width.min="54" sline="true"/>
332335
</grid>
333336
</grid>

‎res/main/ui/sampling/single/stereo.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,18 +317,21 @@
317317
<cell rows="3">
318318
<vsep/>
319319
</cell>
320-
<grid rows="3" cols="3" bg.color="bg_schema" padding="6">
320+
<grid rows="3" cols="4" bg.color="bg_schema" padding="6">
321321

322322
<label text="labels.signal.dry" pad.b="6"/>
323323
<label text="labels.signal.wet" pad.b="6"/>
324+
<label text="labels.signal.drywet" pad.b="6"/>
324325
<label text="labels.output" pad.b="6"/>
325326

326327
<knob id="dry" pad.b="6" scolor="dry"/>
327328
<knob id="wet" pad.b="6" scolor="wet"/>
329+
<knob id="drywet" pad.b="6" scolor="drywet"/>
328330
<knob id="g_out" pad.b="6"/>
329331

330332
<value id="dry" width.min="54" sline="true"/>
331333
<value id="wet" width.min="54" sline="true"/>
334+
<value id="drywet" width.min="54" sline="true"/>
332335
<value id="g_out" width.min="54" sline="true"/>
333336
</grid>
334337
</grid>

‎src/doc/manuals/plugins/multisampler.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208
The sample fade-out time can be controlled by the corresponding knob.</li>
209209
<li><b>Dry amount</b> - the gain of the input signal passed to the audio inputs of the plugin.</li>
210210
<li><b>Wet amount</b> - the gain of the processed signal.</li>
211+
<li><b>Dry/Wet</b> - the balance between unprocessed (Dry) signal and mixed signal (see Dry and Wet controls).</li>
211212
<li><b>Output gain</b> - the overall output gain of the plugin.</li>
212213
<li><b>Mute</b> - the button that forces any sample playback to turn off.</li>
213214
</ul>

‎src/doc/manuals/plugins/sampler.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,6 @@
107107
<li><b>Time drifting</b> - allows to randomize the time delay between the MIDI Note On event and the start of the sample's playback.</li>
108108
<li><b>Dry amount</b> - the gain of the input signal passed to the audio inputs of the plugin.</li>
109109
<li><b>Wet amount</b> - the gain of the processed signal.</li>
110+
<li><b>Dry/Wet</b> - the balance between unprocessed (Dry) signal and mixed signal (see Dry and Wet controls).</li>
110111
<li><b>Output gain</b> - the overall output gain of the plugin.</li>
111112
</ul>

‎src/main/meta/sampler.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#define LSP_PLUGINS_SAMPLER_VERSION_MAJOR 1
2828
#define LSP_PLUGINS_SAMPLER_VERSION_MINOR 0
29-
#define LSP_PLUGINS_SAMPLER_VERSION_MICRO 21
29+
#define LSP_PLUGINS_SAMPLER_VERSION_MICRO 22
3030

3131
#define LSP_PLUGINS_SAMPLER_VERSION \
3232
LSP_MODULE_VERSION( \
@@ -220,6 +220,7 @@ namespace lsp
220220
CONTROL("fout", "Note-off fadeout", U_MSEC, sampler_metadata::FADEOUT), \
221221
DRY_GAIN(1.0f), \
222222
WET_GAIN(1.0f), \
223+
DRYWET(100.0f), \
223224
OUT_GAIN, \
224225
COMBO("sets", "Sample Editor Tab Selection", 0, sampler_sample_editor_tabs)
225226

0 commit comments

Comments
 (0)