Skip to content

Commit

Permalink
Release 1.0.19
Browse files Browse the repository at this point in the history
* Implemented Dry/Wet balance knob.
* Updated build scripts and dependencies.
  • Loading branch information
sadko4u committed May 21, 2024
2 parents c9cc32a + 55388b5 commit 4de5558
Show file tree
Hide file tree
Showing 14 changed files with 177 additions and 141 deletions.
7 changes: 4 additions & 3 deletions .cproject
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
<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"/>
<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">
<listOptionValue builtIn="false" value="pthread"/>
<listOptionValue builtIn="false" value="rt"/>
<listOptionValue builtIn="false" value="dl"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.860802800" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
Expand All @@ -124,7 +125,7 @@
</fileInfo>
<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">
<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">
<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"/>
<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"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1645353784" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
</fileInfo>
Expand Down Expand Up @@ -218,7 +219,7 @@
</fileInfo>
<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">
<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">
<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"/>
<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"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1095124970" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
</fileInfo>
Expand Down Expand Up @@ -371,7 +372,7 @@
</fileInfo>
<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">
<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">
<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"/>
<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"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.878812221" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
</fileInfo>
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
* RECENT CHANGES
*******************************************************************************

=== 1.0.19 ===
* Implemented Dry/Wet balance knob.
* Updated build scripts and dependencies.

=== 1.0.18 ===
* Updated build scripts and dependencies.

Expand Down
2 changes: 2 additions & 0 deletions dependencies.mk
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ DEFAULT_FEATURES = clap doc ladspa lv2 vst2 vst3 xdg
LINUX_DEPENDENCIES = \
LIBPTHREAD \
LIBDL \
LIBRT \
LIBSNDFILE \
LIBCAIRO \
LIBFREETYPE \
Expand All @@ -66,6 +67,7 @@ endif
BSD_DEPENDENCIES = \
LIBPTHREAD \
LIBDL \
LIBRT \
LIBSNDFILE \
LIBICONV \
LIBCAIRO \
Expand Down
12 changes: 9 additions & 3 deletions include/private/plugins/impulse_reverb.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
* (C) 2023 Vladimir Sadovnikov <[email protected]>
* Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
* (C) 2024 Vladimir Sadovnikov <[email protected]>
*
* This file is part of lsp-plugins-impulse-reverb
* Created on: 3 авг. 2021 г.
Expand Down Expand Up @@ -217,6 +217,7 @@ namespace lsp
plug::IPort *pRank;
plug::IPort *pDry;
plug::IPort *pWet;
plug::IPort *pDryWet;
plug::IPort *pOutGain;
plug::IPort *pPredelay;

Expand All @@ -228,12 +229,17 @@ namespace lsp

public:
explicit impulse_reverb(const meta::plugin_t *metadata);
impulse_reverb(const impulse_reverb &) = delete;
impulse_reverb(impulse_reverb &&) = delete;
virtual ~impulse_reverb() override;

public:
impulse_reverb & operator = (const impulse_reverb &) = delete;
impulse_reverb & operator = (impulse_reverb &&) = delete;

virtual void init(plug::IWrapper *wrapper, plug::IPort **ports) override;
virtual void destroy() override;

public:
virtual void ui_activated() override;
virtual void update_settings() override;
virtual void update_sample_rate(long sr) override;
Expand Down
2 changes: 2 additions & 0 deletions make/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ ifeq ($(PLATFORM),Solaris)
else ifeq ($(PLATFORM),Windows)
FLAG_RELRO =
FLAG_STDLIB =
CFLAGS_EXT += -DWINVER=0x600 -D_WIN32_WINNT=0x600
CXXFLAGS_EXT += -DWINVER=0x600 -D_WIN32_WINNT=0x600
EXE_FLAGS_EXT += -static-libgcc -static-libstdc++
SO_FLAGS_EXT += -static-libgcc -static-libstdc++
LDFLAGS_EXT += -T $(CURDIR)/make/ld-windows.script
Expand Down
43 changes: 24 additions & 19 deletions modules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,93 +19,93 @@
#

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

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

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

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

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

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

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

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

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

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

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

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

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

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

LSP_PLUGINS_SHARED_VERSION := 1.0.21
LSP_PLUGINS_SHARED_VERSION := 1.0.22
LSP_PLUGINS_SHARED_NAME := lsp-plugins-shared
LSP_PLUGINS_SHARED_TYPE := src
LSP_PLUGINS_SHARED_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git
Expand Down Expand Up @@ -154,15 +154,15 @@ LIBICONV_NAME := libiconv
LIBICONV_TYPE := opt
LIBICONV_LDFLAGS := -liconv

