summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/bindings/Client.hpp6
-rw-r--r--src/common/interface/ClientInterface.hpp17
-rw-r--r--src/common/interface/CommonInterface.hpp4
-rw-r--r--src/common/interface/EngineInterface.hpp35
-rw-r--r--src/libs/client/DeprecatedLoader.cpp18
-rw-r--r--src/libs/client/OSCClientReceiver.cpp6
-rw-r--r--src/libs/client/OSCClientReceiver.hpp2
-rw-r--r--src/libs/client/OSCEngineSender.cpp32
-rw-r--r--src/libs/client/OSCEngineSender.hpp22
-rw-r--r--src/libs/client/SigClientInterface.hpp2
-rw-r--r--src/libs/client/ThreadedSigClientInterface.hpp3
-rw-r--r--src/libs/engine/ClientBroadcaster.cpp2
-rw-r--r--src/libs/engine/JackMidiDriver.cpp2
-rw-r--r--src/libs/engine/MidiDriver.hpp2
-rw-r--r--src/libs/engine/OSCClientSender.cpp8
-rw-r--r--src/libs/engine/OSCClientSender.hpp8
-rw-r--r--src/libs/engine/OSCEngineReceiver.cpp28
-rw-r--r--src/libs/engine/OSCEngineReceiver.hpp6
-rw-r--r--src/libs/engine/ObjectSender.cpp6
-rw-r--r--src/libs/engine/QueuedEngineInterface.cpp22
-rw-r--r--src/libs/engine/QueuedEngineInterface.hpp24
-rw-r--r--src/libs/engine/events/RequestMetadataEvent.cpp2
-rw-r--r--src/libs/gui/LoadPluginWindow.cpp2
-rw-r--r--src/libs/gui/PatchCanvas.cpp4
-rw-r--r--src/libs/serialisation/Loader.cpp4
25 files changed, 124 insertions, 143 deletions
diff --git a/src/bindings/Client.hpp b/src/bindings/Client.hpp
index 684640d4..d564d1ca 100644
--- a/src/bindings/Client.hpp
+++ b/src/bindings/Client.hpp
@@ -80,9 +80,9 @@ public:
virtual void disconnect(const std::string& src_port_path,
const std::string& dst_port_path) {}
- virtual void variable_change(const std::string& subject_path,
- const std::string& predicate,
- const Raul::Atom& value) {}
+ virtual void set_variable(const std::string& subject_path,
+ const std::string& predicate,
+ const Raul::Atom& value) {}
virtual void control_change(const std::string& port_path,
float value) {}
diff --git a/src/common/interface/ClientInterface.hpp b/src/common/interface/ClientInterface.hpp
index 9b0cbffb..399085e4 100644
--- a/src/common/interface/ClientInterface.hpp
+++ b/src/common/interface/ClientInterface.hpp
@@ -22,19 +22,18 @@
#include <string>
#include <inttypes.h>
#include <raul/Atom.hpp>
+#include "interface/CommonInterface.hpp"
namespace Ingen {
namespace Shared {
-class EngineInterface;
-
/** The (only) interface the engine uses to communicate with clients.
* Purely virtual (except for the destructor).
*
* \ingroup interface
*/
-class ClientInterface
+class ClientInterface : public CommonInterface
{
public:
@@ -76,8 +75,6 @@ public:
const std::string& symbol,
const std::string& name) = 0;
- virtual void new_patch(const std::string& path, uint32_t poly) = 0;
-
virtual void new_node(const std::string& plugin_uri,
const std::string& node_path,
bool is_polyphonic,
@@ -105,16 +102,6 @@ public:
virtual void object_destroyed(const std::string& path) = 0;
- virtual void connect(const std::string& src_port_path,
- const std::string& dst_port_path) = 0;
-
- virtual void disconnect(const std::string& src_port_path,
- const std::string& dst_port_path) = 0;
-
- virtual void variable_change(const std::string& subject_path,
- const std::string& predicate,
- const Raul::Atom& value) = 0;
-
virtual void control_change(const std::string& port_path,
float value) = 0;
diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp
index da147e9f..5f8fc1f5 100644
--- a/src/common/interface/CommonInterface.hpp
+++ b/src/common/interface/CommonInterface.hpp
@@ -53,6 +53,10 @@ public:
virtual void disconnect(const std::string& src_port_path,
const std::string& dst_port_path) = 0;
+ virtual void set_variable(const std::string& subject_path,
+ const std::string& predicate,
+ const Raul::Atom& value) = 0;
+
protected:
CommonInterface() {}
};
diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp
index a6481a7d..ead27bc5 100644
--- a/src/common/interface/EngineInterface.hpp
+++ b/src/common/interface/EngineInterface.hpp
@@ -58,23 +58,20 @@ public:
// Object commands
- virtual void new_patch(const std::string& path,
- uint32_t poly) = 0;
+ virtual void new_node(const std::string& path,
+ const std::string& plugin_uri,
+ bool polyphonic) = 0;
- virtual void create_port(const std::string& path,
- const std::string& data_type,
- bool is_output) = 0;
-
- virtual void create_node(const std::string& path,
- const std::string& plugin_uri,
- bool polyphonic) = 0;
+ virtual void new_port(const std::string& path,
+ const std::string& data_type,
+ bool is_output) = 0;
/** DEPRECATED */
- virtual void create_node(const std::string& path,
- const std::string& plugin_type,
- const std::string& library_name,
- const std::string& plugin_label,
- bool polyphonic) = 0;
+ virtual void new_node(const std::string& path,
+ const std::string& plugin_type,
+ const std::string& library_name,
+ const std::string& plugin_label,
+ bool polyphonic) = 0;
virtual void rename(const std::string& old_path,
const std::string& new_symbol) = 0;
@@ -91,12 +88,6 @@ public:
virtual void disable_patch(const std::string& patch_path) = 0;
- virtual void connect(const std::string& src_port_path,
- const std::string& dst_port_path) = 0;
-
- virtual void disconnect(const std::string& src_port_path,
- const std::string& dst_port_path) = 0;
-
virtual void disconnect_all(const std::string& parent_patch_path,
const std::string& path) = 0;
@@ -132,10 +123,6 @@ public:
virtual void midi_learn(const std::string& node_path) = 0;
- virtual void set_variable(const std::string& subject_path,
- const std::string& predicate,
- const Raul::Atom& value) = 0;
-
// Requests
virtual void ping() = 0;
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp
index 6b44fcf8..8de8a9b6 100644
--- a/src/libs/client/DeprecatedLoader.cpp
+++ b/src/libs/client/DeprecatedLoader.cpp
@@ -461,22 +461,22 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
if (plugin_type == "Internal") {
if (plugin_label == "audio_input") {
- _engine->create_port(path, "ingen:AudioPort", false);
+ _engine->new_port(path, "ingen:AudioPort", false);
is_port = true;
} else if (plugin_label == "audio_output") {
- _engine->create_port(path, "ingen:AudioPort", true);
+ _engine->new_port(path, "ingen:AudioPort", true);
is_port = true;
} else if (plugin_label == "control_input") {
- _engine->create_port(path, "ingen:ControlPort", false);
+ _engine->new_port(path, "ingen:ControlPort", false);
is_port = true;
} else if (plugin_label == "control_output" ) {
- _engine->create_port(path, "ingen:ControlPort", true);
+ _engine->new_port(path, "ingen:ControlPort", true);
is_port = true;
} else if (plugin_label == "midi_input") {
- _engine->create_port(path, "ingen:MIDIPort", false);
+ _engine->new_port(path, "ingen:MIDIPort", false);
is_port = true;
} else if (plugin_label == "midi_output" ) {
- _engine->create_port(path, "ingen:MIDIPort", true);
+ _engine->new_port(path, "ingen:MIDIPort", true);
is_port = true;
} else {
cerr << "WARNING: Unknown internal plugin label \"" << plugin_label << "\"" << endl;
@@ -519,9 +519,9 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
}
if (plugin_uri != "")
- _engine->create_node(path, plugin_uri, polyphonic);
+ _engine->new_node(path, plugin_uri, polyphonic);
else
- _engine->create_node(path, plugin_type, library_name, plugin_label, polyphonic);
+ _engine->new_node(path, plugin_type, library_name, plugin_label, polyphonic);
for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
_engine->set_variable(path, i->first, i->second);
@@ -531,7 +531,7 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
// Not deprecated
} else {
- _engine->create_node(path, plugin_uri, polyphonic);
+ _engine->new_node(path, plugin_uri, polyphonic);
for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i)
_engine->set_variable(path, i->first, i->second);
return true;
diff --git a/src/libs/client/OSCClientReceiver.cpp b/src/libs/client/OSCClientReceiver.cpp
index 00c5c28f..c9398685 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", "sisi", 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/variable_change", NULL, variable_change_cb, this);
+ lo_server_thread_add_method(_st, "/ingen/set_variable", NULL, set_variable_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);
@@ -305,7 +305,7 @@ OSCClientReceiver::_polyphonic_cb(const char* path, const char* types, lo_arg**
/** Notification of a new or updated piece of variable.
*/
int
-OSCClientReceiver::_variable_change_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
+OSCClientReceiver::_set_variable_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;
@@ -315,7 +315,7 @@ OSCClientReceiver::_variable_change_cb(const char* path, const char* types, lo_a
Atom value = AtomLiblo::lo_arg_to_atom(types[2], argv[2]);
- variable_change(obj_path, key, value);
+ set_variable(obj_path, key, value);
return 0;
}
diff --git a/src/libs/client/OSCClientReceiver.hpp b/src/libs/client/OSCClientReceiver.hpp
index 2dcc4906..76689ff2 100644
--- a/src/libs/client/OSCClientReceiver.hpp
+++ b/src/libs/client/OSCClientReceiver.hpp
@@ -96,7 +96,7 @@ private:
LO_HANDLER(new_node);
LO_HANDLER(new_port);
LO_HANDLER(polyphonic);
- LO_HANDLER(variable_change);
+ LO_HANDLER(set_variable);
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 44149865..4d8007db 100644
--- a/src/libs/client/OSCEngineSender.cpp
+++ b/src/libs/client/OSCEngineSender.cpp
@@ -195,12 +195,12 @@ OSCEngineSender::new_patch(const string& path,
void
-OSCEngineSender::create_port(const string& path,
- const string& data_type,
- bool is_output)
+OSCEngineSender::new_port(const string& path,
+ const string& data_type,
+ bool is_output)
{
assert(_engine_addr);
- lo_send(_engine_addr, "/ingen/create_port", "issi",
+ lo_send(_engine_addr, "/ingen/new_port", "issi",
next_id(),
path.c_str(),
data_type.c_str(),
@@ -209,19 +209,19 @@ OSCEngineSender::create_port(const string& path,
void
-OSCEngineSender::create_node(const string& path,
- const string& plugin_uri,
- bool polyphonic)
+OSCEngineSender::new_node(const string& path,
+ const string& plugin_uri,
+ bool polyphonic)
{
assert(_engine_addr);
if (polyphonic)
- lo_send(_engine_addr, "/ingen/create_node", "issT",
+ lo_send(_engine_addr, "/ingen/new_node", "issT",
next_id(),
path.c_str(),
plugin_uri.c_str());
else
- lo_send(_engine_addr, "/ingen/create_node", "issF",
+ lo_send(_engine_addr, "/ingen/new_node", "issF",
next_id(),
path.c_str(),
plugin_uri.c_str());
@@ -233,22 +233,22 @@ OSCEngineSender::create_node(const string& path,
* DO NOT USE THIS.
*/
void
-OSCEngineSender::create_node(const string& path,
- const string& plugin_type,
- const string& library_name,
- const string& plugin_label,
- bool polyphonic)
+OSCEngineSender::new_node(const string& path,
+ const string& plugin_type,
+ const string& library_name,
+ const string& plugin_label,
+ bool polyphonic)
{
assert(_engine_addr);
if (polyphonic)
- lo_send(_engine_addr, "/ingen/create_node", "issssT",
+ lo_send(_engine_addr, "/ingen/new_node", "issssT",
next_id(),
path.c_str(),
plugin_type.c_str(),
library_name.c_str(),
plugin_label.c_str());
else
- lo_send(_engine_addr, "/ingen/create_node", "issssF",
+ lo_send(_engine_addr, "/ingen/new_node", "issssF",
next_id(),
path.c_str(),
plugin_type.c_str(),
diff --git a/src/libs/client/OSCEngineSender.hpp b/src/libs/client/OSCEngineSender.hpp
index bb935d7a..610841f6 100644
--- a/src/libs/client/OSCEngineSender.hpp
+++ b/src/libs/client/OSCEngineSender.hpp
@@ -76,19 +76,19 @@ public:
void new_patch(const string& path,
uint32_t poly);
- void create_port(const string& path,
- const string& data_type,
- bool is_output);
+ void new_port(const string& path,
+ const string& data_type,
+ bool is_output);
- void create_node(const string& path,
- const string& plugin_uri,
- bool polyphonic);
+ void new_node(const string& path,
+ const string& plugin_uri,
+ bool polyphonic);
- void create_node(const string& path,
- const string& plugin_type,
- const string& library_name,
- const string& plugin_label,
- bool polyphonic);
+ void new_node(const string& path,
+ const string& plugin_type,
+ const string& library_name,
+ const string& plugin_label,
+ bool polyphonic);
void rename(const string& old_path,
const string& new_name);
diff --git a/src/libs/client/SigClientInterface.hpp b/src/libs/client/SigClientInterface.hpp
index 1fed9e65..fd2c0bee 100644
--- a/src/libs/client/SigClientInterface.hpp
+++ b/src/libs/client/SigClientInterface.hpp
@@ -140,7 +140,7 @@ protected:
void disconnect(const string& src_port_path, const string& dst_port_path)
{ if (_enabled) signal_disconnection.emit(src_port_path, dst_port_path); }
- void variable_change(const string& path, const string& key, const Raul::Atom& value)
+ void set_variable(const string& path, const string& key, const Raul::Atom& value)
{ if (_enabled) signal_variable_change.emit(path, key, value); }
void control_change(const string& port_path, float value)
diff --git a/src/libs/client/ThreadedSigClientInterface.hpp b/src/libs/client/ThreadedSigClientInterface.hpp
index 63a35b59..bdca9a0d 100644
--- a/src/libs/client/ThreadedSigClientInterface.hpp
+++ b/src/libs/client/ThreadedSigClientInterface.hpp
@@ -31,6 +31,7 @@ using std::string;
typedef sigc::slot<void> Closure;
namespace Ingen {
+namespace Shared { class EngineInterface; }
namespace Client {
@@ -130,7 +131,7 @@ public:
void disconnect(const string& src_port_path, const string& dst_port_path)
{ push_sig(sigc::bind(disconnection_slot, src_port_path, dst_port_path)); }
- void variable_change(const string& path, const string& key, const Raul::Atom& value)
+ void set_variable(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)
diff --git a/src/libs/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp
index 23b841c0..7e54f994 100644
--- a/src/libs/engine/ClientBroadcaster.cpp
+++ b/src/libs/engine/ClientBroadcaster.cpp
@@ -224,7 +224,7 @@ void
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->variable_change(node_path, key, value);
+ (*i).second->set_variable(node_path, key, value);
}
diff --git a/src/libs/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp
index b5c71c10..9e236541 100644
--- a/src/libs/engine/JackMidiDriver.cpp
+++ b/src/libs/engine/JackMidiDriver.cpp
@@ -201,7 +201,7 @@ JackMidiDriver::post_process(ProcessContext& context)
* Realtime safe, this is to be called at the beginning of a process cycle to
* insert (and actually begin using) a new port.
*
- * See create_port() and remove_port().
+ * See new_port() and remove_port().
*/
void
JackMidiDriver::add_port(DriverPort* port)
diff --git a/src/libs/engine/MidiDriver.hpp b/src/libs/engine/MidiDriver.hpp
index 8f603630..bd801eb4 100644
--- a/src/libs/engine/MidiDriver.hpp
+++ b/src/libs/engine/MidiDriver.hpp
@@ -80,7 +80,7 @@ public:
void enable() {}
void disable() {}
- DriverPort* create_port(DuplexPort* patch_port) { return NULL; }
+ DriverPort* new_port(DuplexPort* patch_port) { return NULL; }
void add_port(DriverPort* port) {}
DriverPort* remove_port(const Raul::Path& path) { return NULL; }
diff --git a/src/libs/engine/OSCClientSender.cpp b/src/libs/engine/OSCClientSender.cpp
index 2139a49a..2c7b5825 100644
--- a/src/libs/engine/OSCClientSender.cpp
+++ b/src/libs/engine/OSCClientSender.cpp
@@ -445,19 +445,19 @@ OSCClientSender::disconnect(const std::string& src_port_path, const std::string&
/** \page client_osc_namespace
- * <p> \b /ingen/variable_change - Notification of a piece of variable.
+ * <p> \b /ingen/set_variable - 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)</p> \n \n
*/
void
-OSCClientSender::variable_change(const std::string& path, const std::string& key, const Atom& value)
+OSCClientSender::set_variable(const std::string& path, const std::string& key, const Atom& value)
{
lo_message m = lo_message_new();
lo_message_add_string(m, path.c_str());
lo_message_add_string(m, key.c_str());
Raul::AtomLiblo::lo_message_add_atom(m, value);
- send_message("/ingen/variable_change", m);
+ send_message("/ingen/set_variable", m);
}
@@ -542,7 +542,7 @@ OSCClientSender::new_patch(const std::string& path, uint32_t poly)
// Send variables
const map<const std::string&, const std::string&>& data = p->variable();
for (map<const std::string&, const std::string&>::const_iterator i = data.begin(); i != data.end(); ++i) {
- variable_change(p->path(), (*i).first, (*i).second);
+ set_variable(p->path(), (*i).first, (*i).second);
}
*/
}
diff --git a/src/libs/engine/OSCClientSender.hpp b/src/libs/engine/OSCClientSender.hpp
index d102790d..77cafbd8 100644
--- a/src/libs/engine/OSCClientSender.hpp
+++ b/src/libs/engine/OSCClientSender.hpp
@@ -33,6 +33,8 @@ using std::cerr;
namespace Ingen {
+namespace Shared { class EngineInterface; }
+
/** Implements ClientInterface for OSC clients (sends OSC messages).
*
@@ -115,9 +117,9 @@ public:
virtual void disconnect(const std::string& src_port_path,
const std::string& dst_port_path);
- virtual void variable_change(const std::string& subject_path,
- const std::string& predicate,
- const Raul::Atom& value);
+ virtual void set_variable(const std::string& subject_path,
+ const std::string& predicate,
+ const Raul::Atom& value);
virtual void control_change(const std::string& port_path,
float value);
diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp
index 5c1318cd..e8f22a2d 100644
--- a/src/libs/engine/OSCEngineReceiver.cpp
+++ b/src/libs/engine/OSCEngineReceiver.cpp
@@ -93,11 +93,11 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
lo_server_add_method(_server, "/ingen/set_polyphony", "isi", set_polyphony_cb, this);
lo_server_add_method(_server, "/ingen/set_polyphonic", "isT", set_polyphonic_cb, this);
lo_server_add_method(_server, "/ingen/set_polyphonic", "isF", set_polyphonic_cb, this);
- lo_server_add_method(_server, "/ingen/create_port", "issi", create_port_cb, this);
- lo_server_add_method(_server, "/ingen/create_node", "issssT", create_node_cb, this);
- lo_server_add_method(_server, "/ingen/create_node", "issssF", create_node_cb, this);
- lo_server_add_method(_server, "/ingen/create_node", "issT", create_node_by_uri_cb, this);
- lo_server_add_method(_server, "/ingen/create_node", "issF", create_node_by_uri_cb, this);
+ lo_server_add_method(_server, "/ingen/new_port", "issi", new_port_cb, this);
+ lo_server_add_method(_server, "/ingen/new_node", "issssT", new_node_cb, this);
+ lo_server_add_method(_server, "/ingen/new_node", "issssF", new_node_cb, this);
+ lo_server_add_method(_server, "/ingen/new_node", "issT", new_node_by_uri_cb, this);
+ lo_server_add_method(_server, "/ingen/new_node", "issF", new_node_by_uri_cb, this);
lo_server_add_method(_server, "/ingen/destroy", "is", destroy_cb, this);
lo_server_add_method(_server, "/ingen/rename", "iss", rename_cb, this);
lo_server_add_method(_server, "/ingen/connect", "iss", connect_cb, this);
@@ -486,44 +486,44 @@ OSCEngineReceiver::_set_polyphonic_cb(const char* path, const char* types, lo_ar
/** \page engine_osc_namespace
- * <p> \b /ingen/create_port - Add a port into a given patch (load a plugin by URI)
+ * <p> \b /ingen/new_port - Add a port into a given patch (load a plugin by URI)
* \arg \b response-id (integer)
* \arg \b path (string) - Full path of the new port (ie. /patch2/subpatch/newport)
* \arg \b data-type (string) - Type of port (ingen:AudioPort, ingen:ControlPort, ingen:MIDIPort, or ingen:OSCPort)
* \arg \b direction ("is-output") (integer) - Direction of data flow (Input = 0, Output = 1) </p> \n \n
*/
int
-OSCEngineReceiver::_create_port_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
+OSCEngineReceiver::_new_port_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
const char* port_path = &argv[1]->s;
const char* data_type = &argv[2]->s;
const int32_t direction = argv[3]->i;
- create_port(port_path, data_type, (direction == 1));
+ new_port(port_path, data_type, (direction == 1));
return 0;
}
/** \page engine_osc_namespace
- * <p> \b /ingen/create_node - Add a node into a given patch (load a plugin by URI)
+ * <p> \b /ingen/new_node - Add a node into a given patch (load a plugin by URI)
* \arg \b response-id (integer)
* \arg \b node-path (string) - Full path of the new node (ie. /patch2/subpatch/newnode)
* \arg \b plug-uri (string) - URI of the plugin to load
* \arg \b polyphonic (boolean) - Whether node is polyphonic </p> \n \n
*/
int
-OSCEngineReceiver::_create_node_by_uri_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
+OSCEngineReceiver::_new_node_by_uri_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
const char* node_path = &argv[1]->s;
const char* plug_uri = &argv[2]->s;
bool polyphonic = (types[3] == 'T');
- create_node(node_path, plug_uri, polyphonic);
+ new_node(node_path, plug_uri, polyphonic);
return 0;
}
/** \page engine_osc_namespace
- * <p> \b /ingen/create_node - Add a node into a given patch (load a plugin by libname, label) \b DEPRECATED
+ * <p> \b /ingen/new_node - Add a node into a given patch (load a plugin by libname, label) \b DEPRECATED
* \arg \b response-id (integer)
* \arg \b node-path (string) - Full path of the new node (ie. /patch2/subpatch/newnode)
* \arg \b type (string) - Plugin type ("LADSPA" or "Internal")
@@ -536,7 +536,7 @@ OSCEngineReceiver::_create_node_by_uri_cb(const char* path, const char* types, l
* </p> \n \n
*/
int
-OSCEngineReceiver::_create_node_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
+OSCEngineReceiver::_new_node_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
const char* node_path = &argv[1]->s;
const char* type = &argv[2]->s;
@@ -544,7 +544,7 @@ OSCEngineReceiver::_create_node_cb(const char* path, const char* types, lo_arg**
const char* plug_label = &argv[4]->s;
bool polyphonic = (types[5] == 'T');
- create_node(node_path, type, lib_name, plug_label, polyphonic);
+ new_node(node_path, type, lib_name, plug_label, polyphonic);
return 0;
}
diff --git a/src/libs/engine/OSCEngineReceiver.hpp b/src/libs/engine/OSCEngineReceiver.hpp
index 006192bf..35d7d531 100644
--- a/src/libs/engine/OSCEngineReceiver.hpp
+++ b/src/libs/engine/OSCEngineReceiver.hpp
@@ -95,9 +95,9 @@ private:
LO_HANDLER(engine_deactivate);
LO_HANDLER(new_patch);
LO_HANDLER(rename);
- LO_HANDLER(create_port);
- LO_HANDLER(create_node);
- LO_HANDLER(create_node_by_uri);
+ LO_HANDLER(new_port);
+ LO_HANDLER(new_node);
+ LO_HANDLER(new_node_by_uri);
LO_HANDLER(enable_patch);
LO_HANDLER(disable_patch);
LO_HANDLER(clear_patch);
diff --git a/src/libs/engine/ObjectSender.cpp b/src/libs/engine/ObjectSender.cpp
index 47312226..5a4436c0 100644
--- a/src/libs/engine/ObjectSender.cpp
+++ b/src/libs/engine/ObjectSender.cpp
@@ -41,7 +41,7 @@ ObjectSender::send_patch(ClientInterface* client, const PatchImpl* patch, bool r
// 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);
+ client->set_variable(patch->path(), (*j).first, (*j).second);
if (patch->enabled())
client->patch_enabled(patch->path());
@@ -101,7 +101,7 @@ ObjectSender::send_node(ClientInterface* client, const NodeImpl* node, bool recu
// 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->set_variable(node->path(), (*j).first, (*j).second);
client->bundle_end();
@@ -126,7 +126,7 @@ ObjectSender::send_port(ClientInterface* client, const PortImpl* port)
// 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);
+ client->set_variable(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 3aa96aee..5a174bf6 100644
--- a/src/libs/engine/QueuedEngineInterface.cpp
+++ b/src/libs/engine/QueuedEngineInterface.cpp
@@ -145,18 +145,18 @@ QueuedEngineInterface::new_patch(const string& path,
}
-void QueuedEngineInterface::create_port(const string& path,
- const string& data_type,
- bool direction)
+void QueuedEngineInterface::new_port(const string& path,
+ const string& data_type,
+ bool direction)
{
push_queued(new CreatePortEvent(_engine, _responder, now(), path, data_type, direction, this));
}
void
-QueuedEngineInterface::create_node(const string& path,
- const string& plugin_uri,
- bool polyphonic)
+QueuedEngineInterface::new_node(const string& path,
+ const string& plugin_uri,
+ bool polyphonic)
{
push_queued(new CreateNodeEvent(_engine, _responder, now(),
path, plugin_uri, polyphonic));
@@ -164,11 +164,11 @@ QueuedEngineInterface::create_node(const string& path,
void
-QueuedEngineInterface::create_node(const string& path,
- const string& plugin_type,
- const string& plugin_lib,
- const string& plugin_label,
- bool polyphonic)
+QueuedEngineInterface::new_node(const string& path,
+ const string& plugin_type,
+ const string& plugin_lib,
+ const string& plugin_label,
+ bool polyphonic)
{
push_queued(new CreateNodeEvent(_engine, _responder, now(),
path, plugin_type, plugin_lib, plugin_label, polyphonic));
diff --git a/src/libs/engine/QueuedEngineInterface.hpp b/src/libs/engine/QueuedEngineInterface.hpp
index e8a8669d..36f16aec 100644
--- a/src/libs/engine/QueuedEngineInterface.hpp
+++ b/src/libs/engine/QueuedEngineInterface.hpp
@@ -78,26 +78,26 @@ public:
// Bundles
virtual void bundle_begin();
virtual void bundle_end();
-
+
// Object commands
virtual void new_patch(const string& path,
uint32_t poly);
- virtual void create_port(const string& path,
- const string& data_type,
- bool direction);
+ virtual void new_port(const string& path,
+ const string& data_type,
+ bool direction);
- virtual void create_node(const string& path,
- const string& plugin_uri,
- bool polyphonic);
+ virtual void new_node(const string& path,
+ const string& plugin_uri,
+ bool polyphonic);
/** FIXME: DEPRECATED, REMOVE */
- virtual void create_node(const string& path,
- const string& plugin_type,
- const string& lib_path,
- const string& plug_label,
- bool polyphonic);
+ virtual void new_node(const string& path,
+ const string& plugin_type,
+ const string& lib_path,
+ const string& plug_label,
+ bool polyphonic);
virtual void rename(const string& old_path,
const string& new_name);
diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp
index 4a7571bb..23a3ac7b 100644
--- a/src/libs/engine/events/RequestMetadataEvent.cpp
+++ b/src/libs/engine/events/RequestMetadataEvent.cpp
@@ -64,7 +64,7 @@ RequestMetadataEvent::post_process()
_responder->respond_error(msg);
} else {
_responder->respond_ok();
- _responder->client()->variable_change(_path, _key, _value);
+ _responder->client()->set_variable(_path, _key, _value);
}
} else {
_responder->respond_error("Unknown client");
diff --git a/src/libs/gui/LoadPluginWindow.cpp b/src/libs/gui/LoadPluginWindow.cpp
index b2f09ee8..5aa07c27 100644
--- a/src/libs/gui/LoadPluginWindow.cpp
+++ b/src/libs/gui/LoadPluginWindow.cpp
@@ -345,7 +345,7 @@ LoadPluginWindow::add_clicked()
dialog.run();
} else {
Path path = _patch->path().base() + Path::nameify(name);
- App::instance().engine()->create_node(path, plugin->uri(), polyphonic);
+ App::instance().engine()->new_node(path, plugin->uri(), polyphonic);
for (GraphObject::Variables::const_iterator i = _initial_data.begin(); i != _initial_data.end(); ++i)
App::instance().engine()->set_variable(path, i->first, i->second);
_node_name_entry->set_text(generate_module_name(++_plugin_name_offset));
diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp
index 59011721..77078831 100644
--- a/src/libs/gui/PatchCanvas.cpp
+++ b/src/libs/gui/PatchCanvas.cpp
@@ -606,7 +606,7 @@ PatchCanvas::menu_add_port(const string& name, const string& type, bool is_outpu
{
// FIXME: bundleify
const Path& path = _patch->path().base() + generate_port_name(name);
- App::instance().engine()->create_port(path, type, is_output);
+ App::instance().engine()->new_port(path, type, is_output);
GraphObject::Variables data = get_initial_data();
for (GraphObject::Variables::const_iterator i = data.begin(); i != data.end(); ++i)
App::instance().engine()->set_variable(path, i->first, i->second);
@@ -626,7 +626,7 @@ PatchCanvas::load_plugin(SharedPtr<PluginModel> plugin)
const Path path = _patch->path().base() + name;
// FIXME: polyphony?
- App::instance().engine()->create_node(path, plugin->uri(), false);
+ App::instance().engine()->new_node(path, plugin->uri(), false);
GraphObject::Variables data = get_initial_data();
for (GraphObject::Variables::const_iterator i = data.begin(); i != data.end(); ++i)
App::instance().engine()->set_variable(path, i->first, i->second);
diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Loader.cpp
index c9b01bf8..ec06d0bc 100644
--- a/src/libs/serialisation/Loader.cpp
+++ b/src/libs/serialisation/Loader.cpp
@@ -151,7 +151,7 @@ Loader::load(Ingen::Shared::World* world,
if (poly_node.is_bool() && poly_node.to_bool() == true)
node_polyphonic = true;
- world->engine->create_node(node_path, node_plugin, node_polyphonic);
+ world->engine->new_node(node_path, node_plugin, node_polyphonic);
created.insert(node_path);
}
@@ -249,7 +249,7 @@ Loader::load(Ingen::Shared::World* world,
if (created.find(port_path) == created.end()) {
bool is_output = (type == "ingen:OutputPort"); // FIXME: check validity
- world->engine->create_port(port_path, datatype, is_output);
+ world->engine->new_port(port_path, datatype, is_output);
created.insert(port_path);
}