smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

Wouldn't it be nice if plugin presets had a description/comment?

Browse source
This commit is contained in:
Robin Gareus 2018-12-18 13:35:39 +01:00
parent 0a3fc4a87f
commit e4304f3bf2
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/plugin.h
View file

@ -190,7 +190,8 @@ class LIBARDOUR_API Plugin : public PBD::StatefulDestructible, public Latent
struct PresetRecord { struct PresetRecord {
PresetRecord () : valid (false) {} PresetRecord () : valid (false) {}
PresetRecord (const std::string& u, const std::string& l, bool s = true) : uri (u), label (l), user (s), valid (true) {} PresetRecord (const std::string& u, const std::string& l, bool s = true, const std::string& d = "")
: uri (u), label (l), description (d), user (s), valid (true) {}
bool operator!= (PresetRecord const & a) const { bool operator!= (PresetRecord const & a) const {
return uri != a.uri || label != a.label; return uri != a.uri || label != a.label;
@ -198,6 +199,7 @@ class LIBARDOUR_API Plugin : public PBD::StatefulDestructible, public Latent
std::string uri; std::string uri;
std::string label; std::string label;
std::string description;
bool user; bool user;
bool valid; bool valid;
}; };

29
libs/ardour/lv2_plugin.cc
View file

@ -1462,22 +1462,30 @@ get_value(LilvWorld* world, const LilvNode* subject, const LilvNode* predicate)
void void
LV2Plugin::find_presets() LV2Plugin::find_presets()
{ {
/* see also LV2PluginInfo::get_presets */
LilvNode* lv2_appliesTo = lilv_new_uri(_world.world, LV2_CORE__appliesTo); LilvNode* lv2_appliesTo = lilv_new_uri(_world.world, LV2_CORE__appliesTo);
LilvNode* pset_Preset = lilv_new_uri(_world.world, LV2_PRESETS__Preset); LilvNode* pset_Preset = lilv_new_uri(_world.world, LV2_PRESETS__Preset);
LilvNode* rdfs_label = lilv_new_uri(_world.world, LILV_NS_RDFS "label"); LilvNode* rdfs_label = lilv_new_uri(_world.world, LILV_NS_RDFS "label");
LilvNode* rdfs_comment = lilv_new_uri(_world.world, LILV_NS_RDFS "comment");
LilvNodes* presets = lilv_plugin_get_related(_impl->plugin, pset_Preset); LilvNodes* presets = lilv_plugin_get_related(_impl->plugin, pset_Preset);
LILV_FOREACH(nodes, i, presets) { LILV_FOREACH(nodes, i, presets) {
const LilvNode* preset = lilv_nodes_get(presets, i); const LilvNode* preset = lilv_nodes_get(presets, i);
lilv_world_load_resource(_world.world, preset); lilv_world_load_resource(_world.world, preset);
LilvNode* name = get_value(_world.world, preset, rdfs_label); LilvNode* name = get_value(_world.world, preset, rdfs_label);
bool userpreset = true; // TODO LilvNode* comment = get_value(_world.world, preset, rdfs_comment);
/* TODO properly identify user vs factory presets.
* here's an indirect condition: only factory presets can have comments
*/
bool userpreset = comment ? false : true;
if (name) { if (name) {
_presets.insert(std::make_pair(lilv_node_as_string(preset), _presets.insert(std::make_pair(lilv_node_as_string(preset),
Plugin::PresetRecord( Plugin::PresetRecord(
lilv_node_as_string(preset), lilv_node_as_string(preset),
lilv_node_as_string(name), lilv_node_as_string(name),
userpreset))); userpreset,
comment ? lilv_node_as_string (comment) : ""
)));
lilv_node_free(name); lilv_node_free(name);
} else { } else {
warning << string_compose( warning << string_compose(
@ -1485,9 +1493,13 @@ LV2Plugin::find_presets()
lilv_node_as_string(lilv_plugin_get_uri(_impl->plugin)), lilv_node_as_string(lilv_plugin_get_uri(_impl->plugin)),
lilv_node_as_string(preset)) << endmsg; lilv_node_as_string(preset)) << endmsg;
} }
if (comment) {
lilv_node_free(comment);
}
} }
lilv_nodes_free(presets); lilv_nodes_free(presets);
lilv_node_free(rdfs_comment);
lilv_node_free(rdfs_label); lilv_node_free(rdfs_label);
lilv_node_free(pset_Preset); lilv_node_free(pset_Preset);
lilv_node_free(lv2_appliesTo); lilv_node_free(lv2_appliesTo);
@ -3424,19 +3436,28 @@ LV2PluginInfo::get_presets (bool /*user_only*/) const
LilvNode* lv2_appliesTo = lilv_new_uri(_world.world, LV2_CORE__appliesTo); LilvNode* lv2_appliesTo = lilv_new_uri(_world.world, LV2_CORE__appliesTo);
LilvNode* pset_Preset = lilv_new_uri(_world.world, LV2_PRESETS__Preset); LilvNode* pset_Preset = lilv_new_uri(_world.world, LV2_PRESETS__Preset);
LilvNode* rdfs_label = lilv_new_uri(_world.world, LILV_NS_RDFS "label"); LilvNode* rdfs_label = lilv_new_uri(_world.world, LILV_NS_RDFS "label");
LilvNode* rdfs_comment = lilv_new_uri(_world.world, LILV_NS_RDFS "comment");
LilvNodes* presets = lilv_plugin_get_related(lp, pset_Preset); LilvNodes* presets = lilv_plugin_get_related(lp, pset_Preset);
LILV_FOREACH(nodes, i, presets) { LILV_FOREACH(nodes, i, presets) {
const LilvNode* preset = lilv_nodes_get(presets, i); const LilvNode* preset = lilv_nodes_get(presets, i);
lilv_world_load_resource(_world.world, preset); lilv_world_load_resource(_world.world, preset);
LilvNode* name = get_value(_world.world, preset, rdfs_label); LilvNode* name = get_value(_world.world, preset, rdfs_label);
bool userpreset = true; // TODO LilvNode* comment = get_value(_world.world, preset, rdfs_comment);
/* TODO properly identify user vs factory presets.
* here's an indirect condition: only factory presets can have comments
*/
bool userpreset = comment ? false : true;
if (name) { if (name) {
p.push_back (Plugin::PresetRecord (lilv_node_as_string(preset), lilv_node_as_string(name), userpreset)); p.push_back (Plugin::PresetRecord (lilv_node_as_string(preset), lilv_node_as_string(name), userpreset, comment ? lilv_node_as_string (comment) : ""));
lilv_node_free(name); lilv_node_free(name);
} }
if (comment) {
lilv_node_free(comment);
}
} }
lilv_nodes_free(presets); lilv_nodes_free(presets);
lilv_node_free(rdfs_comment);
lilv_node_free(rdfs_label); lilv_node_free(rdfs_label);
lilv_node_free(pset_Preset); lilv_node_free(pset_Preset);
lilv_node_free(lv2_appliesTo); lilv_node_free(lv2_appliesTo);