Merge pull request #196 from electro-smith/LGPL

LGPL Library Split

Author: beserge

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "DaisySP-LGPL"]
+	path = DaisySP-LGPL
+	url = https://www.github.com/Electro-smith/DaisySP-LGPL

CMakeLists.txt

@@ -5,50 +5,34 @@ project(DAISYSP VERSION 0.0.1)
 add_library(DaisySP STATIC 
 Source/Control/adenv.cpp
 Source/Control/adsr.cpp
-Source/Control/line.cpp
 Source/Control/phasor.cpp
 Source/Drums/analogbassdrum.cpp
 Source/Drums/analogsnaredrum.cpp
 Source/Drums/hihat.cpp
 Source/Drums/synthbassdrum.cpp
 Source/Drums/synthsnaredrum.cpp
-Source/Dynamics/balance.cpp
-Source/Dynamics/compressor.cpp
 Source/Dynamics/crossfade.cpp
 Source/Dynamics/limiter.cpp
 Source/Effects/autowah.cpp
-Source/Effects/bitcrush.cpp
 Source/Effects/chorus.cpp
 Source/Effects/decimator.cpp
 Source/Effects/flanger.cpp
-Source/Effects/fold.cpp
 Source/Effects/overdrive.cpp
-Source/Effects/reverbsc.cpp
 Source/Effects/phaser.cpp
 Source/Effects/sampleratereducer.cpp
 Source/Effects/tremolo.cpp
 Source/Effects/wavefolder.cpp
-Source/Filters/allpass.cpp
-Source/Filters/atone.cpp
-Source/Filters/biquad.cpp
-Source/Filters/comb.cpp
-Source/Filters/mode.cpp
-Source/Filters/moogladder.cpp
-Source/Filters/nlfilt.cpp
 Source/Filters/svf.cpp
-Source/Filters/tone.cpp
 Source/Filters/soap.cpp
 Source/Noise/clockednoise.cpp
 Source/Noise/grainlet.cpp
 Source/Noise/particle.cpp
 Source/PhysicalModeling/drip.cpp
 Source/PhysicalModeling/modalvoice.cpp
-Source/PhysicalModeling/pluck.cpp
 Source/PhysicalModeling/resonator.cpp
 Source/PhysicalModeling/KarplusString.cpp
 Source/PhysicalModeling/stringvoice.cpp
 Source/Sampling/granularplayer.cpp
-Source/Synthesis/blosc.cpp
 Source/Synthesis/fm2.cpp
 Source/Synthesis/formantosc.cpp
 Source/Synthesis/oscillator.cpp
@@ -58,9 +42,7 @@ Source/Synthesis/variableshapeosc.cpp
 Source/Synthesis/vosim.cpp
 Source/Synthesis/zoscillator.cpp
 Source/Utility/dcblock.cpp
-Source/Utility/jitter.cpp
 Source/Utility/metro.cpp
-Source/Utility/port.cpp
 )
 
 

DaisySP-LGPL

@@ -1,6 +1,6 @@
-MIT License
+DaisySP, copyright (c) 2020 Electrosmith, Corp. 
 
-Copyright (c) 2020 Electrosmith, Corp. 
+Published under the MIT license:
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,51 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+Plaits, copyright 2016 Emilie Gillet ([email protected])
+
+Published under the MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+Soundpipe, copyright 2015 Paul Batchelor
+
+Published under the MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

LICENSE

@@ -10,102 +10,71 @@ CONTROL_MOD_DIR = Control
 CONTROL_MODULES = \
 adenv \
 adsr \
-line \
-phasor
+phasor \
 
 DRUM_MOD_DIR = Drums
 DRUM_MODULES = \
 analogbassdrum \
 analogsnaredrum \
 hihat \
 synthbassdrum \
-synthsnaredrum
+synthsnaredrum \
 
 DYNAMICS_MOD_DIR = Dynamics
 DYNAMICS_MODULES = \
-balance \
-compressor \
 crossfade \
-limiter 
+limiter \
 
 EFFECTS_MOD_DIR = Effects
 EFFECTS_MODULES = \
 autowah \
-bitcrush \
 chorus \
 decimator \
 flanger \
-fold \
 overdrive \
 phaser \
