wirtz
/
dexed
mirror of https://github.com/dcoredump/dexed.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed problems in Makefile (thanks to falkTX!).

Browse Source 
Fixed error in Dexed.ttl.
Fixed problems in Dexed.ttl for using in MOD.
pull/1/head
root 8 years ago
parent e95b8626cd
commit 9700333fbe
6 changed files with 85 additions and 111 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      doc/mpb.txt
  2. 74
      src/.cproject
  3. 27
      src/Dexed.ttl
  4. 16
      src/Makefile
  5. 2
      src/dexed.mk
  6. 70
      src/manifest.ttl

7
doc/mpb.txt
Unescape View File

@ -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

74
src/.cproject
Unescape View File

@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?>
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.toolchain.gnu.macosx.base.1506995732">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.macosx.base.1506995732" moduleId="org.eclipse.cdt.core.settings" name="Default">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="Source" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.macosx.base.1506995732" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cdt.managedbuild.toolchain.gnu.macosx.base.1506995732.1759324444" name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base.1550804676" name="cdt.managedbuild.toolchain.gnu.macosx.base" superClass="cdt.managedbuild.toolchain.gnu.macosx.base">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.MachO64" id="cdt.managedbuild.target.gnu.platform.macosx.base.1897220802" name="Debug Platform" osList="macosx" superClass="cdt.managedbuild.target.gnu.platform.macosx.base"/>
<builder command="make" id="cdt.managedbuild.target.gnu.builder.macosx.base.1846133950" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.base">
<outputEntries>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
</outputEntries>
</builder>
<tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.base.390461216" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base"/>
<tool id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base.1848285960" name="MacOS X C++ Linker" superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base">
<inputType id="cdt.managedbuild.tool.macosx.cpp.linker.input.1931119" superClass="cdt.managedbuild.tool.macosx.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType>
</tool>
<tool id="cdt.managedbuild.tool.gnu.assembler.macosx.base.1468598664" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1005858811" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.archiver.macosx.base.68454829" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base.442048217" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
<option id="gnu.cpp.compiler.option.include.paths.1839661598" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="/Users/asb2m10/Documents/src/Dexed/JuceLibraryCode"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.200328808" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.macosx.base.612248553" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1048788680" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="Source.null.1025579941" name="Source"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/Source"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.macosx.base.1506995732;cdt.managedbuild.toolchain.gnu.macosx.base.1506995732.1759324444;cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base.442048217;cdt.managedbuild.tool.gnu.cpp.compiler.input.200328808">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.macosx.base.1506995732;cdt.managedbuild.toolchain.gnu.macosx.base.1506995732.1759324444;cdt.managedbuild.tool.gnu.c.compiler.macosx.base.612248553;cdt.managedbuild.tool.gnu.c.compiler.input.1048788680">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
</storageModule>
</cproject>

27
src/Dexed.ttl
Unescape View File

@ -12,11 +12,36 @@
@prefix pprops: <http://lv2plug.in/ns/ext/port-props#>.
@prefix pset: <http://lv2plug.in/ns/ext/presets#> .
<https://github.com/dcoredump/dexed.lv2#me>
a foaf:Person ;
foaf:name "Holger Wirtz" ;
foaf:homepage <https://github.com/dcoredump/dexed.lv2> ;
foaf:mbox <mailto:dcoredump@googlemail.com> .
<https://github.com/dcoredump/dexed.lv2>
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 <mailto:asb2m10@gmail.com> ;
] ;
doap:maintainer <https://github.com/dcoredump/dexed.lv2#me> ;
doap:license <http://usefulinc.com/doap/licenses/asl20> ;
doap:license <http://usefulinc.com/doap/licenses/gpl> ;
lv2:binary <dexed.so> ;
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" ;
];

16
src/Makefile
Unescape View File

@ -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

2
src/dexed.mk
Unescape View File

@ -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

70
src/manifest.ttl
Unescape View File

