From 9700333fbe2b1388963b32672c6966cf21fd6232 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 Jan 2017 15:09:29 +0100 Subject: [PATCH] Fixed problems in Makefile (thanks to falkTX!). Fixed error in Dexed.ttl. Fixed problems in Dexed.ttl for using in MOD. --- doc/mpb.txt | 7 +++++ src/.cproject | 74 ------------------------------------------------ src/Dexed.ttl | 27 +++++++++++++++++- src/Makefile | 16 +++++------ src/dexed.mk | 2 +- src/manifest.ttl | 70 +++++++++++++++++++++++++++------------------ 6 files changed, 85 insertions(+), 111 deletions(-) create mode 100644 doc/mpb.txt delete mode 100644 src/.cproject diff --git a/doc/mpb.txt b/doc/mpb.txt new file mode 100644 index 0000000..c644593 --- /dev/null +++ b/doc/mpb.txt @@ -0,0 +1,7 @@ +docker pull moddevices/mod-plugin-builder +docker run -ti --name mpb -p 9000:9000 -v ~/src/mod/local-mod-folder:/tmp/local-mod-folder moddevices/mod-plugin-builder +docker start -i mpb + + +Install: +curl http://web1.moddevices.com/shared/mod-loopswitch4.lv2.tar.gz | base64 | curl -F 'package=@-' http://192.168.51.1/sdk/install diff --git a/src/.cproject b/src/.cproject deleted file mode 100644 index 6499fe8..0000000 --- a/src/.cproject +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Dexed.ttl b/src/Dexed.ttl index 80c5ff9..e73da3b 100644 --- a/src/Dexed.ttl +++ b/src/Dexed.ttl @@ -12,11 +12,36 @@ @prefix pprops: . @prefix pset: . + + a foaf:Person ; + foaf:name "Holger Wirtz" ; + foaf:homepage ; + foaf:mbox . + a lv2:InstrumentPlugin, lv2:Plugin ; + doap:name "Dexed" ; + doap:description "Synth" ; + doap:shortdesc "Dexed" ; + rdfs:comment "Dexed.lv2 is a native LV2 port of the famous DX-7 emulator Dexed."; + lv2:microVersion 2 ;lv2:minorVersion 0 ; + doap:developer [ + a foaf:Person ; + foaf:name "Pascal Gauthier" ; + foaf:mbox ; + ] ; + doap:maintainer ; + doap:license ; + doap:license ; lv2:binary ; ll:pegName "p"; +rdfs:comment """ +Dexed.lv2 is a native LV2 port of the famous DX-7 emulator Dexed. It is based on the FM-synthesis and tries to emulate the original as good as possible. With external scripts you can convert original SYSEX files to use them within Dexed. + +The original engine comes from MSFA (music synthesizer for android) which is based on the Apache 2.0 license. Additional sources for Dexed were done by Pascal Gauthier (asb2m10). The port to LV2 and some smaller modification were done by Holger Wirtz and reside also under GPL license. +"""; + lv2:port [ a lv2:InputPort, atom:AtomPort ; atom:bufferType atom:Sequence ; @@ -443,7 +468,7 @@ rdfs:label "Sine" ; rdfs:comment "Sine" ; ], [ - rdf:value 6 ; + rdf:value 5 ; rdfs:label "Sample & Hold" ; rdfs:comment "Sample & Hold" ; ]; diff --git a/src/Makefile b/src/Makefile index db8ed21..536f047 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,10 +9,10 @@ INSTALL_MYPLUGINS_DIR=/zynthian/zynthian-my-plugins/lv2 OBJ=fm_core.o env.o lfo.o dx7note.o sin.o pitchenv.o fm_op_kernel.o freqlut.o exp2.o EngineMkI.o EngineOpl.o PluginFx.o trace.o -CFLAGS_LVTK=$(shell pkg-config --cflags lvtk-plugin-2) -CFLAGS=-fPIC -DPIC -std=c++11 -I. $(CFLAGS_LVTK) -DLVTK_DEBUG=false +CXXFLAGS_LVTK=$(shell pkg-config --cflags lvtk-plugin-2) +CXXFLAGS+=-fPIC -DPIC -std=c++11 -I. $(CXXFLAGS_LVTK) -DLVTK_DEBUG=false LDFLAGS_LVTK=$(shell pkg-config --libs lvtk-plugin-2) -LDFLAGS=-shared $(LDFLAGS_LVTK) +LDFLAGS+=-shared $(LDFLAGS_LVTK) machine = $(shell sh -c 'uname -m 2>/dev/null || echo unknown') # Intel-PC @@ -49,20 +49,20 @@ endif # MOD-Duo ifeq ($(MOD),1) - CPU = -O3 -mtune=cortex-a7 - PLATFORM += -mfpu=neon-vfpv4 -mfloat-abi=hard -mvectorize-with-neon-quad + CPU = + PLATFORM = endif CXXFLAGS += $(CPU) $(FPU) $(PLATFORM) ifeq ($(DEBUG), 1) ifeq ($(FILETRACE), 1) - CXXFLAGS += -DDEBUG -DFILETRACE $(CFLAGS) + CXXFLAGS += -DDEBUG -DFILETRACE else - CXXFLAGS += -DDEBUG $(CFLAGS) + CXXFLAGS += -DDEBUG endif else - CXXFLAGS += $(CFLAGS) -O3 + CXXFLAGS += -O3 endif all: $(BUNDLE) Makefile diff --git a/src/dexed.mk b/src/dexed.mk index aacc6c6..4eef30a 100644 --- a/src/dexed.mk +++ b/src/dexed.mk @@ -5,7 +5,7 @@ ###################################### DEXED_DEPENDENCIES = lvtk -DEXED_VERSION = b8182c639888872d66daf0255cc988ed37b21818 +DEXED_VERSION = e95b8626cd2a6a3175df5238ca4efb05e470e4ef DEXED_BUNDLES = dexed.lv2 DEXED_SITE = $(call github,dcoredump,dexed,$(DEXED_VERSION)) DEXED_TARGET_MAKE = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) MOD=1 diff --git a/src/manifest.ttl b/src/manifest.ttl index 46bd940..056cc80 100644 --- a/src/manifest.ttl +++ b/src/manifest.ttl @@ -9,181 +9,197 @@ a lv2:Plugin, doap:Project, lv2:SynthPlugin ; - doap:name "Dexed" ; - doap:description "Synth" ; - doap:shortdesc "Dexed" ; - doap:homepage ; - doap:maintainer [ - foaf:name "dcoredump" ; - foaf:homepage ; - foaf:mbox ; - ] ; - rdfs:comment "Dexed.lv2 is a native LV2 port of the famous DX-7 emulator Dexed."; - lv2:microVersion 1 ;lv2:minorVersion 0 ; - doap:developer [ - a foaf:Person ; - foaf:name "Pascal Gauthier" ; - foaf:mbox ; - ] ; rdfs:seeAlso ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "E.PIANO_1" ; lv2:appliesTo ; rdfs:seeAlso . - + a pset:Preset ; + rdfs:label "SYN-LEAD_1" ; lv2:appliesTo ; rdfs:seeAlso . - + a pset:Preset ; + rdfs:label "BRASS___1" ; lv2:appliesTo ; rdfs:seeAlso . - + a pset:Preset ; + rdfs:label "BRASS___2" ; lv2:appliesTo ; rdfs:seeAlso . - + a pset:Preset ; + rdfs:label "BRASS___3" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "STRINGS_2" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "STRINGS_3" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "ORCHESTRA" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "PIANO___1" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "PIANO___2" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "PIANO___3" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "GUITAR__1" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; - lv2:appliesTo ; - rdfs:seeAlso . - - - a pset:Preset ; + rdfs:label "GUITAR__2" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "BASS____1" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "BASS____2" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "E.ORGAN_1" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "PIPES___1" ; + lv2:appliesTo ; + rdfs:seeAlso . + + + a pset:Preset ; + rdfs:label "REF_WHISL" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "HARPSICH_1" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "CLAV____1" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "VIBE____1" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "MARIMBA" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "KOTO" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "FLUTE___1" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "ORCH_CHIME" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "TUB_BELLS" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "STEEL_DRUM" ; lv2:appliesTo ; rdfs:seeAlso . - + a pset:Preset ; + rdfs:label "STRING_1" ; lv2:appliesTo ; rdfs:seeAlso . - + a pset:Preset ; + rdfs:label "TIMPANI" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "VOICE___1" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "TRAIN" ; lv2:appliesTo ; rdfs:seeAlso . a pset:Preset ; + rdfs:label "TAKE_OFF" ; lv2:appliesTo ; rdfs:seeAlso .