From 91ca84684151a67b8e3e1e859b3167e9f687d4d4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 8 Oct 2007 17:59:56 +0000 Subject: s/MetadataMap/Variables/ etc. Removed ancient/unused Controller.hpp. git-svn-id: http://svn.drobilla.net/lad/ingen@852 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/ClientBroadcaster.cpp | 8 +-- src/libs/engine/ClientBroadcaster.hpp | 2 +- src/libs/engine/Controller.hpp | 83 ------------------------- src/libs/engine/GraphObjectImpl.hpp | 16 ++--- src/libs/engine/LADSPANode.cpp | 4 +- src/libs/engine/MidiControlNode.cpp | 14 ++--- src/libs/engine/MidiNoteNode.cpp | 12 ++-- src/libs/engine/MidiTriggerNode.cpp | 8 +-- src/libs/engine/OSCClientSender.cpp | 16 ++--- src/libs/engine/OSCClientSender.hpp | 2 +- src/libs/engine/OSCEngineReceiver.cpp | 26 ++++---- src/libs/engine/OSCEngineReceiver.hpp | 6 +- src/libs/engine/ObjectSender.cpp | 24 +++---- src/libs/engine/QueuedEngineInterface.cpp | 4 +- src/libs/engine/QueuedEngineInterface.hpp | 4 +- src/libs/engine/events/RequestMetadataEvent.cpp | 6 +- src/libs/engine/events/RequestMetadataEvent.hpp | 2 +- src/libs/engine/events/SetMetadataEvent.cpp | 4 +- src/libs/engine/events/SetMetadataEvent.hpp | 2 +- 19 files changed, 80 insertions(+), 163 deletions(-) delete mode 100644 src/libs/engine/Controller.hpp (limited to 'src/libs/engine') diff --git a/src/libs/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp index 2360dd09..df8e6c6f 100644 --- a/src/libs/engine/ClientBroadcaster.cpp +++ b/src/libs/engine/ClientBroadcaster.cpp @@ -201,15 +201,15 @@ ClientBroadcaster::send_patch_polyphony(const string& patch_path, uint32_t poly) } -/** Send notification of a metadata update. +/** Send notification of a variable update. * - * Like control changes, does not send update to client that set the metadata, if applicable. + * Like control changes, does not send update to client that set the variable, if applicable. */ void -ClientBroadcaster::send_metadata_update(const string& node_path, const string& key, const Atom& value) +ClientBroadcaster::send_variable_change(const string& node_path, const string& key, const Atom& value) { for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i) - (*i).second->metadata_update(node_path, key, value); + (*i).second->variable_change(node_path, key, value); } diff --git a/src/libs/engine/ClientBroadcaster.hpp b/src/libs/engine/ClientBroadcaster.hpp index d7621555..ecd19d34 100644 --- a/src/libs/engine/ClientBroadcaster.hpp +++ b/src/libs/engine/ClientBroadcaster.hpp @@ -75,7 +75,7 @@ public: void send_patch_enable(const string& patch_path); void send_patch_disable(const string& patch_path); void send_patch_polyphony(const string& patch_path, uint32_t poly); - void send_metadata_update(const string& node_path, const string& key, const Raul::Atom& value); + void send_variable_change(const string& node_path, const string& key, const Raul::Atom& value); void send_control_change(const string& port_path, float value); void send_port_activity(const string& port_path); void send_program_add(const string& node_path, int bank, int program, const string& name); diff --git a/src/libs/engine/Controller.hpp b/src/libs/engine/Controller.hpp deleted file mode 100644 index 95f7cc44..00000000 --- a/src/libs/engine/Controller.hpp +++ /dev/null @@ -1,83 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007 Dave Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef CONTROLLER_H -#define CONTROLLER_H - -namespace Ingen { - - -/** Public interface to engine library. - * - * This is an interface to all the audio-processing related functionality - * only. OSC communication, LASH session management, etc, are not part of - * this library. - */ -class Controller { -public: - void init(); - void quit(); - - void load_plugins(); - - void activate_engine(); - void deactivate_engine(); - - void create_patch(const char* path, unsigned int polyphony); - void clear_patch(const char* path); - void enable_patch(const char* path); - void disable_patch(const char* path); - void rename(const char* old_path, const char* new_path); - - void create_node(const char* path, - const char* type, - const char* library_name, - const char* library_label, - unsigned int polyphony); - - void destroy(const char* path); - - void connect(const char* src_port_path, const char* dst_port_path); - void disconnect(const char* src_port_path, const char* dst_port_path); - void disconnect_all(const char* path); - - void set_port_value(const char* path, float value); - void set_port_value_voice(const char* path, unsigned int voice); - void set_port_value_slow(const char* path, float value); - - void note_on(const char* node_path, - unsigned char note_num, - unsigned char velocity); - - void note_off(const char* node_path, - unsigned char note_num); - - void all_notes_off(const char* node_path); - void midi_learn(const char* node_path); - - void get_metadata(); - void set_metadata(); - void responder_plugins(); - void responder_all_objects(); - void responder_port_value(); -}; - - -} // namespace Ingen - -#endif // CONTROLLER_H - diff --git a/src/libs/engine/GraphObjectImpl.hpp b/src/libs/engine/GraphObjectImpl.hpp index 1793366e..3862c762 100644 --- a/src/libs/engine/GraphObjectImpl.hpp +++ b/src/libs/engine/GraphObjectImpl.hpp @@ -42,7 +42,7 @@ class ProcessContext; /** An object on the audio graph - Patch, Node, Port, etc. * * Each of these is a Raul::Deletable and so can be deleted in a realtime safe - * way from anywhere, and they all have a map of metadata for clients to store + * way from anywhere, and they all have a map of variable for clients to store * arbitrary values in (which the engine puts no significance to whatsoever). * * \ingroup engine @@ -67,16 +67,16 @@ public: assert(_name.find("/") == string::npos); } - void set_metadata(const string& key, const Atom& value) - { _metadata[key] = value; } + void set_variable(const string& key, const Atom& value) + { _variables[key] = value; } - const Atom& get_metadata(const string& key) { + const Atom& get_variable(const string& key) { static Atom null_atom; - MetadataMap::iterator i = _metadata.find(key); - return (i != _metadata.end()) ? (*i).second : null_atom; + Variables::iterator i = _variables.find(key); + return (i != _variables.end()) ? (*i).second : null_atom; } - const MetadataMap& metadata() const { return _metadata; } + const Variables& variables() const { return _variables; } /** The Patch this object is a child of. */ virtual PatchImpl* parent_patch() const; @@ -109,7 +109,7 @@ protected: bool _polyphonic; private: - MetadataMap _metadata; + Variables _variables; }; diff --git a/src/libs/engine/LADSPANode.cpp b/src/libs/engine/LADSPANode.cpp index ce61eb5d..5ae567db 100644 --- a/src/libs/engine/LADSPANode.cpp +++ b/src/libs/engine/LADSPANode.cpp @@ -145,8 +145,8 @@ LADSPANode::instantiate() } if (port->is_input() && port->buffer_size() == 1) { - port->set_metadata("ingen:minimum", min); - port->set_metadata("ingen:maximum", max); + port->set_variable("ingen:minimum", min); + port->set_variable("ingen:maximum", max); } } diff --git a/src/libs/engine/MidiControlNode.cpp b/src/libs/engine/MidiControlNode.cpp index 27047263..250607b0 100644 --- a/src/libs/engine/MidiControlNode.cpp +++ b/src/libs/engine/MidiControlNode.cpp @@ -40,19 +40,19 @@ MidiControlNode::MidiControlNode(const string& path, bool polyphonic, PatchImpl* _ports->at(0) = _midi_in_port; _param_port = new InputPort(this, "ControllerNumber", 1, 1, DataType::CONTROL, 1); - _param_port->set_metadata("ingen:minimum", 0.0f); - _param_port->set_metadata("ingen:maximum", 127.0f); - _param_port->set_metadata("ingen:default", 0.0f); - _param_port->set_metadata("ingen:integer", 1); + _param_port->set_variable("ingen:minimum", 0.0f); + _param_port->set_variable("ingen:maximum", 127.0f); + _param_port->set_variable("ingen:default", 0.0f); + _param_port->set_variable("ingen:integer", 1); _ports->at(1) = _param_port; _log_port = new InputPort(this, "Logarithmic", 2, 1, DataType::CONTROL, 1); - _log_port->set_metadata("ingen:toggled", 1); - _log_port->set_metadata("ingen:default", 0.0f); + _log_port->set_variable("ingen:toggled", 1); + _log_port->set_variable("ingen:default", 0.0f); _ports->at(2) = _log_port; _min_port = new InputPort(this, "Min", 3, 1, DataType::CONTROL, 1); - _min_port->set_metadata("ingen:default", 0.0f); + _min_port->set_variable("ingen:default", 0.0f); _ports->at(3) = _min_port; _max_port = new InputPort(this, "Max", 4, 1, DataType::CONTROL, 1); diff --git a/src/libs/engine/MidiNoteNode.cpp b/src/libs/engine/MidiNoteNode.cpp index 7337ade5..7604bc61 100644 --- a/src/libs/engine/MidiNoteNode.cpp +++ b/src/libs/engine/MidiNoteNode.cpp @@ -53,18 +53,18 @@ MidiNoteNode::MidiNoteNode(const string& path, bool polyphonic, PatchImpl* paren _ports->at(1) = _freq_port; _vel_port = new OutputPort(this, "Velocity", 2, _polyphony, DataType::AUDIO, _buffer_size); - _vel_port->set_metadata("ingen:minimum", 0.0f); - _vel_port->set_metadata("ingen:maximum", 1.0f); + _vel_port->set_variable("ingen:minimum", 0.0f); + _vel_port->set_variable("ingen:maximum", 1.0f); _ports->at(2) = _vel_port; _gate_port = new OutputPort(this, "Gate", 3, _polyphony, DataType::AUDIO, _buffer_size); - _gate_port->set_metadata("ingen:toggled", 1); - _gate_port->set_metadata("ingen:default", 0.0f); + _gate_port->set_variable("ingen:toggled", 1); + _gate_port->set_variable("ingen:default", 0.0f); _ports->at(3) = _gate_port; _trig_port = new OutputPort(this, "Trigger", 4, _polyphony, DataType::AUDIO, _buffer_size); - _trig_port->set_metadata("ingen:toggled", 1); - _trig_port->set_metadata("ingen:default", 0.0f); + _trig_port->set_variable("ingen:toggled", 1); + _trig_port->set_variable("ingen:default", 0.0f); _ports->at(4) = _trig_port; PluginImpl* p = const_cast(_plugin); diff --git a/src/libs/engine/MidiTriggerNode.cpp b/src/libs/engine/MidiTriggerNode.cpp index f5009a80..f179d7b0 100644 --- a/src/libs/engine/MidiTriggerNode.cpp +++ b/src/libs/engine/MidiTriggerNode.cpp @@ -37,10 +37,10 @@ MidiTriggerNode::MidiTriggerNode(const string& path, bool polyphonic, PatchImpl* _ports->at(0) = _midi_in_port; _note_port = new InputPort(this, "NoteNumber", 1, 1, DataType::CONTROL, 1); - _note_port->set_metadata("ingen:minimum", 0.0f); - _note_port->set_metadata("ingen:maximum", 127.0f); - _note_port->set_metadata("ingen:default", 60.0f); - _note_port->set_metadata("ingen:integer", 1); + _note_port->set_variable("ingen:minimum", 0.0f); + _note_port->set_variable("ingen:maximum", 127.0f); + _note_port->set_variable("ingen:default", 60.0f); + _note_port->set_variable("ingen:integer", 1); _ports->at(1) = _note_port; _gate_port = new OutputPort(this, "Gate", 2, 1, DataType::AUDIO, _buffer_size); diff --git a/src/libs/engine/OSCClientSender.cpp b/src/libs/engine/OSCClientSender.cpp index 45c0e804..fff564d6 100644 --- a/src/libs/engine/OSCClientSender.cpp +++ b/src/libs/engine/OSCClientSender.cpp @@ -280,7 +280,7 @@ void OSCClientSender::new_node(const std::string& plugin_uri, * \li The minimum and maximum values are suggestions only, they are not * enforced in any way, and going outside them is perfectly fine. Also note * that the port ranges in om_gtk are not these ones! Those ranges are set - * as metadata.