@ -9,181 +9,197 @@
<https://github.com/dcoredump/dexed.lv2>
a lv2:Plugin, doap:Project, lv2:SynthPlugin ;
doap:name "Dexed" ;
doap:description "Synth" ;
doap:shortdesc "Dexed" ;
doap:homepage <https://github.com/dcoredump/dexed/tree/native-lv2> ;
doap:maintainer [
foaf:name "dcoredump" ;
foaf:homepage <https://github.com/dcoredump/dexed/tree/native-lv2> ;
foaf:mbox <mailto:dcoredump@googlemail.com> ;
] ;
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 <mailto:asb2m10@gmail.com> ;
] ;
rdfs:seeAlso <Dexed.ttl> ;
rdfs:seeAlso <modgui.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#E.PIANO_1>
a pset:Preset ;
rdfs:label "E.PIANO_1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#BRASS____1>
<https://github.com/dcoredump/dexed.lv2/presets#SYN-LEAD_1>
a pset:Preset ;
rdfs:label "SYN-LEAD_1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#BRASS____2>
<https://github.com/dcoredump/dexed.lv2/presets#BRASS___1>
a pset:Preset ;
rdfs:label "BRASS___1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#BRASS___3>
<https://github.com/dcoredump/dexed.lv2/presets#BRASS___2>
a pset:Preset ;
rdfs:label "BRASS___2" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#STRINGS_1>
<https://github.com/dcoredump/dexed.lv2/presets#BRASS___3>
a pset:Preset ;
rdfs:label "BRASS___3" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#STRINGS_2>
a pset:Preset ;
rdfs:label "STRINGS_2" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#STRINGS_3>
a pset:Preset ;
rdfs:label "STRINGS_3" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#ORCHESTRA>
a pset:Preset ;
rdfs:label "ORCHESTRA" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#PIANO___1>
a pset:Preset ;
rdfs:label "PIANO___1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#PIANO___2>
a pset:Preset ;
rdfs:label "PIANO___2" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#PIANO___3>
a pset:Preset ;
rdfs:label "PIANO___3" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#GUITAR__1>
a pset:Preset ;
rdfs:label "GUITAR__1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#GUITAR__2>
a pset:Preset ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#SYN_LEAD_1>
a pset:Preset ;
rdfs:label "GUITAR__2" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#BASS____1>
a pset:Preset ;
rdfs:label "BASS____1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#BASS____2>
a pset:Preset ;
rdfs:label "BASS____2" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#E.ORGAN_1>
a pset:Preset ;
rdfs:label "E.ORGAN_1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#PIPES___1>
a pset:Preset ;
rdfs:label "PIPES___1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#REF_WHISL>
a pset:Preset ;
rdfs:label "REF_WHISL" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#HARPSICH_1>
a pset:Preset ;
rdfs:label "HARPSICH_1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#CLAV____1>
a pset:Preset ;
rdfs:label "CLAV____1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#VIBE____1>
a pset:Preset ;
rdfs:label "VIBE____1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#MARIMBA>
a pset:Preset ;
rdfs:label "MARIMBA" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#KOTO>
a pset:Preset ;
rdfs:label "KOTO" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#FLUTE___1>
a pset:Preset ;
rdfs:label "FLUTE___1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#ORCH_CHIME>
a pset:Preset ;
rdfs:label "ORCH_CHIME" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#TUB_BELLS>
a pset:Preset ;
rdfs:label "TUB_BELLS" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#STEEL_DRUM>
a pset:Preset ;
rdfs:label "STEEL_DRUM" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#TIMPANI>
<https://github.com/dcoredump/dexed.lv2/presets#STRING_1>
a pset:Preset ;
rdfs:label "STRING_1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#REFS_WHISL>
<https://github.com/dcoredump/dexed.lv2/presets#TIMPANI>
a pset:Preset ;
rdfs:label "TIMPANI" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#VOICE___1>
a pset:Preset ;
rdfs:label "VOICE___1" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#TRAIN>
a pset:Preset ;
rdfs:label "TRAIN" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .
<https://github.com/dcoredump/dexed.lv2/presets#TAKE_OFF>
a pset:Preset ;
rdfs:label "TAKE_OFF" ;
lv2:appliesTo <https://github.com/dcoredump/dexed.lv2> ;
rdfs:seeAlso <presets.ttl> .

Write Preview
Loading…
Cancel
Save