summaryrefslogtreecommitdiffstats
path: root/ingen/client
diff options
context:
space:
mode:
Diffstat (limited to 'ingen/client')
-rw-r--r--ingen/client/ArcModel.hpp (renamed from ingen/client/EdgeModel.hpp)12
-rw-r--r--ingen/client/GraphModel.hpp16
2 files changed, 14 insertions, 14 deletions
diff --git a/ingen/client/EdgeModel.hpp b/ingen/client/ArcModel.hpp
index 9006dd80..99d5afa0 100644
--- a/ingen/client/EdgeModel.hpp
+++ b/ingen/client/ArcModel.hpp
@@ -14,15 +14,15 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INGEN_CLIENT_EDGEMODEL_HPP
-#define INGEN_CLIENT_EDGEMODEL_HPP
+#ifndef INGEN_CLIENT_ARCMODEL_HPP
+#define INGEN_CLIENT_ARCMODEL_HPP
#include <cassert>
#include "raul/Path.hpp"
#include "raul/SharedPtr.hpp"
-#include "ingen/Edge.hpp"
+#include "ingen/Arc.hpp"
#include "ingen/client/PortModel.hpp"
namespace Ingen {
@@ -34,7 +34,7 @@ class ClientStore;
*
* @ingroup IngenClient
*/
-class EdgeModel : public Edge
+class ArcModel : public Arc
{
public:
SharedPtr<PortModel> tail() const { return _tail; }
@@ -46,7 +46,7 @@ public:
private:
friend class ClientStore;
- EdgeModel(SharedPtr<PortModel> tail, SharedPtr<PortModel> head)
+ ArcModel(SharedPtr<PortModel> tail, SharedPtr<PortModel> head)
: _tail(tail)
, _head(head)
{
@@ -64,4 +64,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // INGEN_CLIENT_EDGEMODEL_HPP
+#endif // INGEN_CLIENT_ARCMODEL_HPP
diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp
index d527eb82..a721dc37 100644
--- a/ingen/client/GraphModel.hpp
+++ b/ingen/client/GraphModel.hpp
@@ -23,8 +23,8 @@
namespace Ingen {
namespace Client {
+class ArcModel;
class ClientStore;
-class EdgeModel;
/** Client's model of a graph.
*
@@ -37,8 +37,8 @@ public:
GraphType graph_type() const { return Node::GRAPH; }
- SharedPtr<EdgeModel> get_edge(const Ingen::Node* tail,
- const Ingen::Node* head);
+ SharedPtr<ArcModel> get_arc(const Ingen::Node* tail,
+ const Ingen::Node* head);
bool enabled() const;
bool polyphonic() const;
@@ -47,8 +47,8 @@ public:
// Signals
INGEN_SIGNAL(new_block, void, SharedPtr<BlockModel>);
INGEN_SIGNAL(removed_block, void, SharedPtr<BlockModel>);
- INGEN_SIGNAL(new_edge, void, SharedPtr<EdgeModel>);
- INGEN_SIGNAL(removed_edge, void, SharedPtr<EdgeModel>);
+ INGEN_SIGNAL(new_arc, void, SharedPtr<ArcModel>);
+ INGEN_SIGNAL(removed_arc, void, SharedPtr<ArcModel>);
private:
friend class ClientStore;
@@ -61,9 +61,9 @@ private:
void add_child(SharedPtr<ObjectModel> c);
bool remove_child(SharedPtr<ObjectModel> c);
- void add_edge(SharedPtr<EdgeModel> cm);
- void remove_edge(const Ingen::Node* tail,
- const Ingen::Node* head);
+ void add_arc(SharedPtr<ArcModel> arc);
+ void remove_arc(const Ingen::Node* tail,
+ const Ingen::Node* head);
};
} // namespace Client