summaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/ClientStore.cpp2
-rw-r--r--src/client/ClientStore.hpp2
-rw-r--r--src/client/DeprecatedLoader.cpp12
-rw-r--r--src/client/HTTPEngineSender.cpp2
-rw-r--r--src/client/HTTPEngineSender.hpp2
-rw-r--r--src/client/OSCClientReceiver.cpp2
-rw-r--r--src/client/OSCEngineSender.cpp4
-rw-r--r--src/client/OSCEngineSender.hpp2
-rw-r--r--src/client/SigClientInterface.hpp6
-rw-r--r--src/client/ThreadedSigClientInterface.hpp6
10 files changed, 20 insertions, 20 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 31ecbd3e..fbcf5929 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -452,7 +452,7 @@ ClientStore::new_node(const string& path, const string& plugin_uri)
void
-ClientStore::new_port(const string& path, uint32_t index, const string& type, bool is_output)
+ClientStore::new_port(const string& path, const string& type, uint32_t index, bool is_output)
{
PortModel::Direction pdir = is_output ? PortModel::OUTPUT : PortModel::INPUT;
diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp
index 4df8149b..291f9af9 100644
--- a/src/client/ClientStore.hpp
+++ b/src/client/ClientStore.hpp
@@ -72,7 +72,7 @@ public:
void new_plugin(const string& uri, const string& type_uri, const string& symbol, const string& name);
void new_patch(const string& path, uint32_t poly);
void new_node(const string& path, const string& plugin_uri);
- void new_port(const string& path, uint32_t index, const string& data_type, bool is_output);
+ void new_port(const string& path, const string& type, uint32_t index, bool is_output);
void set_variable(const string& subject_path, const string& predicate, const Atom& value);
void set_property(const string& subject_path, const string& predicate, const Atom& value);
void set_port_value(const string& port_path, const Raul::Atom& value);
diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp
index 256b2947..a93fd96d 100644
--- a/src/client/DeprecatedLoader.cpp
+++ b/src/client/DeprecatedLoader.cpp
@@ -457,22 +457,22 @@ DeprecatedLoader::load_node(const Path& parent, xmlDocPtr doc, const xmlNodePtr
if (plugin_type == "Internal") {
// FIXME: indices
if (plugin_label == "audio_input") {
- _engine->new_port(path, 0, "lv2:AudioPort", false);
+ _engine->new_port(path, "lv2:AudioPort", 0, false);
is_port = true;
} else if (plugin_label == "audio_output") {
- _engine->new_port(path, 0, "lv2:AudioPort", true);
+ _engine->new_port(path, "lv2:AudioPort", 0, true);
is_port = true;
} else if (plugin_label == "control_input") {
- _engine->new_port(path, 0, "lv2:ControlPort", false);
+ _engine->new_port(path, "lv2:ControlPort", 0, false);
is_port = true;
} else if (plugin_label == "control_output" ) {
- _engine->new_port(path, 0, "lv2:ControlPort", true);
+ _engine->new_port(path, "lv2:ControlPort", 0, true);
is_port = true;
} else if (plugin_label == "midi_input") {
- _engine->new_port(path, 0, "ingen:EventPort", false);
+ _engine->new_port(path, "ingen:EventPort", 0, false);
is_port = true;
} else if (plugin_label == "midi_output" ) {
- _engine->new_port(path, 0, "ingen:EventPort", true);
+ _engine->new_port(path, "ingen:EventPort", 0, true);
is_port = true;
} else {
cerr << "WARNING: Unknown internal plugin label \"" << plugin_label << "\"" << endl;
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index 312c10ba..7a6366e0 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -109,8 +109,8 @@ HTTPEngineSender::new_patch(const string& path,
void
HTTPEngineSender::new_port(const string& path,
+ const string& type,
uint32_t index,
- const string& data_type,
bool is_output)
{
}
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 411ddfd5..67cf9152 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -80,8 +80,8 @@ public:
uint32_t poly);
void new_port(const string& path,
+ const string& type,
uint32_t index,
- const string& data_type,
bool is_output);
void new_node(const string& path,
diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp
index f1c4e4eb..fa191206 100644
--- a/src/client/OSCClientReceiver.cpp
+++ b/src/client/OSCClientReceiver.cpp
@@ -251,7 +251,7 @@ OSCClientReceiver::_new_port_cb(const char* path, const char* types, lo_arg** ar
const char* type = &argv[2]->s;
const bool is_output = (argv[3]->i == 1);
- _target->new_port(port_path, index, type, is_output);
+ _target->new_port(port_path, type, index, is_output);
return 0;
}
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 0111ac8f..1eb9ad6e 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -141,15 +141,15 @@ OSCEngineSender::new_patch(const string& path,
void
OSCEngineSender::new_port(const string& path,
+ const string& type,
uint32_t index,
- const string& data_type,
bool is_output)
{
// FIXME: use index
send("/ingen/new_port", "issi",
next_id(),
path.c_str(),
- data_type.c_str(),
+ type.c_str(),
(is_output ? 1 : 0),
LO_ARGS_END);
}
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index ea156c34..12b062e4 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -84,8 +84,8 @@ public:
uint32_t poly);
void new_port(const string& path,
+ const string& type,
uint32_t index,
- const string& data_type,
bool is_output);
void new_node(const string& path,
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 7ab32c12..63586832 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -56,7 +56,7 @@ public:
sigc::signal<void, string, string, string, string> signal_new_plugin;
sigc::signal<void, string, uint32_t> signal_new_patch;
sigc::signal<void, string, string> signal_new_node;
- sigc::signal<void, string, uint32_t, string, bool> signal_new_port;
+ sigc::signal<void, string, string, uint32_t, bool> signal_new_port;
sigc::signal<void, string> signal_patch_cleared;
sigc::signal<void, string, string> signal_object_renamed;
sigc::signal<void, string> signal_object_destroyed;
@@ -109,8 +109,8 @@ protected:
void new_node(const string& path, const string& plugin_uri)
{ if (_enabled) signal_new_node.emit(path, plugin_uri); }
- void new_port(const string& path, uint32_t index, const string& data_type, bool is_output)
- { if (_enabled) signal_new_port.emit(path, index, data_type, is_output); }
+ void new_port(const string& path, const string& type, uint32_t index, bool is_output)
+ { if (_enabled) signal_new_port.emit(path, type, index, is_output); }
void connect(const string& src_port_path, const string& dst_port_path)
{ if (_enabled) signal_connection.emit(src_port_path, dst_port_path); }
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index a5a667df..f31ba37b 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -103,8 +103,8 @@ public:
void new_node(const string& path, const string& plugin_uri)
{ push_sig(sigc::bind(new_node_slot, path, plugin_uri)); }
- void new_port(const string& path, uint32_t index, const string& data_type, bool is_output)
- { push_sig(sigc::bind(new_port_slot, path, index, data_type, is_output)); }
+ void new_port(const string& path, const string& type, uint32_t index, bool is_output)
+ { push_sig(sigc::bind(new_port_slot, path, type, index, is_output)); }
void connect(const string& src_port_path, const string& dst_port_path)
{ push_sig(sigc::bind(connection_slot, src_port_path, dst_port_path)); }
@@ -162,7 +162,7 @@ private:
sigc::slot<void, string, string, string, string> new_plugin_slot;
sigc::slot<void, string, uint32_t> new_patch_slot;
sigc::slot<void, string, string> new_node_slot;
- sigc::slot<void, string, uint32_t, string, bool> new_port_slot;
+ sigc::slot<void, string, string, uint32_t, bool> new_port_slot;
sigc::slot<void, string, string> connection_slot;
sigc::slot<void, string> patch_cleared_slot;
sigc::slot<void, string> object_destroyed_slot;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 18:38:40 +0000