This commit is contained in:
Mike Oliphant
2023-04-03 15:10:48 -07:00
5 changed files with 115 additions and 6 deletions
+1
View File
@@ -1,5 +1,6 @@
@prefix lv2: <http://lv2plug.in/ns/lv2core#>.
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
@prefix state: <http://lv2plug.in/ns/ext/state#> .
<@NAM_LV2_ID@>
a lv2:Plugin;
+5 -2
View File
@@ -31,7 +31,7 @@
lv2:requiredFeature urid:map, work:schedule;
lv2:optionalFeature lv2:hardRTCapable;
lv2:extensionData work:interface;
lv2:extensionData work:interface, state:interface;
rdfs:comment "An LV2 implementation of Neural Amp Modeler";
@@ -88,4 +88,7 @@
lv2:minimum -20.0;
lv2:maximum 20.0;
units:unit units:db;
].
];
state:state [
<@NAM_LV2_ID@#model> <click.wav> ;
].
+6
View File
@@ -63,8 +63,14 @@ static void cleanup(LV2_Handle instance)
static const void* extension_data(const char* uri)
{
static const LV2_State_Interface state = {NAM::Plugin::save, NAM::Plugin::restore};
static const LV2_Worker_Interface worker = { NAM::Plugin::work, NAM::Plugin::work_response, NULL };
if (!strcmp(uri, LV2_STATE__interface)) {
return &state;
}
if (!strcmp(uri, LV2_WORKER__interface))
return &worker;
+89 -3
View File
@@ -17,12 +17,12 @@ namespace NAM {
for (size_t i = 0; features[i]; ++i) {
if (std::string(features[i]->URI) == std::string(LV2_URID__map))
map = static_cast<LV2_URID_Map*>(features[i]->data);
else if (!strcmp(features[i]->URI, LV2_WORKER__schedule))
schedule = (LV2_Worker_Schedule*)features[i]->data;
else if (std::string(features[i]->URI) == std::string(LV2_WORKER__schedule))
schedule = static_cast<LV2_Worker_Schedule*>(features[i]->data);
else if (std::string(features[i]->URI) == std::string(LV2_LOG__log))
logger.log = static_cast<LV2_Log_Log*>(features[i]->data);
}
lv2_log_logger_set_map(&logger, map);
if (!map)
@@ -47,6 +47,7 @@ namespace NAM {
uris.atom_Path = map->map(map->handle, LV2_ATOM__Path);
uris.atom_URID = map->map(map->handle, LV2_ATOM__URID);
uris.patch_Set = map->map(map->handle, LV2_PATCH__Set);
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);
@@ -58,6 +59,8 @@ 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:
@@ -73,7 +76,9 @@ 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;
LV2WorkType response = kWorkTypeSwitch;
@@ -101,9 +106,12 @@ namespace NAM {
auto nam = static_cast<NAM::Plugin*>(instance);
std::swap(nam->currentModel, nam->stagedModel);
nam->currentModelPath = nam->stagedModelPath;
nam->deleteModel = std::move(nam->stagedModel);
nam->write_set_patch(nam->currentModelPath);
return LV2_WORKER_SUCCESS;
}
catch (std::exception& e)
@@ -126,6 +134,10 @@ namespace NAM {
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)
{
@@ -134,6 +146,7 @@ namespace NAM {
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)
@@ -182,4 +195,77 @@ namespace NAM {
ports.audio_out[i] = (float)(dblData[i] * outputLevel);
}
}
LV2_State_Status Plugin::save(LV2_Handle instance, LV2_State_Store_Function store, LV2_State_Handle handle,
uint32_t flags, const LV2_Feature* const* features)
{
auto nam = static_cast<NAM::Plugin*>(instance);
lv2_log_trace(&nam->logger, "Saving state\n");
if (!nam->currentModel) {
return LV2_STATE_SUCCESS;
}
LV2_State_Map_Path* map_path = (LV2_State_Map_Path*)lv2_features_data(features, LV2_STATE__mapPath);
// Map absolute sample path to an abstract state path
char* apath = map_path->abstract_path(map_path->handle, nam->currentModelPath.c_str());
store(handle, nam->uris.model_Path, apath, strlen(apath) + 1, nam->uris.atom_Path,
LV2_STATE_IS_POD | LV2_STATE_IS_PORTABLE);
return LV2_STATE_SUCCESS;
}
LV2_State_Status Plugin::restore(LV2_Handle instance, LV2_State_Retrieve_Function retrieve, LV2_State_Handle handle,
uint32_t flags, const LV2_Feature* const* features)
{
auto nam = static_cast<NAM::Plugin*>(instance);
// Get model_Path from state
size_t size = 0;
uint32_t type = 0;
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);
if (!value) {
lv2_log_error(&nam->logger, "Missing model_Path\n");
return LV2_STATE_ERR_NO_PROPERTY;
}
if (type != nam->uris.atom_Path) {
lv2_log_error(&nam->logger, "Non-path model_Path\n");
return LV2_STATE_ERR_BAD_TYPE;
}
LV2_State_Map_Path* map_path = (LV2_State_Map_Path*)lv2_features_data(features, LV2_STATE__mapPath);
// Map abstract state path to absolute path
char* path = map_path->absolute_path(map_path->handle, (const char *)value);
// Schedule model to be loaded by the provided worker
NAM::LV2LoadModelMsg msg = { NAM::kWorkTypeLoad, {} };
memcpy(msg.path, path, size);
nam->schedule->schedule_work(nam->schedule->handle, sizeof(msg), &msg);
return LV2_STATE_SUCCESS;
}
LV2_Atom_Forge_Ref 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);
lv2_atom_forge_urid(&atom_forge, uris.model_Path);
lv2_atom_forge_key(&atom_forge, uris.patch_value);
lv2_atom_forge_path(&atom_forge, filename.c_str(), filename.length());
lv2_atom_forge_pop(&atom_forge, &frame);
return set;
}
}
+14 -1
View File
@@ -8,6 +8,7 @@
// LV2
#include <lv2/core/lv2.h>
#include <lv2/core/lv2_util.h>
#include <lv2/atom/atom.h>
#include <lv2/log/log.h>
#include <lv2/log/logger.h>
@@ -15,6 +16,7 @@
#include <lv2/atom/forge.h>
#include <lv2/patch/patch.h>
#include <lv2/worker/worker.h>
#include <lv2/state/state.h>
#include "dsp.h"
@@ -54,6 +56,9 @@ namespace NAM {
std::unique_ptr<::DSP> stagedModel;
std::unique_ptr<::DSP> deleteModel;
std::string currentModelPath;
std::string stagedModelPath;
std::unordered_map<std::string, double> mNAMParams = {};
Plugin();
@@ -61,12 +66,18 @@ 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);
static LV2_Worker_Status work(LV2_Handle instance, LV2_Worker_Respond_Function respond, LV2_Worker_Respond_Handle handle,
uint32_t size, const void* data);
static LV2_Worker_Status work_response(LV2_Handle instance, uint32_t size, const void* data);
static LV2_State_Status save(LV2_Handle instance, LV2_State_Store_Function store, LV2_State_Handle handle, uint32_t flags,
const LV2_Feature* const* features);
static LV2_State_Status restore(LV2_Handle instance, LV2_State_Retrieve_Function retrieve, LV2_State_Handle handle, uint32_t flags,
const LV2_Feature* const* features);
private:
struct URIs {
LV2_URID atom_Object;
@@ -75,12 +86,14 @@ namespace NAM {
LV2_URID atom_Path;
LV2_URID atom_URID;
LV2_URID patch_Set;
LV2_URID patch_Get;
LV2_URID patch_property;
LV2_URID patch_value;
LV2_URID model_Path;
};
URIs uris = {};
LV2_Atom_Forge atom_forge = {};
std::vector<double> dblData;