Skip to content

Commit b5ace68

Browse files
sadko4usadko4u
committed
Release 1.0.30
* Updated build scripts and dependencies.
2 parents 5fd21aa + 34236d3 commit b5ace68

30 files changed

Lines changed: 1651 additions & 982 deletions

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,3 +221,17 @@ jobs:
221221
shell: msys2 {0}
222222
run: make VERBOSE=1
223223

224+
macos_stable:
225+
runs-on: macos-latest
226+
steps:
227+
- name: Update repositories
228+
run: brew update
229+
- name: Install dependencies
230+
run: brew install make pkgconf cairo freetype
231+
- uses: actions/checkout@v3
232+
- name: Configure project
233+
run: gmake config STRICT=1 VERBOSE=1 FEATURES='lv2 ui'
234+
- name: Fetch project dependencies
235+
run: gmake fetch
236+
- name: Build project
237+
run: gmake VERBOSE=1

‎CHANGELOG‎

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

5+
=== 1.0.30 ===
6+
* Updated build scripts and dependencies.
7+
58
=== 1.0.29 ===
69
* Updated build scripts and dependencies.
710

‎dependencies.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,13 @@ endif
117117
# MacOS dependencies
118118
MACOS_DEPENDENCIES = \
119119
LIBAUDIOTOOLBOX \
120+
LIBCAIRO \
121+
LIBCOCOA \
120122
LIBCOREFOUNDATION \
123+
LIBFONTCONFIG \
124+
LIBFREETYPE \
121125
LIBICONV \
122-
LIBJACK
126+
LIBJACK
123127

124128
MACOS_TEST_DEPENDENCIES =
125129

‎include/private/plugins/sampler.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ namespace lsp
125125
plug::IPort *pWet; // Wet amount port
126126
plug::IPort *pDryWet; // Dry/Wet balance
127127
plug::IPort *pGain; // Output gain port
128+
plug::IPort *pEditMode; // Edit mode
129+
plug::IPort *pInstSel; // Instrument selector
128130
plug::IPort *pDOGain; // Direct output gain flag
129131
plug::IPort *pDOPan; // Direct output panning flag
130132

‎include/private/plugins/sampler_kernel.h‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,11 @@ namespace lsp
140140
dspu::Sample *pOriginal; // Source sample (original, as from source file)
141141
dspu::Sample *pProcessed; // Processed sample
142142
float *vThumbs[meta::sampler_metadata::TRACKS_MAX]; // List of thumbnails
143+
float *vCutThumbs[meta::sampler_metadata::TRACKS_MAX]; // List of thumbnails with cut-off
143144

144145
uint32_t nUpdateReq; // Update request
145146
uint32_t nUpdateResp; // Update response
147+
bool bEnvEdit; // Envelope editing
146148
bool bSync; // Sync flag
147149
float fMinVelocity; // Minimum velocity
148150
float fMaxVelocity; // Maximum velocity
@@ -171,32 +173,73 @@ namespace lsp
171173
uint32_t nCompensateFadeType; // Compensate fade type
172174
float fPreDelay; // Pre-delay
173175
float fMakeup; // Makeup gain
176+
float fEnvelopeAttackTime; // Attack time
177+
float fEnvelopeHoldTime; // Hold time
178+
float fEnvelopeDecayTime; // Decay time
179+
float fEnvelopeSlopeTime; // Slope time
180+
float fEnvelopeReleaseTime; // Release time
181+
float fEnvelopeBreakLevel; // Break level
182+
float fEnvelopeSustainLevel; // Sustain level
183+
float fEnvelopeAttackCurve; // Attack curvature
184+
float fEnvelopeDecayCurve; // Decay curvature
185+
float fEnvelopeSlopeCurve; // Slope curvature
186+
float fEnvelopeReleaseCurve; // Release curvature
187+
uint32_t nEnvelopeAttackType; // Attack curve type
188+
uint32_t nEnvelopeDecayType; // Decay curve type
189+
uint32_t nEnvelopeSlopeType; // Slope curve type
190+
uint32_t nEnvelopeReleaseType; // Release curve type
174191
float fGains[meta::sampler_metadata::TRACKS_MAX]; // List of gain values
175192
float fLength; // Length of source sample in milliseconds
176193
float fActualLength; // Length of processed sample in milliseconds
177194
status_t nStatus; // Loading status
178195
bool bOn; // On flag
196+
bool bEnvelopeOn; // Envelope is enabled
197+
bool bEnvelopeHoldOn; // Enable Hold point
198+
bool bEnvelopeBreakOn; // Enable Break point
179199

