summaryrefslogtreecommitdiffstats
path: root/src/libs/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/engine')
-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
11 files changed, 56 insertions, 54 deletions
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");
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 07:20:28 +0000