\n \n + * as variable.

\n \n */ void OSCClientSender::new_port(const std::string& path, @@ -422,13 +422,13 @@ OSCClientSender::disconnection(const std::string& src_port_path, const std::stri /** \page client_osc_namespace - *

\b /ingen/metadata_update - Notification of a piece of metadata. - * \arg \b path (string) - Path of the object associated with metadata (can be a node, patch, or port) + *

\b /ingen/variable_change - Notification of a piece of variable. + * \arg \b path (string) - Path of the object associated with variable (can be a node, patch, or port) * \arg \b key (string) * \arg \b value (string)

\n \n */ void -OSCClientSender::metadata_update(const std::string& path, const std::string& key, const Atom& value) +OSCClientSender::variable_change(const std::string& path, const std::string& key, const Atom& value) { if (!_enabled) return; @@ -437,7 +437,7 @@ OSCClientSender::metadata_update(const std::string& path, const std::string& key lo_message_add_string(m, path.c_str()); lo_message_add_string(m, key.c_str()); Raul::AtomLiblo::lo_message_add_atom(m, value); - lo_send_message(_address, "/ingen/metadata_update", m); + lo_send_message(_address, "/ingen/variable_change", m); } @@ -523,10 +523,10 @@ OSCClientSender::new_patch(const std::string& path, uint32_t poly) if (p->process()) patch_enabled(p->path()); - // Send metadata - const map& data = p->metadata(); + // Send variables + const map& data = p->variable(); for (map::const_iterator i = data.begin(); i != data.end(); ++i) { - metadata_update(p->path(), (*i).first, (*i).second); + variable_change(p->path(), (*i).first, (*i).second); } */ } diff --git a/src/libs/engine/OSCClientSender.hpp b/src/libs/engine/OSCClientSender.hpp index 0d46545b..5388140d 100644 --- a/src/libs/engine/OSCClientSender.hpp +++ b/src/libs/engine/OSCClientSender.hpp @@ -113,7 +113,7 @@ public: virtual void disconnection(const std::string& src_port_path, const std::string& dst_port_path); - virtual void metadata_update(const std::string& subject_path, + virtual void variable_change(const std::string& subject_path, const std::string& predicate, const Raul::Atom& value); diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp index cfb3f860..7d05e0bb 100644 --- a/src/libs/engine/OSCEngineReceiver.cpp +++ b/src/libs/engine/OSCEngineReceiver.cpp @@ -106,10 +106,10 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t lo_server_add_method(_server, "/ingen/note_off", "isi", note_off_cb, this); lo_server_add_method(_server, "/ingen/all_notes_off", "isi", all_notes_off_cb, this); lo_server_add_method(_server, "/ingen/midi_learn", "is", midi_learn_cb, this); - lo_server_add_method(_server, "/ingen/set_metadata", NULL, metadata_set_cb, this); + lo_server_add_method(_server, "/ingen/set_variable", NULL, variable_set_cb, this); // Queries - lo_server_add_method(_server, "/ingen/request_metadata", "iss", metadata_get_cb, this); + lo_server_add_method(_server, "/ingen/request_variable", "iss", variable_get_cb, this); lo_server_add_method(_server, "/ingen/request_plugin", "is", request_plugin_cb, this); lo_server_add_method(_server, "/ingen/request_object", "is", request_object_cb, this); lo_server_add_method(_server, "/ingen/request_port_value", "is", request_port_value_cb, this); @@ -836,14 +836,14 @@ OSCEngineReceiver::_midi_learn_cb(const char* path, const char* types, lo_arg** /** \page engine_osc_namespace - *

\b /ingen/set_metadata - Sets a piece of metadata, associated with a synth-space object (node, etc) + *

\b /ingen/set_variable - Sets a piece of variable, associated with a synth-space object (node, etc) * \arg \b response-id (integer) - * \arg \b object-path (string) - Full path of object to associate metadata with - * \arg \b key (string) - Key (index) for new piece of metadata - * \arg \b value (string) - Value of new piece of metadata

\n \n + * \arg \b object-path (string) - Full path of object to associate variable with + * \arg \b key (string) - Key (index) for new piece of variable + * \arg \b value (string) - Value of new piece of variable

\n \n */ int -OSCEngineReceiver::_metadata_set_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) +OSCEngineReceiver::_variable_set_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { if (argc != 4 || types[0] != 'i' || types[1] != 's' || types[2] != 's') return 1; @@ -853,26 +853,26 @@ OSCEngineReceiver::_metadata_set_cb(const char* path, const char* types, lo_arg* Raul::Atom value = Raul::AtomLiblo::lo_arg_to_atom(types[3], argv[3]); - set_metadata(object_path, key, value); + set_variable(object_path, key, value); return 0; } /** \page engine_osc_namespace - *

\b /ingen/request_metadata - Requests the engine send a piece of metadata, associated with a synth-space object (node, etc) + *

\b /ingen/request_variable - Requests the engine send a piece of variable, associated with a synth-space object (node, etc) * \arg \b response-id (integer) - * \arg \b object-path (string) - Full path of object metadata is associated with - * \arg \b key (string) - Key (index) for piece of metadata + * \arg \b object-path (string) - Full path of object variable is associated with + * \arg \b key (string) - Key (index) for piece of variable * * \li Reply will be sent to client registered with the source address of this message.

\n \n */ int -OSCEngineReceiver::_metadata_get_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) +OSCEngineReceiver::_variable_get_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { const char* object_path = &argv[1]->s; const char* key = &argv[2]->s; - request_metadata(object_path, key); + request_variable(object_path, key); return 0; } diff --git a/src/libs/engine/OSCEngineReceiver.hpp b/src/libs/engine/OSCEngineReceiver.hpp index bdc346d6..0f9d4685 100644 --- a/src/libs/engine/OSCEngineReceiver.hpp +++ b/src/libs/engine/OSCEngineReceiver.hpp @@ -115,12 +115,12 @@ private: LO_HANDLER(note_off); LO_HANDLER(all_notes_off); LO_HANDLER(midi_learn); - LO_HANDLER(metadata_get); - LO_HANDLER(metadata_set); + LO_HANDLER(variable_get); + LO_HANDLER(variable_set); LO_HANDLER(request_plugin); LO_HANDLER(request_object); LO_HANDLER(request_port_value); - LO_HANDLER(request_metadata); + LO_HANDLER(request_variable); LO_HANDLER(request_plugins); LO_HANDLER(request_all_objects); diff --git a/src/libs/engine/ObjectSender.cpp b/src/libs/engine/ObjectSender.cpp index 87f35b2c..55dafaf4 100644 --- a/src/libs/engine/ObjectSender.cpp +++ b/src/libs/engine/ObjectSender.cpp @@ -60,10 +60,10 @@ ObjectSender::send_patch(ClientInterface* client, const PatchImpl* patch, bool r } - // Send metadata - const GraphObjectImpl::MetadataMap& data = patch->metadata(); - for (GraphObjectImpl::MetadataMap::const_iterator j = data.begin(); j != data.end(); ++j) - client->metadata_update(patch->path(), (*j).first, (*j).second); + // Send variable + const GraphObjectImpl::Variables& data = patch->variables(); + for (GraphObjectImpl::Variables::const_iterator j = data.begin(); j != data.end(); ++j) + client->variable_change(patch->path(), (*j).first, (*j).second); if (patch->enabled()) client->patch_enabled(patch->path()); @@ -92,10 +92,10 @@ ObjectSender::send_node(ClientInterface* client, const NodeImpl* node, bool recu client->new_node(node->plugin()->uri(), node->path(), node->polyphonic(), node->num_ports()); - // Send metadata - const GraphObjectImpl::MetadataMap& data = node->metadata(); - for (GraphObjectImpl::MetadataMap::const_iterator j = data.begin(); j != data.end(); ++j) - client->metadata_update(node->path(), (*j).first, (*j).second); + // Send variable + const GraphObjectImpl::Variables& data = node->variables(); + for (GraphObjectImpl::Variables::const_iterator j = data.begin(); j != data.end(); ++j) + client->variable_change(node->path(), (*j).first, (*j).second); client->bundle_end(); @@ -116,10 +116,10 @@ ObjectSender::send_port(ClientInterface* client, const PortImpl* port) client->new_port(port->path(), port->type().uri(), port->is_output()); - // Send metadata - const GraphObjectImpl::MetadataMap& data = port->metadata(); - for (GraphObjectImpl::MetadataMap::const_iterator j = data.begin(); j != data.end(); ++j) - client->metadata_update(port->path(), (*j).first, (*j).second); + // Send variable + const GraphObjectImpl::Variables& data = port->variables(); + for (GraphObjectImpl::Variables::const_iterator j = data.begin(); j != data.end(); ++j) + client->variable_change(port->path(), (*j).first, (*j).second); // Send control value if (port->type() == DataType::CONTROL) { diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp index 9899916c..053c0ff8 100644 --- a/src/libs/engine/QueuedEngineInterface.cpp +++ b/src/libs/engine/QueuedEngineInterface.cpp @@ -305,7 +305,7 @@ QueuedEngineInterface::midi_learn(const string& node_path) void -QueuedEngineInterface::set_metadata(const string& path, +QueuedEngineInterface::set_variable(const string& path, const string& predicate, const Atom& value) { @@ -347,7 +347,7 @@ QueuedEngineInterface::request_port_value(const string& port_path) } void -QueuedEngineInterface::request_metadata(const string& object_path, const string& key) +QueuedEngineInterface::request_variable(const string& object_path, const string& key) { push_queued(new RequestMetadataEvent(_engine, _responder, now(), object_path, key)); } diff --git a/src/libs/engine/QueuedEngineInterface.hpp b/src/libs/engine/QueuedEngineInterface.hpp index c860c0f8..ea4be595 100644 --- a/src/libs/engine/QueuedEngineInterface.hpp +++ b/src/libs/engine/QueuedEngineInterface.hpp @@ -150,7 +150,7 @@ public: virtual void midi_learn(const string& node_path); - virtual void set_metadata(const string& path, + virtual void set_variable(const string& path, const string& predicate, const Raul::Atom& value); @@ -164,7 +164,7 @@ public: virtual void request_port_value(const string& port_path); - virtual void request_metadata(const string& object_path, const string& key); + virtual void request_variable(const string& object_path, const string& key); virtual void request_plugins(); diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp index 0567d94d..99f0e04e 100644 --- a/src/libs/engine/events/RequestMetadataEvent.cpp +++ b/src/libs/engine/events/RequestMetadataEvent.cpp @@ -48,7 +48,7 @@ RequestMetadataEvent::pre_process() } } - _value = _object->get_metadata(_key); + _value = _object->get_variable(_key); QueuedEvent::pre_process(); } @@ -59,12 +59,12 @@ RequestMetadataEvent::post_process() { if (_responder->client()) { if (!_object) { - string msg = "Unable to find metadata subject "; + string msg = "Unable to find variable subject "; msg += _path; _responder->respond_error(msg); } else { _responder->respond_ok(); - _responder->client()->metadata_update(_path, _key, _value); + _responder->client()->variable_change(_path, _key, _value); } } else { _responder->respond_error("Unknown client"); diff --git a/src/libs/engine/events/RequestMetadataEvent.hpp b/src/libs/engine/events/RequestMetadataEvent.hpp index bbc2c871..71f55399 100644 --- a/src/libs/engine/events/RequestMetadataEvent.hpp +++ b/src/libs/engine/events/RequestMetadataEvent.hpp @@ -31,7 +31,7 @@ namespace Shared { } using Shared::ClientInterface; -/** A request from a client for a piece of metadata. +/** A request from a client for a piece of variable. * * \ingroup engine */ diff --git a/src/libs/engine/events/SetMetadataEvent.cpp b/src/libs/engine/events/SetMetadataEvent.cpp index ee0a62dc..2829eb1e 100644 --- a/src/libs/engine/events/SetMetadataEvent.cpp +++ b/src/libs/engine/events/SetMetadataEvent.cpp @@ -47,7 +47,7 @@ SetMetadataEvent::pre_process() return; } - _object->set_metadata(_key, _value); + _object->set_variable(_key, _value); QueuedEvent::pre_process(); } @@ -70,7 +70,7 @@ SetMetadataEvent::post_process() _responder->respond_error(msg); } else { _responder->respond_ok(); - _engine.broadcaster()->send_metadata_update(_path, _key, _value); + _engine.broadcaster()->send_variable_change(_path, _key, _value); } } diff --git a/src/libs/engine/events/SetMetadataEvent.hpp b/src/libs/engine/events/SetMetadataEvent.hpp index e65763c4..1d6a913e 100644 --- a/src/libs/engine/events/SetMetadataEvent.hpp +++ b/src/libs/engine/events/SetMetadataEvent.hpp @@ -29,7 +29,7 @@ namespace Ingen { class GraphObjectImpl; -/** An event to set a piece of metadata for an GraphObjectImpl. +/** An event to set a piece of variable for an GraphObjectImpl. * * \ingroup engine */ -- cgit v1.2.1