180200
plug::IPort *pFile; // Audio file port
181201
plug::IPort *pPitch; // Pitch
202+
182203
plug::IPort *pStretchOn; // Stretch enabled
183204
plug::IPort *pStretch; // Stretch amount
184205
plug::IPort *pStretchStart; // Start of the stretch region
185206
plug::IPort *pStretchEnd; // End of the stretch region
186207
plug::IPort *pStretchChunk; // Stretch chunk
187208
plug::IPort *pStretchFade; // Stretch cross-fade length
188209
plug::IPort *pStretchFadeType; // Stretch cross-fade type
210+
189211
plug::IPort *pLoopOn; // Loop enabled
190212
plug::IPort *pLoopMode; // Loop mode
191213
plug::IPort *pLoopStart; // Start of the loop region
192214
plug::IPort *pLoopEnd; // End of the loop region
193215
plug::IPort *pLoopFadeType; // Loop cross-fade type
194216
plug::IPort *pLoopFade; // Loop cross-fade length
217+
195218
plug::IPort *pHeadCut; // Head cut
196219
plug::IPort *pTailCut; // Tail cut
197220
plug::IPort *pFadeIn; // Fade in length
198221
plug::IPort *pFadeOut; // Fade out length
199222
plug::IPort *pMakeup; // Makup gain
223+
224+
plug::IPort *pEnvelopeOn; // Enable envelope
225+
plug::IPort *pEnvelopeHoldOn; // Enable Hold point
226+
plug::IPort *pEnvelopeBreakOn; // Enable Break point
227+
plug::IPort *pEnvelopeAttackTime; // Attack time
228+
plug::IPort *pEnvelopeHoldTime; // Hold time
229+
plug::IPort *pEnvelopeDecayTime; // Decay time
230+
plug::IPort *pEnvelopeSlopeTime; // Slope time
231+
plug::IPort *pEnvelopeReleaseTime; // Release time
232+
plug::IPort *pEnvelopeBreakLevel; // Break level
233+
plug::IPort *pEnvelopeSustainLevel; // Sustain level
234+
plug::IPort *pEnvelopeAttackCurve; // Attack curvature
235+
plug::IPort *pEnvelopeDecayCurve; // Decay curvature
236+
plug::IPort *pEnvelopeSlopeCurve; // Slope curvature
237+
plug::IPort *pEnvelopeReleaseCurve; // Release curvature
238+
plug::IPort *pEnvelopeAttackType; // Attack curve type
239+
plug::IPort *pEnvelopeDecayType; // Decay curve type
240+
plug::IPort *pEnvelopeSlopeType; // Slope curve type
241+
plug::IPort *pEnvelopeReleaseType; // Release curve type
242+
200243
plug::IPort *pVelocity; // Velocity range top
201244
plug::IPort *pPreDelay; // Pre-delay
202245
plug::IPort *pOn; // Sample on outputflag
@@ -239,6 +282,7 @@ namespace lsp
239282
bool bBypass; // Bypass flag
240283
bool bReorder; // Reorder flag
241284
bool bHandleVelocity; // Velocity handling flag
285+
bool bEnvelopeEdit; // Envelope edit
242286
float fFadeout; // Fadeout in milliseconds
243287
float fDynamics; // Dynamics
244288
float fDrift; // Time drifting
@@ -247,6 +291,7 @@ namespace lsp
247291
plug::IPort *pDynamics; // Dynamics port
248292
plug::IPort *pHandleVelocity; // Velocity handling
249293
plug::IPort *pDrift; // Time drifting port
294+
plug::IPort *pSampleSel; // Sample selector
250295
plug::IPort *pActivity; // Activity port
251296
plug::IPort *pListen; // Listen sample preview
252297
plug::IPort *pStop; // Stop listen sample preview
@@ -303,6 +348,7 @@ namespace lsp
303348