-reverbsc \
 sampleratereducer \
 tremolo \
-wavefolder
-#pitchshifter 
+wavefolder \
 
 FILTER_MOD_DIR = Filters
 FILTER_MODULES = \
-allpass \
-atone \
-biquad \
-comb \
-mode \
-moogladder \
-nlfilt \
 svf \
-tone \
-soap 
-#fir
+soap \
 
 NOISE_MOD_DIR = Noise
 NOISE_MODULES = \
 clockednoise \
 grainlet \
-particle 
-#dust 
-#fractal_noise 
-#whitenoise
+particle \
 
 PHYSICAL_MODELING_MOD_DIR = PhysicalModeling
 PHYSICAL_MODELING_MODULES = \
 drip \
-modalvoice \
-pluck \
 KarplusString \
+modalvoice \
 resonator \
-stringvoice 
-#PolyPluck 
+stringvoice \
 
 SAMPLING_MOD_DIR = Sampling
 SAMPLING_MODULES = \
-granularplayer \
+granularplayer
 
 SYNTHESIS_MOD_DIR = Synthesis
 SYNTHESIS_MODULES = \
-blosc \
 fm2 \
 formantosc \
 oscillator \
 oscillatorbank \
 variablesawosc \
 variableshapeosc \
 vosim \
-zoscillator 
-#harmonic_osc 
+zoscillator \
 
 UTILITY_MOD_DIR = Utility
 UTILITY_MODULES = \
 dcblock \
-jitter \
 metro \
-port 
-#delayline 
-#dsp 
-#looper
-#maytrig 
-#samplehold 
-#smooth_random
 
 ######################################
 # source
@@ -137,6 +106,7 @@ OPT = -O3
 
 # Build path
 BUILD_DIR = build
+DAISYSP_LGPL_DIR = DaisySP-LGPL
 
 #######################################
 # binaries
@@ -201,7 +171,6 @@ C_INCLUDES = \
 -I$(MODULE_DIR)/$(FILTER_MOD_DIR) \
 -I$(MODULE_DIR)/$(NOISE_MOD_DIR) \
 -I$(MODULE_DIR)/$(PHYSICAL_MODELING_MOD_DIR) \
--I$(MODULE_DIR)/$(SAMPLING_MOD_DIR) \
 -I$(MODULE_DIR)/$(SYNTHESIS_MOD_DIR) \
 -I$(MODULE_DIR)/$(UTILITY_MOD_DIR) 
 
@@ -223,7 +192,7 @@ CPPFLAGS += \
 -finline-functions 
 
 # default action: build all
-all: $(BUILD_DIR)/$(TARGET).a 
+all: $(BUILD_DIR)/$(TARGET).a lgpl
 
 #######################################
 # build the library
@@ -251,13 +220,21 @@ $(BUILD_DIR)/$(TARGET).a: $(OBJECTS) Makefile
 	$(AR) rcs $@ $(OBJECTS)
 
 $(BUILD_DIR):
-	mkdir $@        
+	mkdir $@
+
+# build the lgpl submodule if it exists
+lgpl:
+	@if [ -f $(DAISYSP_LGPL_DIR)/Makefile ]; then\
+		make -C $(DAISYSP_LGPL_DIR); \
+		echo "Building DaisySP-LGPL";\
+	fi
 
 #######################################
 # clean up
 #######################################
 clean:
 	-rm -fR $(BUILD_DIR)
+	-rm -fR $(DAISYSP_LGPL_DIR)/build
 #######################################
 
 # dependencies

Makefile

@@ -1,3 +1,11 @@
+/*
+Copyright (c) 2020 Electrosmith, Corp
+
+Use of this source code is governed by an MIT-style
+license that can be found in the LICENSE file or at
+https://opensource.org/licenses/MIT.
+*/
+
 #pragma once
 #ifndef ADENV_H
 #define ADENV_H

Source/Control/adenv.h

@@ -1,3 +1,11 @@
+/*
+Copyright (c) 2020 Electrosmith, Corp, Paul Batchelor
+
+Use of this source code is governed by an MIT-style
+license that can be found in the LICENSE file or at
+https://opensource.org/licenses/MIT.
+*/
+
 #pragma once
 #ifndef DSY_ADSR_H
 #define DSY_ADSR_H