summaryrefslogtreecommitdiffstats
path: root/src/libs/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/client')
-rw-r--r--src/libs/client/DeprecatedLoader.cpp54
-rw-r--r--src/libs/client/DeprecatedLoader.hpp12
-rw-r--r--src/libs/client/DirectSigClientInterface.hpp4
-rw-r--r--src/libs/client/NodeModel.cpp4
-rw-r--r--src/libs/client/OSCClientReceiver.cpp8
-rw-r--r--src/libs/client/OSCClientReceiver.hpp2
-rw-r--r--src/libs/client/OSCEngineSender.cpp8
-rw-r--r--src/libs/client/OSCEngineSender.hpp4
-rw-r--r--src/libs/client/ObjectModel.cpp28
-rw-r--r--src/libs/client/ObjectModel.hpp14
-rw-r--r--src/libs/client/PortModel.cpp6
-rw-r--r--src/libs/client/SigClientInterface.hpp6
-rw-r--r--src/libs/client/Store.cpp30
-rw-r--r--src/libs/client/Store.hpp10
-rw-r--r--src/libs/client/ThreadedSigClientInterface.hpp8
15 files changed, 99 insertions, 99 deletions
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp
index 22fe1cda..eee9485a 100644
--- a/src/libs/client/DeprecatedLoader.cpp
+++ b/src/libs/client/DeprecatedLoader.cpp
@@ -75,12 +75,12 @@ DeprecatedLoader::translate_load_path(const string& path)
}
-/** Add a piece of data to a MetadataMap, translating from deprecated unqualified keys
+/** Add a piece of data to a Variables, translating from deprecated unqualified keys
*
* Adds a namespace prefix for known keys, and ignores the rest.
*/
void
-DeprecatedLoader::add_metadata(GraphObject::MetadataMap& data, string old_key, string value)
+DeprecatedLoader::add_variable(GraphObject::Variables& data, string old_key, string value)
{
string key = "";
if (old_key == "module-x")
@@ -132,11 +132,11 @@ DeprecatedLoader::add_metadata(GraphObject::MetadataMap& data, string old_key, s
* Returns the path of the newly created patch.
*/
string
-DeprecatedLoader::load_patch(const Glib::ustring& filename,
- boost::optional<Path> parent_path,
- string name,
- GraphObject::MetadataMap initial_data,
- bool existing)
+DeprecatedLoader::load_patch(const Glib::ustring& filename,
+ boost::optional<Path> parent_path,
+ string name,
+ GraphObject::Variables initial_data,
+ bool existing)
{
cerr << "[DeprecatedLoader] Loading patch " << filename << "" << endl;
@@ -147,7 +147,7 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename,
size_t poly = 0;
/* Use parameter overridden polyphony, if given */
- GraphObject::MetadataMap::iterator poly_param = initial_data.find("ingen:polyphony");
+ GraphObject::Variables::iterator poly_param = initial_data.find("ingen:polyphony");
if (poly_param != initial_data.end() && poly_param->second.type() == Atom::INT)
poly = poly_param->second;
@@ -199,10 +199,10 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename,
&& xmlStrcmp(cur->name, (const xmlChar*)"subpatch")
&& xmlStrcmp(cur->name, (const xmlChar*)"filename")
&& xmlStrcmp(cur->name, (const xmlChar*)"preset")) {
- // Don't know what this tag is, add it as metadata without overwriting
+ // Don't know what this tag is, add it as variable without overwriting
// (so caller can set arbitrary parameters which will be preserved)
if (key)
- add_metadata(initial_data, (const char*)cur->name, (const char*)key);
+ add_variable(initial_data, (const char*)cur->name, (const char*)key);
}
xmlFree(key);
@@ -217,8 +217,8 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename,
// Create it, if we're not merging
if (!existing) {
_engine->create_patch(path, poly);
- for (GraphObject::MetadataMap::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
- _engine->set_metadata(path, i->first, i->second);
+ for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
+ _engine->set_variable(path, i->first, i->second);
}
// Load nodes
@@ -272,8 +272,8 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename,
xmlCleanupParser();
// Done above.. late enough?
- //for (MetadataMap::const_iterator i = data.begin(); i != data.end(); ++i)
- // _engine->set_metadata(subject, i->first, i->second);
+ //for (Variables::const_iterator i = data.begin(); i != data.end(); ++i)
+ // _engine->set_variable(subject, i->first, i->second);
if (!existing)
_engine->enable_patch(path);
@@ -301,7 +301,7 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
string library_name; // deprecated
string plugin_label; // deprecated
- GraphObject::MetadataMap initial_data;
+ GraphObject::Variables initial_data;
while (cur != NULL) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
@@ -355,9 +355,9 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
nm->add_port(pm);
#endif
- } else { // Don't know what this tag is, add it as metadata
+ } else { // Don't know what this tag is, add it as variable
if (key)
- add_metadata(initial_data, (const char*)cur->name, (const char*)key);
+ add_variable(initial_data, (const char*)cur->name, (const char*)key);
}
xmlFree(key);
key = NULL;
@@ -410,8 +410,8 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
path = new_path;
- for (GraphObject::MetadataMap::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
- _engine->set_metadata(path, i->first, i->second);
+ for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
+ _engine->set_variable(path, i->first, i->second);
return SharedPtr<NodeModel>();
@@ -434,8 +434,8 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
else
_engine->create_node(path, plugin_type, library_name, plugin_label, polyphonic);
- for (GraphObject::MetadataMap::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
- _engine->set_metadata(path, i->first, i->second);
+ for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
+ _engine->set_variable(path, i->first, i->second);
return true;
}
@@ -443,8 +443,8 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
// Not deprecated
} else {
_engine->create_node(path, plugin_uri, polyphonic);
- for (GraphObject::MetadataMap::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
- _engine->set_metadata(path, i->first, i->second);
+ for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
+ _engine->set_variable(path, i->first, i->second);
return true;
}
@@ -462,7 +462,7 @@ DeprecatedLoader::load_subpatch(const Path& parent, xmlDocPtr doc, const xmlNode
string filename = "";
size_t poly = 0;
- GraphObject::MetadataMap initial_data;
+ GraphObject::Variables initial_data;
while (cur != NULL) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
@@ -473,9 +473,9 @@ DeprecatedLoader::load_subpatch(const Path& parent, xmlDocPtr doc, const xmlNode
initial_data.insert(make_pair("ingen::polyphony", (int)poly));
} else if ((!xmlStrcmp(cur->name, (const xmlChar*)"filename"))) {
filename = (const char*)key;
- } else { // Don't know what this tag is, add it as metadata
+ } else { // Don't know what this tag is, add it as variable
if (key != NULL && strlen((const char*)key) > 0)
- add_metadata(initial_data, (const char*)cur->name, (const char*)key);
+ add_variable(initial_data, (const char*)cur->name, (const char*)key);
}
xmlFree(key);
key = NULL;
@@ -483,7 +483,7 @@ DeprecatedLoader::load_subpatch(const Path& parent, xmlDocPtr doc, const xmlNode
cur = cur->next;
}
- // load_patch sets the passed metadata last, so values stored in the parent
+ // load_patch sets the passed variable last, so values stored in the parent
// will override values stored in the child patch file
/*string path = */load_patch(filename, parent, name, initial_data, false);
diff --git a/src/libs/client/DeprecatedLoader.hpp b/src/libs/client/DeprecatedLoader.hpp
index 19dbf5cb..1baf9271 100644
--- a/src/libs/client/DeprecatedLoader.hpp
+++ b/src/libs/client/DeprecatedLoader.hpp
@@ -62,14 +62,14 @@ public:
string find_file(const string& filename, const string& additional_path = "");
- string load_patch(const Glib::ustring& filename,
- boost::optional<Path> parent_path,
- string name,
- GraphObject::MetadataMap initial_data,
- bool existing = false);
+ string load_patch(const Glib::ustring& filename,
+ boost::optional<Path> parent_path,
+ string name,
+ GraphObject::Variables initial_data,
+ bool existing = false);
private:
- void add_metadata(GraphObject::MetadataMap& data, string key, string value);
+ void add_variable(GraphObject::Variables& data, string key, string value);
string nameify_if_invalid(const string& name);
string translate_load_path(const string& path);
diff --git a/src/libs/client/DirectSigClientInterface.hpp b/src/libs/client/DirectSigClientInterface.hpp
index 72265d11..721a7f74 100644
--- a/src/libs/client/DirectSigClientInterface.hpp
+++ b/src/libs/client/DirectSigClientInterface.hpp
@@ -98,8 +98,8 @@ private:
virtual void disconnection(const string& src_port_path, const string& dst_port_path)
{ disconnection_sig.emit(src_port_path, dst_port_path); }
- virtual void metadata_update(const string& subject_path, const string& predicate, const string& value)
- { metadata_update_sig.emit(subject_path, predicate, value); }
+ virtual void variable_change(const string& subject_path, const string& predicate, const string& value)
+ { variable_change_sig.emit(subject_path, predicate, value); }
virtual void control_change(const string& port_path, float value)
{ control_change_sig.emit(port_path, value); }
diff --git a/src/libs/client/NodeModel.cpp b/src/libs/client/NodeModel.cpp
index b8c8e901..1ee67dcf 100644
--- a/src/libs/client/NodeModel.cpp
+++ b/src/libs/client/NodeModel.cpp
@@ -173,8 +173,8 @@ NodeModel::port_value_range(SharedPtr<PortModel> port, float& min, float& max)
#endif
// Possibly overriden
- const Atom& min_atom = port->get_metadata("ingen:minimum");
- const Atom& max_atom = port->get_metadata("ingen:maximum");
+ const Atom& min_atom = port->get_variable("ingen:minimum");
+ const Atom& max_atom = port->get_variable("ingen:maximum");
if (min_atom.type() == Atom::FLOAT)
min = min_atom.get_float();
if (max_atom.type() == Atom::FLOAT)
diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp
index 0a1fa105..a4197797 100644
--- a/src/libs/client/OSCClientReceiver.cpp
+++ b/src/libs/client/OSCClientReceiver.cpp
@@ -158,7 +158,7 @@ OSCClientReceiver::setup_callbacks()
lo_server_thread_add_method(_st, "/ingen/new_port", "ssi", new_port_cb, this);
lo_server_thread_add_method(_st, "/ingen/polyphonic", "sT", polyphonic_cb, this);
lo_server_thread_add_method(_st, "/ingen/polyphonic", "sF", polyphonic_cb, this);
- lo_server_thread_add_method(_st, "/ingen/metadata_update", NULL, metadata_update_cb, this);
+ lo_server_thread_add_method(_st, "/ingen/variable_change", NULL, variable_change_cb, this);
lo_server_thread_add_method(_st, "/ingen/control_change", "sf", control_change_cb, this);
lo_server_thread_add_method(_st, "/ingen/port_activity", "s", port_activity_cb, this);
lo_server_thread_add_method(_st, "/ingen/program_add", "siis", program_add_cb, this);
@@ -301,10 +301,10 @@ OSCClientReceiver::_polyphonic_cb(const char* path, const char* types, lo_arg**
}
-/** Notification of a new or updated piece of metadata.
+/** Notification of a new or updated piece of variable.
*/
int
-OSCClientReceiver::_metadata_update_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
+OSCClientReceiver::_variable_change_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
if (argc != 3 || types[0] != 's' || types[1] != 's')
return 1;
@@ -314,7 +314,7 @@ OSCClientReceiver::_metadata_update_cb(const char* path, const char* types, lo_a
Atom value = AtomLiblo::lo_arg_to_atom(types[2], argv[2]);
- metadata_update(obj_path, key, value);
+ variable_change(obj_path, key, value);
return 0;
}
diff --git a/src/libs/client/OSCClientReceiver.hpp b/src/libs/client/OSCClientReceiver.hpp
index 82c4ff4c..8963d3ca 100644
--- a/src/libs/client/OSCClientReceiver.hpp
+++ b/src/libs/client/OSCClientReceiver.hpp
@@ -97,7 +97,7 @@ private:
LO_HANDLER(new_node);
LO_HANDLER(new_port);
LO_HANDLER(polyphonic);
- LO_HANDLER(metadata_update);
+ LO_HANDLER(variable_change);
LO_HANDLER(control_change);
LO_HANDLER(port_activity);
LO_HANDLER(program_add);
diff --git a/src/libs/client/OSCEngineSender.cpp b/src/libs/client/OSCEngineSender.cpp
index e3183f78..345f4be3 100644
--- a/src/libs/client/OSCEngineSender.cpp
+++ b/src/libs/client/OSCEngineSender.cpp
@@ -494,7 +494,7 @@ OSCEngineSender::midi_learn(const string& node_path)
void
-OSCEngineSender::set_metadata(const string& obj_path,
+OSCEngineSender::set_variable(const string& obj_path,
const string& predicate,
const Raul::Atom& value)
{
@@ -505,7 +505,7 @@ OSCEngineSender::set_metadata(const string& obj_path,
lo_message_add_string(m, obj_path.c_str());
lo_message_add_string(m, predicate.c_str());
Raul::AtomLiblo::lo_message_add_atom(m, value);
- lo_send_message(_engine_addr, "/ingen/set_metadata", m);
+ lo_send_message(_engine_addr, "/ingen/set_variable", m);
}
@@ -549,10 +549,10 @@ OSCEngineSender::request_port_value(const string& port_path)
}
void
-OSCEngineSender::request_metadata(const string& object_path, const string& key)
+OSCEngineSender::request_variable(const string& object_path, const string& key)
{
assert(_engine_addr);
- lo_send(_engine_addr, "/ingen/request_metadata", "iss",
+ lo_send(_engine_addr, "/ingen/request_variable", "iss",
next_id(),
object_path.c_str(),
key.c_str());
diff --git a/src/libs/client/OSCEngineSender.hpp b/src/libs/client/OSCEngineSender.hpp
index c97c4e94..eb6dd2ee 100644
--- a/src/libs/client/OSCEngineSender.hpp
+++ b/src/libs/client/OSCEngineSender.hpp
@@ -143,7 +143,7 @@ public:
void midi_learn(const string& node_path);
- void set_metadata(const string& obj_path,
+ void set_variable(const string& obj_path,
const string& predicate,
const Raul::Atom& value);
@@ -157,7 +157,7 @@ public:
void request_port_value(const string& port_path);
- void request_metadata(const string& path, const string& key);
+ void request_variable(const string& path, const string& key);
void request_plugins();
diff --git a/src/libs/client/ObjectModel.cpp b/src/libs/client/ObjectModel.cpp
index 7d144faf..1d22c8eb 100644
--- a/src/libs/client/ObjectModel.cpp
+++ b/src/libs/client/ObjectModel.cpp
@@ -72,17 +72,17 @@ ObjectModel::find_child(const string& name) const
}
-/** Get a piece of metadata for this object.
+/** Get a piece of variable for this object.
*
* @return Metadata value with key @a key, empty string otherwise.
*/
const Atom&
-ObjectModel::get_metadata(const string& key) const
+ObjectModel::get_variable(const string& key) const
{
static const Atom null_atom;
- MetadataMap::const_iterator i = _metadata.find(key);
- if (i != _metadata.end())
+ Variables::const_iterator i = _variables.find(key);
+ if (i != _variables.end())
return i->second;
else
return null_atom;
@@ -90,11 +90,11 @@ ObjectModel::get_metadata(const string& key) const
void
-ObjectModel::add_metadata(const MetadataMap& data)
+ObjectModel::add_variable(const Variables& data)
{
- for (MetadataMap::const_iterator i = data.begin(); i != data.end(); ++i) {
- _metadata[i->first] = i->second;
- signal_metadata.emit(i->first, i->second);
+ for (Variables::const_iterator i = data.begin(); i != data.end(); ++i) {
+ _variables[i->first] = i->second;
+ signal_variable.emit(i->first, i->second);
}
}
@@ -117,18 +117,18 @@ ObjectModel::set(SharedPtr<ObjectModel> model)
{
assert(_path == model->path());
- for (MetadataMap::const_iterator other = model->metadata().begin();
- other != model->metadata().end(); ++other) {
+ for (Variables::const_iterator other = model->variables().begin();
+ other != model->variables().end(); ++other) {
- MetadataMap::const_iterator mine = _metadata.find(other->first);
+ Variables::const_iterator mine = _variables.find(other->first);
- if (mine != _metadata.end()) {
+ if (mine != _variables.end()) {
cerr << "WARNING: " << _path << "Client/Server data mismatch: " << other->first << endl;
cerr << "Setting server value " << other->second;
}
- _metadata[other->first] = other->second;
- signal_metadata.emit(other->first, other->second);
+ _variables[other->first] = other->second;
+ signal_variable.emit(other->first, other->second);
}
}
diff --git a/src/libs/client/ObjectModel.hpp b/src/libs/client/ObjectModel.hpp
index 3c13b227..f9be4fa6 100644
--- a/src/libs/client/ObjectModel.hpp
+++ b/src/libs/client/ObjectModel.hpp
@@ -59,11 +59,11 @@ class ObjectModel : virtual public Ingen::Shared::GraphObject, public boost::non
public:
virtual ~ObjectModel();
- const Atom& get_metadata(const string& key) const;
- void set_metadata(const string& key, const Atom& value)
- { _metadata.insert(make_pair(key, value)); signal_metadata.emit(key, value); }
+ const Atom& get_variable(const string& key) const;
+ void set_variable(const string& key, const Atom& value)
+ { _variables.insert(make_pair(key, value)); signal_variable.emit(key, value); }
- const MetadataMap& metadata() const { return _metadata; }
+ const Variables& variables() const { return _variables; }
const Path path() const { return _path; }
const string name() const { return _path.name(); }
SharedPtr<ObjectModel> parent() const { return _parent; }
@@ -76,7 +76,7 @@ public:
// Signals
sigc::signal<void, SharedPtr<ObjectModel> > signal_new_child;
sigc::signal<void, SharedPtr<ObjectModel> > signal_removed_child;
- sigc::signal<void, const string&, const Atom&> signal_metadata;
+ sigc::signal<void, const string&, const Atom&> signal_variable;
sigc::signal<void, bool> signal_polyphonic;
sigc::signal<void> signal_destroyed;
sigc::signal<void> signal_renamed;
@@ -91,7 +91,7 @@ protected:
virtual void add_child(SharedPtr<ObjectModel> c) {}
virtual bool remove_child(SharedPtr<ObjectModel> c) { return true; }
- void add_metadata(const MetadataMap& data);
+ void add_variable(const Variables& data);
void set_polyphonic(bool);
void set(SharedPtr<ObjectModel> model);
@@ -101,7 +101,7 @@ protected:
bool _polyphonic;
SharedPtr<ObjectModel> _parent;
- MetadataMap _metadata;
+ Variables _variables;
};
diff --git a/src/libs/client/PortModel.cpp b/src/libs/client/PortModel.cpp
index ed59c8ca..6b727747 100644
--- a/src/libs/client/PortModel.cpp
+++ b/src/libs/client/PortModel.cpp
@@ -25,7 +25,7 @@ namespace Client {
bool
PortModel::is_logarithmic() const
{
- const Atom& hint = get_metadata("ingen:logarithmic");
+ const Atom& hint = get_variable("ingen:logarithmic");
return (hint && hint > 0);
}
@@ -33,7 +33,7 @@ PortModel::is_logarithmic() const
bool
PortModel::is_integer() const
{
- const Atom& hint = get_metadata("ingen:integer");
+ const Atom& hint = get_variable("ingen:integer");
return (hint && hint > 0);
}
@@ -41,7 +41,7 @@ PortModel::is_integer() const
bool
PortModel::is_toggle() const
{
- const Atom& hint = get_metadata("ingen:toggled");
+ const Atom& hint = get_variable("ingen:toggled");
return (hint && hint > 0);
}
diff --git a/src/libs/client/SigClientInterface.hpp b/src/libs/client/SigClientInterface.hpp
index 895b4cde..27469f9e 100644
--- a/src/libs/client/SigClientInterface.hpp
+++ b/src/libs/client/SigClientInterface.hpp
@@ -62,7 +62,7 @@ public:
sigc::signal<void, string> signal_object_destroyed;
sigc::signal<void, string, string> signal_connection;
sigc::signal<void, string, string> signal_disconnection;
- sigc::signal<void, string, string, Raul::Atom> signal_metadata_update;
+ sigc::signal<void, string, string, Raul::Atom> signal_variable_change;
sigc::signal<void, string, float> signal_control_change;
sigc::signal<void, string> signal_port_activity;
sigc::signal<void, string, uint32_t, uint32_t, string> signal_program_add;
@@ -129,8 +129,8 @@ protected:
void disconnection(const string& src_port_path, const string& dst_port_path)
{ signal_disconnection.emit(src_port_path, dst_port_path); }
- void metadata_update(const string& path, const string& key, const Raul::Atom& value)
- { signal_metadata_update.emit(path, key, value); }
+ void variable_change(const string& path, const string& key, const Raul::Atom& value)
+ { signal_variable_change.emit(path, key, value); }
void control_change(const string& port_path, float value)
{ signal_control_change.emit(port_path, value); }
diff --git a/src/libs/client/Store.cpp b/src/libs/client/Store.cpp
index ae07fa08..ab2ea280 100644
--- a/src/libs/client/Store.cpp
+++ b/src/libs/client/Store.cpp
@@ -49,7 +49,7 @@ Store::Store(SharedPtr<EngineInterface> engine, SharedPtr<SigClientInterface> em
emitter->signal_patch_cleared.connect(sigc::mem_fun(this, &Store::patch_cleared_event));
emitter->signal_connection.connect(sigc::mem_fun(this, &Store::connection_event));
emitter->signal_disconnection.connect(sigc::mem_fun(this, &Store::disconnection_event));
- emitter->signal_metadata_update.connect(sigc::mem_fun(this, &Store::metadata_update_event));
+ emitter->signal_variable_change.connect(sigc::mem_fun(this, &Store::variable_change_event));
emitter->signal_control_change.connect(sigc::mem_fun(this, &Store::control_change_event));
emitter->signal_port_activity.connect(sigc::mem_fun(this, &Store::port_activity_event));
}
@@ -158,38 +158,38 @@ Store::add_orphan(SharedPtr<ObjectModel> child)
void
-Store::add_metadata_orphan(const Path& subject_path, const string& predicate, const Atom& value)
+Store::add_variable_orphan(const Path& subject_path, const string& predicate, const Atom& value)
{
Raul::PathTable<list<std::pair<string, Atom> > >::iterator orphans
- = _metadata_orphans.find(subject_path);
+ = _variable_orphans.find(subject_path);
_engine->request_object(subject_path);
- if (orphans != _metadata_orphans.end()) {
+ if (orphans != _variable_orphans.end()) {
orphans->second.push_back(std::pair<string, Atom>(predicate, value));
} else {
list<std::pair<string, Atom> > l;
l.push_back(std::pair<string, Atom>(predicate, value));
- _metadata_orphans[subject_path] = l;
+ _variable_orphans[subject_path] = l;
}
}
void
-Store::resolve_metadata_orphans(SharedPtr<ObjectModel> subject)
+Store::resolve_variable_orphans(SharedPtr<ObjectModel> subject)
{
Raul::PathTable<list<std::pair<string, Atom> > >::iterator v
- = _metadata_orphans.find(subject->path());
+ = _variable_orphans.find(subject->path());
- if (v != _metadata_orphans.end()) {
+ if (v != _variable_orphans.end()) {
list<std::pair<string, Atom> > values = v->second; // take a copy
- _metadata_orphans.erase(subject->path());
+ _variable_orphans.erase(subject->path());
for (list<std::pair<string, Atom> >::iterator i = values.begin();
i != values.end(); ++i) {
- subject->set_metadata(i->first, i->second);
+ subject->set_variable(i->first, i->second);
}
}
}
@@ -236,7 +236,7 @@ Store::add_object(SharedPtr<ObjectModel> object)
_objects[object->path()] = object;
signal_new_object.emit(object);
- resolve_metadata_orphans(parent);
+ resolve_variable_orphans(parent);
resolve_orphans(parent);
SharedPtr<PortModel> port = PtrCast<PortModel>(object);
@@ -487,15 +487,15 @@ Store::patch_cleared_event(const Path& path)
void
-Store::metadata_update_event(const Path& subject_path, const string& predicate, const Atom& value)
+Store::variable_change_event(const Path& subject_path, const string& predicate, const Atom& value)
{
SharedPtr<ObjectModel> subject = object(subject_path);
if (subject) {
- subject->set_metadata(predicate, value);
+ subject->set_variable(predicate, value);
} else {
- add_metadata_orphan(subject_path, predicate, value);
- cerr << "WARNING: metadata for unknown object " << subject_path << endl;
+ add_variable_orphan(subject_path, predicate, value);
+ cerr << "WARNING: variable for unknown object " << subject_path << endl;
}
}
diff --git a/src/libs/client/Store.hpp b/src/libs/client/Store.hpp
index dad403d0..2849afc3 100644
--- a/src/libs/client/Store.hpp
+++ b/src/libs/client/Store.hpp
@@ -91,8 +91,8 @@ private:
void add_plugin_orphan(SharedPtr<NodeModel> orphan);
void resolve_plugin_orphans(SharedPtr<PluginModel> plugin);
- void add_metadata_orphan(const Path& subject, const string& predicate, const Atom& value);
- void resolve_metadata_orphans(SharedPtr<ObjectModel> subject);
+ void add_variable_orphan(const Path& subject, const string& predicate, const Atom& value);
+ void resolve_variable_orphans(SharedPtr<ObjectModel> subject);
// Slots for SigClientInterface signals
void destruction_event(const Path& path);
@@ -106,7 +106,7 @@ private:
void patch_disabled_event(const Path& path);
void patch_polyphony_event(const Path& path, uint32_t poly);
void patch_cleared_event(const Path& path);
- void metadata_update_event(const Path& subject_path, const string& predicate, const Atom& value);
+ void variable_change_event(const Path& subject_path, const string& predicate, const Atom& value);
void control_change_event(const Path& port_path, float value);
void port_activity_event(const Path& port_path);
void connection_event(const Path& src_port_path, const Path& dst_port_path);
@@ -128,8 +128,8 @@ private:
* It's unfortunate everything doesn't just have a URI and this was the same.. ahem.. */
Raul::Table<string, list<SharedPtr<NodeModel> > > _plugin_orphans;
- /** Not orphans OF metadata like the above, but orphans which are metadata */
- Raul::PathTable<list<std::pair<string, Atom> > > _metadata_orphans;
+ /** Not orphans OF variable like the above, but orphans which are variable */
+ Raul::PathTable<list<std::pair<string, Atom> > > _variable_orphans;
/** Ditto */
list<std::pair<Path, Path> > _connection_orphans;
diff --git a/src/libs/client/ThreadedSigClientInterface.hpp b/src/libs/client/ThreadedSigClientInterface.hpp
index c79ed090..8a4db3f7 100644
--- a/src/libs/client/ThreadedSigClientInterface.hpp
+++ b/src/libs/client/ThreadedSigClientInterface.hpp
@@ -63,7 +63,7 @@ public:
, object_destroyed_slot(signal_object_destroyed.make_slot())
, object_renamed_slot(signal_object_renamed.make_slot())
, disconnection_slot(signal_disconnection.make_slot())
- , metadata_update_slot(signal_metadata_update.make_slot())
+ , variable_change_slot(signal_variable_change.make_slot())
, control_change_slot(signal_control_change.make_slot())
, port_activity_slot(signal_port_activity.make_slot())
, program_add_slot(signal_program_add.make_slot())
@@ -133,8 +133,8 @@ public:
void disconnection(const string& src_port_path, const string& dst_port_path)
{ push_sig(sigc::bind(disconnection_slot, src_port_path, dst_port_path)); }
- void metadata_update(const string& path, const string& key, const Raul::Atom& value)
- { push_sig(sigc::bind(metadata_update_slot, path, key, value)); }
+ void variable_change(const string& path, const string& key, const Raul::Atom& value)
+ { push_sig(sigc::bind(variable_change_slot, path, key, value)); }
void control_change(const string& port_path, float value)
{ push_sig(sigc::bind(control_change_slot, port_path, value)); }
@@ -178,7 +178,7 @@ private:
sigc::slot<void, string> object_destroyed_slot;
sigc::slot<void, string, string> object_renamed_slot;
sigc::slot<void, string, string> disconnection_slot;
- sigc::slot<void, string, string, Raul::Atom> metadata_update_slot;
+ sigc::slot<void, string, string, Raul::Atom> variable_change_slot;
sigc::slot<void, string, float> control_change_slot;
sigc::slot<void, string> port_activity_slot;
sigc::slot<void, string, uint32_t, uint32_t, string> program_add_slot;
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-28 11:00:35 +0000