304349
public:
305350
void set_fadeout(float length);
351+
void set_envelope_edit(bool edit);
306352

307353
public:
308354
bool init(ipc::IExecutor *executor, size_t files, size_t channels);

‎modules.mk‎

Lines changed: 20 additions & 15 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.22
22+
LSP_3RD_PARTY_VERSION := 1.0.23
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 := git@github.com:lsp-plugins/$(LSP_3RD_PARTY_NAME).git
2828

29-
LSP_COMMON_LIB_VERSION := 1.0.42
29+
LSP_COMMON_LIB_VERSION := 1.0.43
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 := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
3434

35-
LSP_DSP_LIB_VERSION := 1.0.30
35+
LSP_DSP_LIB_VERSION := 1.0.31
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 := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git
4040

41-
LSP_DSP_UNITS_VERSION := 1.0.29
41+
LSP_DSP_UNITS_VERSION := 1.0.30
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 := git@github.com:lsp-plugins/$(LSP_DSP_UNITS_NAME).git
4646

47-
LSP_LLTL_LIB_VERSION := 1.0.25
47+
LSP_LLTL_LIB_VERSION := 1.0.26
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 := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git
5252

53-
LSP_R3D_BASE_LIB_VERSION := 1.0.24
53+
LSP_R3D_BASE_LIB_VERSION := 1.0.25
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 := git@github.com:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
5858

59-
LSP_R3D_IFACE_VERSION := 1.0.24
59+
LSP_R3D_IFACE_VERSION := 1.0.25
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 := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
6464

65-
LSP_R3D_GLX_LIB_VERSION := 1.0.24
65+
LSP_R3D_GLX_LIB_VERSION := 1.0.25
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 := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
7070

71-
LSP_R3D_WGL_LIB_VERSION := 1.0.19
71+
LSP_R3D_WGL_LIB_VERSION := 1.0.20
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 := git@github.com:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
7676

77-
LSP_RUNTIME_LIB_VERSION := 1.0.28
77+
LSP_RUNTIME_LIB_VERSION := 1.0.29
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 := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
8282

83-
LSP_TEST_FW_VERSION := 1.0.31
83+
LSP_TEST_FW_VERSION := 1.0.32
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 := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git
8888

89-
LSP_TK_LIB_VERSION := 1.0.28
89+
LSP_TK_LIB_VERSION := 1.0.29
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 := git@github.com:lsp-plugins/$(LSP_TK_LIB_NAME).git
9494

95-
LSP_WS_LIB_VERSION := 1.0.28
95+
LSP_WS_LIB_VERSION := 1.0.29
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 := git@github.com:lsp-plugins/$(LSP_WS_LIB_NAME).git
100100

101101
# Plugin-related module dependencies
102-
LSP_PLUGIN_FW_VERSION := 1.0.30
102+
LSP_PLUGIN_FW_VERSION := 1.0.31
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 := git@github.com:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git
107107

108-
LSP_PLUGINS_SHARED_VERSION := 1.0.29
108+
LSP_PLUGINS_SHARED_VERSION := 1.0.30
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
@@ -117,6 +117,11 @@ LIBAUDIOTOOLBOX_NAME := libaudiotoolbox
117117
LIBAUDIOTOOLBOX_TYPE := opt
118118
LIBAUDIOTOOLBOX_LDFLAGS := -framework AudioToolbox
119119

120+
LIBCOCOA_VERSION := system
121+
LIBCOCOA_NAME := libcocoa
122+
LIBCOCOA_TYPE := opt
123+
LIBCOCOA_LDFLAGS := -framework Cocoa
124+
120125
LIBCOREFOUNDATION_VERSION := system
121126
LIBCOREFOUNDATION_NAME := libcorefoundation
122127
LIBCOREFOUNDATION_TYPE := opt

‎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.29
28+
ARTIFACT_VERSION = 1.0.30
2929

3030

3131

‎res/doc/screenshots/multisampler_x12.png‎

11.5 KB
Loading

‎res/doc/screenshots/multisampler_x12_do.png‎

11.5 KB
Loading

‎res/doc/screenshots/multisampler_x24.png‎

15.1 KB
Loading

0 commit comments

Comments
 (0)