summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
Diffstat (limited to 'ingen')
-rw-r--r--ingen/Connection.hpp4
-rw-r--r--ingen/Interface.hpp10
-rw-r--r--ingen/client/ClientStore.hpp18
-rw-r--r--ingen/client/EdgeModel.hpp (renamed from ingen/client/ConnectionModel.hpp)36
-rw-r--r--ingen/client/PatchModel.hpp16
-rw-r--r--ingen/client/SigClientInterface.hpp10
-rw-r--r--ingen/client/ThreadedSigClientInterface.hpp10
-rw-r--r--ingen/shared/AtomWriter.hpp8
-rw-r--r--ingen/shared/ClashAvoider.hpp8
9 files changed, 60 insertions, 60 deletions
diff --git a/ingen/Connection.hpp b/ingen/Connection.hpp
index 6bb92d3a..7ff34847 100644
--- a/ingen/Connection.hpp
+++ b/ingen/Connection.hpp
@@ -30,8 +30,8 @@ class Connection
public:
virtual ~Connection() {}
- virtual const Raul::Path& src_port_path() const = 0;
- virtual const Raul::Path& dst_port_path() const = 0;
+ virtual const Raul::Path& tail_path() const = 0;
+ virtual const Raul::Path& head_path() const = 0;
};
} // namespace Ingen
diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp
index c1472e5e..0a3411a1 100644
--- a/ingen/Interface.hpp
+++ b/ingen/Interface.hpp
@@ -59,13 +59,13 @@ public:
virtual void del(const Raul::URI& uri) = 0;
- virtual void connect(const Raul::Path& src_port_path,
- const Raul::Path& dst_port_path) = 0;
+ virtual void connect(const Raul::Path& tail,
+ const Raul::Path& head) = 0;
- virtual void disconnect(const Raul::URI& src,
- const Raul::URI& dst) = 0;
+ virtual void disconnect(const Raul::Path& tail,
+ const Raul::Path& head) = 0;
- virtual void disconnect_all(const Raul::Path& parent_patch_path,
+ virtual void disconnect_all(const Raul::Path& parent_patch,
const Raul::Path& path) = 0;
virtual void set_property(const Raul::URI& subject,
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index bd009f94..714bdb2d 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -91,13 +91,13 @@ public:
const Raul::URI& predicate,
const Raul::Atom& value);
- void connect(const Raul::Path& src_port_path,
- const Raul::Path& dst_port_path);
+ void connect(const Raul::Path& tail,
+ const Raul::Path& head);
- void disconnect(const Raul::URI& src,
- const Raul::URI& dst);
+ void disconnect(const Raul::Path& tail,
+ const Raul::Path& head);
- void disconnect_all(const Raul::Path& parent_patch_path,
+ void disconnect_all(const Raul::Path& parent_patch,
const Raul::Path& path);
void del(const Raul::URI& uri);
@@ -122,15 +122,15 @@ private:
void add_plugin(SharedPtr<PluginModel> plugin);
- SharedPtr<PatchModel> connection_patch(const Raul::Path& src_port_path,
- const Raul::Path& dst_port_path);
+ SharedPtr<PatchModel> connection_patch(const Raul::Path& tail_path,
+ const Raul::Path& head_path);
void bundle_begin() {}
void bundle_end() {}
// Slots for SigClientInterface signals
- bool attempt_connection(const Raul::Path& src_port_path,
- const Raul::Path& dst_port_path);
+ bool attempt_connection(const Raul::Path& tail_path,
+ const Raul::Path& head_path);
SharedPtr<Shared::URIs> _uris;
SharedPtr<Interface> _engine;
diff --git a/ingen/client/ConnectionModel.hpp b/ingen/client/EdgeModel.hpp
index 8fe653c5..9b409e92 100644
--- a/ingen/client/ConnectionModel.hpp
+++ b/ingen/client/EdgeModel.hpp
@@ -14,8 +14,8 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INGEN_CLIENT_CONNECTIONMODEL_HPP
-#define INGEN_CLIENT_CONNECTIONMODEL_HPP
+#ifndef INGEN_CLIENT_EDGE_MODEL_HPP
+#define INGEN_CLIENT_EDGE_MODEL_HPP
#include <cassert>
@@ -34,34 +34,34 @@ class ClientStore;
*
* \ingroup IngenClient
*/
-class ConnectionModel : public Connection
+class EdgeModel : public Connection
{
public:
- SharedPtr<PortModel> src_port() const { return _src_port; }
- SharedPtr<PortModel> dst_port() const { return _dst_port; }
+ SharedPtr<PortModel> tail() const { return _tail; }
+ SharedPtr<PortModel> head() const { return _head; }
- const Raul::Path& src_port_path() const { return _src_port->path(); }
- const Raul::Path& dst_port_path() const { return _dst_port->path(); }
+ const Raul::Path& tail_path() const { return _tail->path(); }
+ const Raul::Path& head_path() const { return _head->path(); }
private:
friend class ClientStore;
- ConnectionModel(SharedPtr<PortModel> src, SharedPtr<PortModel> dst)
- : _src_port(src)
- , _dst_port(dst)
+ EdgeModel(SharedPtr<PortModel> tail, SharedPtr<PortModel> head)
+ : _tail(tail)
+ , _head(head)
{
- assert(_src_port);
- assert(_dst_port);
- assert(_src_port->parent());
- assert(_dst_port->parent());
- assert(_src_port->path() != _dst_port->path());
+ assert(_tail);
+ assert(_head);
+ assert(_tail->parent());
+ assert(_head->parent());
+ assert(_tail->path() != _head->path());
}
- const SharedPtr<PortModel> _src_port;
- const SharedPtr<PortModel> _dst_port;
+ const SharedPtr<PortModel> _tail;
+ const SharedPtr<PortModel> _head;
};
} // namespace Client
} // namespace Ingen
-#endif // INGEN_CLIENT_CONNECTIONMODEL_HPP
+#endif // INGEN_CLIENT_EDGE_MODEL_HPP
diff --git a/ingen/client/PatchModel.hpp b/ingen/client/PatchModel.hpp
index 7416aec5..1ea822bb 100644
--- a/ingen/client/PatchModel.hpp
+++ b/ingen/client/PatchModel.hpp
@@ -29,7 +29,7 @@ class Port;
namespace Client {
class ClientStore;
-class ConnectionModel;
+class EdgeModel;
/** Client's model of a patch.
*
@@ -42,8 +42,8 @@ public:
const Connections& connections() const { return *_connections.get(); }
- SharedPtr<ConnectionModel> get_connection(const Ingen::Port* src_port,
- const Ingen::Port* dst_port);
+ SharedPtr<EdgeModel> get_connection(const Ingen::Port* tail,
+ const Ingen::Port* head);
bool enabled() const;
bool polyphonic() const;
@@ -52,8 +52,8 @@ public:
// Signals
INGEN_SIGNAL(new_node, void, SharedPtr<NodeModel>);
INGEN_SIGNAL(removed_node, void, SharedPtr<NodeModel>);
- INGEN_SIGNAL(new_connection, void, SharedPtr<ConnectionModel>);
- INGEN_SIGNAL(removed_connection, void, SharedPtr<ConnectionModel>);
+ INGEN_SIGNAL(new_connection, void, SharedPtr<EdgeModel>);
+ INGEN_SIGNAL(removed_connection, void, SharedPtr<EdgeModel>);
private:
friend class ClientStore;
@@ -68,9 +68,9 @@ private:
void add_child(SharedPtr<ObjectModel> c);
bool remove_child(SharedPtr<ObjectModel> c);
- void add_connection(SharedPtr<ConnectionModel> cm);
- void remove_connection(const Ingen::Port* src_port,
- const Ingen::Port* dst_port);
+ void add_connection(SharedPtr<EdgeModel> cm);
+ void remove_connection(const Ingen::Port* tail,
+ const Ingen::Port* head);
SharedPtr<Connections> _connections;
};
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index 3afa6767..5c676efe 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -54,7 +54,7 @@ public:
INGEN_SIGNAL(object_moved, void, Raul::Path, Raul::Path)
INGEN_SIGNAL(object_deleted, void, Raul::URI)
INGEN_SIGNAL(connection, void, Raul::Path, Raul::Path)
- INGEN_SIGNAL(disconnection, void, Raul::URI, Raul::URI)
+ INGEN_SIGNAL(disconnection, void, Raul::Path, Raul::Path)
INGEN_SIGNAL(disconnect_all, void, Raul::Path, Raul::Path)
INGEN_SIGNAL(variable_change, void, Raul::URI, Raul::URI, Raul::Atom)
INGEN_SIGNAL(property_change, void, Raul::URI, Raul::URI, Raul::Atom)
@@ -91,8 +91,8 @@ protected:
const Resource::Properties& add)
{ EMIT(delta, uri, remove, add); }
- void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path)
- { EMIT(connection, src_port_path, dst_port_path); }
+ void connect(const Raul::Path& tail, const Raul::Path& head)
+ { EMIT(connection, tail, head); }
void del(const Raul::URI& uri)
{ EMIT(object_deleted, uri); }
@@ -100,8 +100,8 @@ protected:
void move(const Raul::Path& old_path, const Raul::Path& new_path)
{ EMIT(object_moved, old_path, new_path); }
- void disconnect(const Raul::URI& src, const Raul::URI& dst)
- { EMIT(disconnection, src, dst); }
+ void disconnect(const Raul::Path& tail, const Raul::Path& head)
+ { EMIT(disconnection, tail, head); }
void disconnect_all(const Raul::Path& parent_patch_path, const Raul::Path& path)
{ EMIT(disconnect_all, parent_patch_path, path); }
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index c4859e0a..7d70113f 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -90,8 +90,8 @@ public:
const Resource::Properties& add)
{ push_sig(sigc::bind(delta_slot, path, remove, add)); }
- void connect(const Raul::Path& src_port_path, const Raul::Path& dst_port_path)
- { push_sig(sigc::bind(connection_slot, src_port_path, dst_port_path)); }
+ void connect(const Raul::Path& tail, const Raul::Path& head)
+ { push_sig(sigc::bind(connection_slot, tail, head)); }
void del(const Raul::URI& uri)
{ push_sig(sigc::bind(object_deleted_slot, uri)); }
@@ -99,8 +99,8 @@ public:
void move(const Raul::Path& old_path, const Raul::Path& new_path)
{ push_sig(sigc::bind(object_moved_slot, old_path, new_path)); }
- void disconnect(const Raul::URI& src, const Raul::URI& dst)
- { push_sig(sigc::bind(disconnection_slot, src, dst)); }
+ void disconnect(const Raul::Path& tail, const Raul::Path& head)
+ { push_sig(sigc::bind(disconnection_slot, tail, head)); }
void disconnect_all(const Raul::Path& parent_patch_path, const Raul::Path& path)
{ push_sig(sigc::bind(disconnect_all_slot, parent_patch_path, path)); }
@@ -132,7 +132,7 @@ private:
sigc::slot<void, Raul::Path, Raul::Path> connection_slot;
sigc::slot<void, Raul::URI> object_deleted_slot;
sigc::slot<void, Raul::Path, Raul::Path> object_moved_slot;
- sigc::slot<void, Raul::URI, Raul::URI> disconnection_slot;
+ sigc::slot<void, Raul::Path, Raul::Path> disconnection_slot;
sigc::slot<void, Raul::Path, Raul::Path> disconnect_all_slot;
sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> variable_change_slot;
sigc::slot<void, Raul::URI, Raul::URI, Raul::Atom> property_change_slot;
diff --git a/ingen/shared/AtomWriter.hpp b/ingen/shared/AtomWriter.hpp
index a59f11c8..3b70bb89 100644
--- a/ingen/shared/AtomWriter.hpp
+++ b/ingen/shared/AtomWriter.hpp
@@ -54,11 +54,11 @@ public:
void del(const Raul::URI& uri);
- void connect(const Raul::Path& src_port_path,
- const Raul::Path& dst_port_path);
+ void connect(const Raul::Path& tail,
+ const Raul::Path& head);
- void disconnect(const Raul::URI& src,
- const Raul::URI& dst);
+ void disconnect(const Raul::Path& tail,
+ const Raul::Path& head);
void disconnect_all(const Raul::Path& parent_patch_path,
const Raul::Path& path);
diff --git a/ingen/shared/ClashAvoider.hpp b/ingen/shared/ClashAvoider.hpp
index 224eb509..5b62ef53 100644
--- a/ingen/shared/ClashAvoider.hpp
+++ b/ingen/shared/ClashAvoider.hpp
@@ -63,11 +63,11 @@ public:
virtual void move(const Raul::Path& old_path,
const Raul::Path& new_path);
- virtual void connect(const Raul::Path& src_port_path,
- const Raul::Path& dst_port_path);
+ virtual void connect(const Raul::Path& tail,
+ const Raul::Path& head);
- virtual void disconnect(const Raul::URI& src,
- const Raul::URI& dst);
+ virtual void disconnect(const Raul::Path& tail,
+ const Raul::Path& head);
virtual void disconnect_all(const Raul::Path& parent_patch_path,
const Raul::Path& path);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 06:51:06 +0000