Last active
September 29, 2020 17:19
-
-
Save jpcima/0c02d9384bf1f4053ced442c6b49c1f0 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile b/Makefile | |
index 4de8329..ebd06bb 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -7,6 +7,10 @@ | |
include dpf/Makefile.base.mk | |
all: dgl plugins gen | |
+clean: sfizz-clean | |
+plugins: sfizz-lib | |
+ | |
+include sfizz/dpf.mk | |
# -------------------------------------------------------------- | |
diff --git a/plugins/drops/DropsPlugin.cpp b/plugins/drops/DropsPlugin.cpp | |
index f43fd61..287b6da 100644 | |
--- a/plugins/drops/DropsPlugin.cpp | |
+++ b/plugins/drops/DropsPlugin.cpp | |
@@ -33,7 +33,7 @@ DropsPlugin::DropsPlugin() : Plugin(kParameterCount, 0, 0) | |
sampleRate = getSampleRate(); | |
synth.setSampleRate(sampleRate); | |
- synth.loadSfzFile("/home/rob/git/drops/plugins/drops/res/basic.sfz"); | |
+ synth.loadSfzFile("/home/jpc/documents/projects/drops/plugins/drops/res/basic.sfz"); | |
synth.setNumVoices(16); | |
fPitchBendDepth = 0.0f; | |
fPolyphony = 0.0f; | |
@@ -184,7 +184,7 @@ void DropsPlugin::initParameter(uint32_t index, Parameter ¶meter) | |
break; | |
case kSamplePlayDirection: | |
parameter.name = "Play Direction"; | |
- parameter.symbol = "play direction"; | |
+ parameter.symbol = "play_direction"; | |
parameter.ranges.min = 0.0f; | |
parameter.ranges.max = 1.0f; | |
parameter.ranges.def = 0.0f; | |
@@ -768,4 +768,4 @@ Plugin *createPlugin() | |
// ----------------------------------------------------------------------------- | |
-END_NAMESPACE_DISTRHO | |
\ No newline at end of file | |
+END_NAMESPACE_DISTRHO | |
diff --git a/plugins/drops/Makefile b/plugins/drops/Makefile | |
index c08bf34..d086353 100644 | |
--- a/plugins/drops/Makefile | |
+++ b/plugins/drops/Makefile | |
@@ -26,8 +26,10 @@ include ../../dpf/Makefile.plugins.mk | |
# -------------------------------------------------------------- | |
# Extra flags | |
-BASE_FLAGS += $(shell pkg-config --cflags sfizz) | |
-LINK_FLAGS += $(shell pkg-config --libs sfizz) | |
+include ../../sfizz/dpf.mk | |
+BUILD_C_FLAGS += $(SFIZZ_C_FLAGS) | |
+BUILD_CXX_FLAGS += $(SFIZZ_CXX_FLAGS) | |
+LINK_FLAGS += $(SFIZZ_LINK_FLAGS) | |
# -------------------------------------------------------------- | |
# Enable all possible plugin types | |
diff --git a/sfizz b/sfizz | |
index 65580be..1212dbf 160000 | |
--- a/sfizz | |
+++ b/sfizz | |
@@ -1 +1 @@ | |
-Subproject commit 65580beadb79263da533263066dc66a2f090b643 | |
+Subproject commit 1212dbfbe9e63d729929ab39e30ba16e97135816-dirty |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment