diff --git a/resources/neural_amp_modeler.ttl.in b/resources/neural_amp_modeler.ttl.in index 700136b..d6c5d3b 100644 --- a/resources/neural_amp_modeler.ttl.in +++ b/resources/neural_amp_modeler.ttl.in @@ -1,22 +1,26 @@ @prefix atom: . @prefix doap: . -@prefix foaf: . @prefix lv2: . -@prefix props: . @prefix rdf: . @prefix rdfs: . -@prefix rsz: . @prefix ui: . @prefix units: . @prefix urid: . @prefix param: . +@prefix patch: . +@prefix state: . <@NAM_LV2_ID@> a doap:Project; doap:maintainer ; doap:name "Neural Amp Modeler". - +<@NAM_LV2_ID@#model> + a lv2:Parameter; + rdfs:label "Model"; + rdfs:range atom:Path. + +<@NAM_LV2_ID@> a lv2:Plugin, lv2:AmplifierPlugin; doap:name "Neural Amp Modeler"; lv2:project <@NAM_LV2_ID@>; @@ -29,6 +33,8 @@ rdfs:comment "An LV2 implementation of Neural Amp Modeler"; + patch:writable <@NAM_LV2_ID@#model>; + # Audio Ports lv2:port [ a lv2:InputPort, lv2:AudioPort; @@ -41,17 +47,6 @@ lv2:symbol "output"; lv2:name "Output"; ]; - - # Mixer - lv2:port [ - a lv2:InputPort, lv2:ControlPort; - lv2:designation param:wetDryRatio; - lv2:index 2; - lv2:symbol "mix"; - lv2:name "Mix"; - rdfs:comment "dry/wet ratio"; - lv2:default 100.0; - lv2:minimum 0.0; - lv2:maximum 100.0; - units:unit units:pc - ]. + state:state [ + <@NAM_LV2_ID@#model> ; + ]. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9134737..d62073c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,26 +23,14 @@ set_target_properties(neural_amp_modeler # Compile Options -option(FORCE_DISABLE_DENORMALS "Disable denormal numbers before processing" ON) -target_compile_definitions(neural_amp_modeler - PRIVATE - "$<$:NDEBUG>" - "$<$:FORCE_DISABLE_DENORMALS>" -) - -# Architecture -if ( - FORCE_DISABLE_DENORMALS - AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(i386)|(i686)|(AMD64)" -) - if (MSVC) - target_compile_options(neural_amp_modeler PRIVATE /arch:SSE2) - else() - target_compile_options(neural_amp_modeler PRIVATE -msse3) - endif() +if (MSVC) + target_compile_options(neural_amp_modeler PRIVATE /Ot ) +else() + target_compile_options(neural_amp_modeler PRIVATE -msse3) endif() + # Platform if (CMAKE_SYSTEM_NAME STREQUAL "Windows") diff --git a/src/nam_lv2.cpp b/src/nam_lv2.cpp index 5d0608f..636508b 100644 --- a/src/nam_lv2.cpp +++ b/src/nam_lv2.cpp @@ -48,12 +48,7 @@ static LV2_Handle instantiate( static void connect_port(LV2_Handle instance, uint32_t port, void* data) { auto nam = static_cast(instance); - constexpr uint32_t misc_port_cnt = sizeof(nam->ports)/sizeof(void*); - if (port >= misc_port_cnt) - { - } - else - *(reinterpret_cast(&nam->ports)+port) = data; + *(reinterpret_cast(&nam->ports)+port) = data; } static void activate(LV2_Handle) {}