LIBJACK_VERSION := system
LIBJACK_NAME := jack
LIBJACK_TYPE := pkg

LIBMPR_VERSION := system
LIBMPR_NAME := libmpr
LIBMPR_TYPE := opt
LIBMPR_LDFLAGS := -lmpr

LIBJACK_VERSION := system
LIBJACK_NAME := jack
LIBJACK_TYPE := pkg

LIBMSACM_VERSION := system
LIBMSACM_NAME := libmsacm
LIBMSACM_TYPE := opt
Expand All @@ -183,6 +183,11 @@ LIBPTHREAD_NAME := libpthread
LIBPTHREAD_TYPE := opt
LIBPTHREAD_LDFLAGS := -lpthread

LIBRT_VERSION := system
LIBRT_NAME := librt
LIBRT_TYPE := opt
LIBRT_LDFLAGS := -lrt

LIBSNDFILE_VERSION := system
LIBSNDFILE_NAME := sndfile
LIBSNDFILE_TYPE := pkg
Expand Down
2 changes: 1 addition & 1 deletion project.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug
ARTIFACT_DESC = LSP Impulse Reverb Plugin Series
ARTIFACT_HEADERS = lsp-plug.in
ARTIFACT_EXPORT_HEADERS = 0
ARTIFACT_VERSION = 1.0.18
ARTIFACT_VERSION = 1.0.19



Binary file modified res/doc/screenshots/impulse_reverb_mono.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/doc/screenshots/impulse_reverb_stereo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 30 additions & 21 deletions res/main/ui/convolution/impulse_reverb/mono.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,53 @@

<cell rows="3">
<group text="groups.output" ipadding="0">
<grid rows="15" cols="1" expand="true" fill="true">
<ui:with pad.h="6" pad.v="4" vreduce="true">
<label text="labels.signal.dry_pan"/>
</ui:with>
<vbox expand="true" fill="true">
<ui:with pad.h="6" pad.v="4">
<knob id="p" pad.t="4" pad.b="4" scolor="mono"/>
<label text="labels.signal.dry_pan"/>
<knob id="p" scolor="mono" balance="0"/>
<value id="p" sline="true"/>
</ui:with>

<hsep bg.color="bg" pad.v="2" vreduce="true"/>

<label text="labels.predelay" pad.h="6" pad.v="4" vreduce="true"/>
<knob id="pd" pad.v="4"/>
<value id="pd" sline="true" pad.b="4"/>
<ui:with pad.h="6" pad.v="4">
<label text="labels.predelay"/>
<knob id="pd" />
<value id="pd" sline="true"/>
</ui:with>

<hsep bg.color="bg" pad.v="2" vreduce="true"/>

<label text="labels.signal.dry" pad.h="6" pad.v="4" vreduce="true"/>
<knob id="dry" scolor="dry" pad.v="4"/>
<value id="dry" sline="true" pad.b="4"/>
<ui:with pad.h="6" pad.v="4">
<label text="labels.signal.dry" />
<knob id="dry" scolor="dry" />
<value id="dry" sline="true" />
</ui:with>

<hsep bg.color="bg" pad.v="2" vreduce="true"/>

<vbox height.min="105">
<label text="labels.signal.wet" pad.h="6" pad.v="4" vreduce="true"/>
<ui:with pad.h="6" pad.v="4">
<label text="labels.signal.wet" />
<knob id="wet" scolor="wet"/>
<value id="wet" sline="true" pad.b="4"/>
</vbox>
<value id="wet" sline="true" />
</ui:with>

<hsep bg.color="bg" pad.v="2" vreduce="true"/>

<vbox height.min="105">
<label text="labels.output" pad.h="6" pad.v="4" vreduce="true"/>
<ui:with pad.h="6" pad.v="4">
<label text="labels.signal.drywet" />
<knob id="drywet" scolor="drywet"/>
<value id="drywet" sline="true" />
</ui:with>

<hsep bg.color="bg" pad.v="2" vreduce="true"/>

<ui:with pad.h="6" pad.v="4">
<label text="labels.output" />
<knob id="g_out"/>
<value id="g_out" sline="true"/>
</vbox>

</grid>
</ui:with>
</vbox>
</group>
</cell>

Expand All @@ -77,7 +86,7 @@
length=":ifl${i}"
status=":ifs${i}"
width.min="600"
height.min="128"
height.min="240"
load.preview="true"
clipboard.head_cut="ihc${i}"
clipboard.tail_cut="itc${i}"
Expand Down
Loading

0 comments on commit 4de5558

Please sign in to comment.