vanja/neural-amp-modeler-lv2
1
0
Fork 0
mirror of https://github.com/mikeoliphant/neural-amp-modeler-lv2.git synced 2026-05-06 19:50:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix notification port output.

Browse Source
This commit is contained in:
Robin Davies
2023-04-19 05:42:06 -04:00
parent dd7fa42184
commit 3aaebfb25e
4 changed files with 86 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/neural_amp_modeler.ttl.in
+7 -1
View File
@@ -33,7 +33,13 @@
lv2:optionalFeature lv2:hardRTCapable;
lv2:extensionData work:interface, state:interface;
rdfs:comment "An LV2 implementation of Neural Amp Modeler";
rdfs:comment """
An LV2 implementation of Neural Amp Modeler.
NAM accepts Neural Amp Modeler .nam files.
A large collection of .nam files is available at https://tonehunt.org/
""";
patch:writable <@NAM_LV2_ID@#model>;
src/CMakeLists.txt
+4 -2
View File
@@ -45,8 +45,10 @@ if (MSVC)
)
else()
target_compile_options(neural_amp_modeler PRIVATE
-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wunreachable-code -Weffc++ -Wno-unused-parameter
"$<$<CONFIG:DEBUG>:-Og;-ggdb;-Werror>"
-Wall
# -Wpedantic -Wextra -Wstrict-aliasing -Wunreachable-code -Weffc++ -Wno-unused-parameter
"$<$<CONFIG:DEBUG>:-Og;-ggdb>"
"$<$<CONFIG:RELWITHDEBINFO>:-Ofast>"
"$<$<CONFIG:RELEASE>:-Ofast>"
)
endif()
src/nam_plugin.cpp
+66 -39
View File
@@ -4,12 +4,14 @@
#include "nam_plugin.h"
#include "activations.h"
#include <cassert>
namespace NAM {
Plugin::Plugin()
{
// Turn on fast tanh approximation
activations::Activation::enable_fast_tanh();
currentModelPath.reserve(MAX_FILE_NAME+1); // prevent allocations on the audio thread.
}
bool Plugin::initialize(double rate, const LV2_Feature* const* features) noexcept
@@ -50,6 +52,8 @@ namespace NAM {
uris.patch_Get = map->map(map->handle, LV2_PATCH__Get);
uris.patch_property = map->map(map->handle, LV2_PATCH__property);
uris.patch_value = map->map(map->handle, LV2_PATCH__value);
uris.units_frame = map->map(map->handle, LV2_UNITS__frame);
uris.state_StateChanged = map->map(map->handle, LV2_STATE__StateChanged);
uris.model_Path = map->map(map->handle, MODEL_URI);
@@ -59,8 +63,6 @@ namespace NAM {
LV2_Worker_Status Plugin::work(LV2_Handle instance, LV2_Worker_Respond_Function respond, LV2_Worker_Respond_Handle handle,
uint32_t size, const void* data)
{
auto atom = static_cast<const LV2_Atom*>(data);
auto nam = static_cast<NAM::Plugin*>(instance);
switch (*((const uint32_t*)data))
{
case kWorkTypeLoad:
@@ -75,16 +77,22 @@ namespace NAM {
nam->deleteModel.reset();
}
lv2_log_trace(&nam->logger, "Staging model change: `%s`\n", msg->path);
nam->stagedModel = get_dsp(msg->path);
nam->stagedModelPath = msg->path;
// Enable model loudness normalization
nam->stagedModel->SetNormalize(true);
if (strlen(msg->path) == 0)
{
// avoid logging an error on an empty path.
// but do clear the model.
nam->stagedModel = nullptr;
nam->stagedModelPath = msg->path;
} else
{
lv2_log_trace(&nam->logger, "Staging model change: `%s`\n", msg->path);
nam->stagedModel = get_dsp(msg->path);
nam->stagedModelPath = msg->path;
// Enable model loudness normalization
nam->stagedModel->SetNormalize(true);
}
LV2WorkType response = kWorkTypeSwitch;
respond(handle, sizeof(response), &response);
return LV2_WORKER_SUCCESS;
@@ -111,6 +119,8 @@ namespace NAM {
std::swap(nam->currentModel, nam->stagedModel);
nam->currentModelPath = nam->stagedModelPath;
assert(nam->currentModelPath.capacity() == MAX_FILE_NAME+1);
nam->stateChanged = true;
nam->deleteModel = std::move(nam->stagedModel);
@@ -131,40 +141,41 @@ namespace NAM {
void Plugin::process(uint32_t n_samples) noexcept
{
if (ports.control)
lv2_atom_forge_set_buffer(&atom_forge,(uint8_t*)ports.notify,ports.notify->atom.size);
lv2_atom_forge_sequence_head(&atom_forge,&sequence_frame,uris.units_frame);
LV2_ATOM_SEQUENCE_FOREACH(ports.control, event)
{
LV2_ATOM_SEQUENCE_FOREACH(ports.control, event)
if (event->body.type == uris.atom_Object)
{
if (event->body.type == uris.atom_Object)
const auto obj = reinterpret_cast<LV2_Atom_Object*>(&event->body);
if (obj->body.otype == uris.patch_Get) {
lv2_atom_forge_frame_time(&atom_forge, 0);
write_set_patch(currentModelPath);
}
if (obj->body.otype == uris.patch_Set)
{
const auto obj = reinterpret_cast<LV2_Atom_Object*>(&event->body);
if (obj->body.otype == uris.patch_Get) {
lv2_atom_forge_frame_time(&atom_forge, 0);
write_set_patch(currentModelPath);
}
const LV2_Atom* property = NULL;
const LV2_Atom* file_path = NULL;
if (obj->body.otype == uris.patch_Set)
lv2_atom_object_get(obj, uris.patch_property, &property, 0);
if (property && (property->type == uris.atom_URID))
{
const LV2_Atom* property = NULL;
const LV2_Atom* file_path = NULL;
lv2_atom_object_get(obj, uris.patch_property, &property, 0);
if (property && (property->type == uris.atom_URID))
if (((const LV2_Atom_URID*)property)->body == uris.model_Path)
{
if (((const LV2_Atom_URID*)property)->body == uris.model_Path)
lv2_atom_object_get(obj, uris.patch_value, &file_path, 0);
if (file_path && (file_path->size > 0) && (file_path->size < 1024))
{
lv2_atom_object_get(obj, uris.patch_value, &file_path, 0);
LV2LoadModelMsg msg = { kWorkTypeLoad, {} };
if (file_path && (file_path->size > 0) && (file_path->size < 1024))
{
LV2LoadModelMsg msg = { kWorkTypeLoad, {} };
memcpy(msg.path, (const char*)LV2_ATOM_BODY_CONST(file_path), file_path->size);
memcpy(msg.path, (const char*)LV2_ATOM_BODY_CONST(file_path), file_path->size);
schedule->schedule_work(schedule->handle, sizeof(msg), &msg);
}
schedule->schedule_work(schedule->handle, sizeof(msg), &msg);
}
}
}
@@ -198,6 +209,13 @@ namespace NAM {
{
ports.audio_out[i] = (float)(dblData[i] * outputLevel);
}
if (stateChanged)
{
stateChanged = false;
lv2_atom_forge_frame_time(&atom_forge, 0);
write_state_changed();
}
lv2_atom_forge_pop(&atom_forge,&sequence_frame);
}
LV2_State_Status Plugin::save(LV2_Handle instance, LV2_State_Store_Function store, LV2_State_Handle handle,
@@ -253,7 +271,7 @@ namespace NAM {
uint32_t valflags = 0;
const void* value = retrieve(handle, nam->uris.model_Path, &size, &type, &valflags);
lv2_log_trace(&nam->logger, "Restoring model '%s'\n", value);
lv2_log_trace(&nam->logger, "Restoring model '%s'\n", (const char*)value);
if (!value) {
lv2_log_error(&nam->logger, "Missing model_Path\n");
@@ -312,10 +330,10 @@ namespace NAM {
return result;
}
LV2_Atom_Forge_Ref Plugin::write_set_patch( std::string filename)
void Plugin::write_set_patch( std::string filename)
{
LV2_Atom_Forge_Frame frame;
LV2_Atom_Forge_Ref set =
lv2_atom_forge_object(&atom_forge, &frame, 0, uris.patch_Set);
lv2_atom_forge_key(&atom_forge, uris.patch_property);
@@ -324,6 +342,15 @@ namespace NAM {
lv2_atom_forge_path(&atom_forge, filename.c_str(), filename.length());
lv2_atom_forge_pop(&atom_forge, &frame);
return set;
}
void Plugin::write_state_changed()
{
LV2_Atom_Forge_Frame frame;
lv2_atom_forge_object(&atom_forge, &frame, 0, uris.state_StateChanged);
/* object with no properties */
lv2_atom_forge_pop(&atom_forge, &frame);
}
}
src/nam_plugin.h
+9 -1
View File
@@ -17,6 +17,7 @@
#include <lv2/patch/patch.h>
#include <lv2/worker/worker.h>
#include <lv2/state/state.h>
#include <lv2/units/units.h>
#include "dsp.h"
@@ -55,6 +56,7 @@ namespace NAM {
std::unique_ptr<::DSP> currentModel;
std::unique_ptr<::DSP> stagedModel;
std::unique_ptr<::DSP> deleteModel;
bool stateChanged = false;
std::string currentModelPath;
std::string stagedModelPath;
@@ -67,7 +69,8 @@ namespace NAM {
bool initialize(double rate, const LV2_Feature* const* features) noexcept;
void process(uint32_t n_samples) noexcept;
LV2_Atom_Forge_Ref write_set_patch(std::string filename);
void write_set_patch(std::string filename);
void write_state_changed();
static LV2_Worker_Status work(LV2_Handle instance, LV2_Worker_Respond_Function respond, LV2_Worker_Respond_Handle handle,
uint32_t size, const void* data);
@@ -79,6 +82,8 @@ namespace NAM {
const LV2_Feature* const* features);
private:
static constexpr size_t MAX_FILE_NAME = 1024;
struct URIs {
LV2_URID atom_Object;
LV2_URID atom_Float;
@@ -89,12 +94,15 @@ namespace NAM {
LV2_URID patch_Get;
LV2_URID patch_property;
LV2_URID patch_value;
LV2_URID state_StateChanged;
LV2_URID units_frame;
LV2_URID model_Path;
};
URIs uris = {};
LV2_Atom_Forge atom_forge = {};
LV2_Atom_Forge_Frame sequence_frame;
std::vector<double> dblData;