summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
Diffstat (limited to 'ingen')
-rw-r--r--ingen/AtomWriter.hpp2
-rw-r--r--ingen/ClashAvoider.hpp2
-rw-r--r--ingen/GraphObject.hpp10
-rw-r--r--ingen/Interface.hpp2
-rw-r--r--ingen/Plugin.hpp8
-rw-r--r--ingen/Resource.hpp2
-rw-r--r--ingen/Store.hpp2
-rw-r--r--ingen/URIs.hpp2
-rw-r--r--ingen/client/BlockModel.hpp2
-rw-r--r--ingen/client/ClientStore.hpp6
-rw-r--r--ingen/client/GraphModel.hpp (renamed from ingen/client/PatchModel.hpp)20
-rw-r--r--ingen/client/ObjectModel.hpp2
-rw-r--r--ingen/client/PluginModel.hpp2
-rw-r--r--ingen/client/SigClientInterface.hpp4
-rw-r--r--ingen/client/ThreadedSigClientInterface.hpp4
-rw-r--r--ingen/serialisation/Serialiser.hpp2
16 files changed, 35 insertions, 37 deletions
diff --git a/ingen/AtomWriter.hpp b/ingen/AtomWriter.hpp
index 63c86028..37f91e74 100644
--- a/ingen/AtomWriter.hpp
+++ b/ingen/AtomWriter.hpp
@@ -63,7 +63,7 @@ public:
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& graph,
const Raul::Path& path);
void set_property(const Raul::URI& subject,
diff --git a/ingen/ClashAvoider.hpp b/ingen/ClashAvoider.hpp
index db3c1b60..49a3000a 100644
--- a/ingen/ClashAvoider.hpp
+++ b/ingen/ClashAvoider.hpp
@@ -71,7 +71,7 @@ public:
virtual void disconnect(const Raul::Path& tail,
const Raul::Path& head);
- virtual void disconnect_all(const Raul::Path& parent_patch_path,
+ virtual void disconnect_all(const Raul::Path& graph,
const Raul::Path& path);
virtual void set_property(const Raul::URI& subject_path,
diff --git a/ingen/GraphObject.hpp b/ingen/GraphObject.hpp
index 5ad3b156..cca3af45 100644
--- a/ingen/GraphObject.hpp
+++ b/ingen/GraphObject.hpp
@@ -33,7 +33,7 @@ class Edge;
class Plugin;
class Store;
-/** An object on the audio graph - Patch, Block, Port, etc.
+/** An object on the audio graph - Graph, Block, Port, etc.
*
* @ingroup Ingen
*/
@@ -41,7 +41,7 @@ class GraphObject : public Resource
{
public:
enum GraphType {
- PATCH,
+ GRAPH,
BLOCK,
PORT
};
@@ -49,11 +49,11 @@ public:
typedef std::pair<const GraphObject*, const GraphObject*> EdgesKey;
typedef std::map< EdgesKey, SharedPtr<Edge> > Edges;
- // Patches only
+ // Graphs only
Edges& edges() { return _edges; }
const Edges& edges() const { return _edges; }
- // Blocks and patches only
+ // Blocks and graphs only
virtual uint32_t num_ports() const { return 0; }
virtual GraphObject* port(uint32_t index) const { return NULL; }
virtual const Plugin* plugin() const { return NULL; }
@@ -88,7 +88,7 @@ protected:
: Resource(uris, path_to_uri(path))
{}
- Edges _edges; ///< Patches only
+ Edges _edges; ///< Graphs only
};
} // namespace Ingen
diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp
index 0ad9e1ba..59749dec 100644
--- a/ingen/Interface.hpp
+++ b/ingen/Interface.hpp
@@ -78,7 +78,7 @@ public:
virtual void disconnect(const Raul::Path& tail,
const Raul::Path& head) = 0;
- virtual void disconnect_all(const Raul::Path& parent_patch,
+ virtual void disconnect_all(const Raul::Path& graph,
const Raul::Path& path) = 0;
virtual void set_property(const Raul::URI& subject,
diff --git a/ingen/Plugin.hpp b/ingen/Plugin.hpp
index 17601385..bc8220da 100644
--- a/ingen/Plugin.hpp
+++ b/ingen/Plugin.hpp
@@ -35,7 +35,7 @@ public:
: Resource(uris, uri)
{}
- enum Type { NIL, LV2, Internal, Patch };
+ enum Type { NIL, LV2, Internal, Graph };
virtual Type type() const = 0;
@@ -44,7 +44,7 @@ public:
Raul::URI("http://drobilla.net/ns/ingen#nil"),
Raul::URI(LV2_CORE__Plugin),
Raul::URI("http://drobilla.net/ns/ingen#Internal"),
- Raul::URI("http://drobilla.net/ns/ingen#Patch")
+ Raul::URI("http://drobilla.net/ns/ingen#Graph")
};
return uris[type];
@@ -57,8 +57,8 @@ public:
return LV2;
else if (uri == type_uri(Internal))
return Internal;
- else if (uri == type_uri(Patch))
- return Patch;
+ else if (uri == type_uri(Graph))
+ return Graph;
else
return NIL;
}
diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp
index c9bbc2ab..025a963f 100644
--- a/ingen/Resource.hpp
+++ b/ingen/Resource.hpp
@@ -158,7 +158,7 @@ public:
*/
static bool type(const URIs& uris,
const Properties& properties,
- bool& patch,
+ bool& graph,
bool& block,
bool& port,
bool& is_output);
diff --git a/ingen/Store.hpp b/ingen/Store.hpp
index 87f6f7e0..1f329484 100644
--- a/ingen/Store.hpp
+++ b/ingen/Store.hpp
@@ -28,7 +28,7 @@
namespace Ingen {
-/** Store of objects in the patch hierarchy.
+/** Store of objects in the graph hierarchy.
* @ingroup IngenShared
*/
class Store : public Raul::Noncopyable
diff --git a/ingen/URIs.hpp b/ingen/URIs.hpp
index 25a26c95..0fc05a4e 100644
--- a/ingen/URIs.hpp
+++ b/ingen/URIs.hpp
@@ -72,8 +72,8 @@ public:
const Quark doap_name;
const Quark ingen_Block;
const Quark ingen_Edge;
+ const Quark ingen_Graph;
const Quark ingen_Internal;
- const Quark ingen_Patch;
const Quark ingen_activity;
const Quark ingen_block;
const Quark ingen_broadcast;
diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp
index dbb0faf3..d0bae8de 100644
--- a/ingen/client/BlockModel.hpp
+++ b/ingen/client/BlockModel.hpp
@@ -48,7 +48,7 @@ public:
BlockModel(const BlockModel& copy);
virtual ~BlockModel();
- GraphType graph_type() const { return GraphObject::PATCH; }
+ GraphType graph_type() const { return GraphObject::GRAPH; }
typedef std::vector< SharedPtr<const PortModel> > Ports;
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index 6da7310e..e7e6105b 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -38,8 +38,8 @@ class URIs;
namespace Client {
class BlockModel;
+class GraphModel;
class ObjectModel;
-class PatchModel;
class PluginModel;
class PortModel;
class SigClientInterface;
@@ -94,7 +94,7 @@ public:
void disconnect(const Raul::Path& tail,
const Raul::Path& head);
- void disconnect_all(const Raul::Path& parent_patch,
+ void disconnect_all(const Raul::Path& graph,
const Raul::Path& path);
void del(const Raul::URI& uri);
@@ -117,7 +117,7 @@ private:
void add_plugin(SharedPtr<PluginModel> plugin);
- SharedPtr<PatchModel> connection_patch(const Raul::Path& tail_path,
+ SharedPtr<GraphModel> connection_graph(const Raul::Path& tail_path,
const Raul::Path& head_path);
void bundle_begin() {}
diff --git a/ingen/client/PatchModel.hpp b/ingen/client/GraphModel.hpp
index b4f56799..03a41891 100644
--- a/ingen/client/PatchModel.hpp
+++ b/ingen/client/GraphModel.hpp
@@ -14,8 +14,8 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INGEN_CLIENT_PATCHMODEL_HPP
-#define INGEN_CLIENT_PATCHMODEL_HPP
+#ifndef INGEN_CLIENT_GRAPHMODEL_HPP
+#define INGEN_CLIENT_GRAPHMODEL_HPP
#include "ingen/client/BlockModel.hpp"
#include "raul/SharedPtr.hpp"
@@ -26,16 +26,16 @@ namespace Client {
class ClientStore;
class EdgeModel;
-/** Client's model of a patch.
+/** Client's model of a graph.
*
* @ingroup IngenClient
*/
-class PatchModel : public BlockModel
+class GraphModel : public BlockModel
{
public:
/* WARNING: Copy constructor creates a shallow copy WRT connections */
- GraphType graph_type() const { return GraphObject::PATCH; }
+ GraphType graph_type() const { return GraphObject::GRAPH; }
SharedPtr<EdgeModel> get_edge(const Ingen::GraphObject* tail,
const Ingen::GraphObject* head);
@@ -53,11 +53,9 @@ public:
private:
friend class ClientStore;
- PatchModel(URIs& uris, const Raul::Path& patch_path)
- : BlockModel(
- uris, Raul::URI("http://drobilla.net/ns/ingen#Patch"), patch_path)
- {
- }
+ GraphModel(URIs& uris, const Raul::Path& graph_path)
+ : BlockModel(uris, uris.ingen_Graph, graph_path)
+ {}
void clear();
void add_child(SharedPtr<ObjectModel> c);
@@ -71,4 +69,4 @@ private:
} // namespace Client
} // namespace Ingen
-#endif // INGEN_CLIENT_PATCHMODEL_HPP
+#endif // INGEN_CLIENT_GRAPHMODEL_HPP
diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp
index b51e82e6..c9f4e6d1 100644
--- a/ingen/client/ObjectModel.hpp
+++ b/ingen/client/ObjectModel.hpp
@@ -41,7 +41,7 @@ namespace Client {
class ClientStore;
-/** Base class for all GraphObject models (BlockModel, PatchModel, PortModel).
+/** Base class for all GraphObject models (BlockModel, GraphModel, PortModel).
*
* There are no non-const public methods intentionally, models are not allowed
* to be manipulated directly by anything (but the Store) because of the
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp
index 7475e57a..7e082879 100644
--- a/ingen/client/PluginModel.hpp
+++ b/ingen/client/PluginModel.hpp
@@ -37,7 +37,7 @@ class URIs;
namespace Client {
-class PatchModel;
+class GraphModel;
class BlockModel;
class PluginUI;
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index a330d31e..dc6676f7 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -103,8 +103,8 @@ protected:
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); }
+ void disconnect_all(const Raul::Path& graph, const Raul::Path& path)
+ { EMIT(disconnect_all, graph, path); }
void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value)
{ EMIT(property_change, subject, key, value); }
diff --git a/ingen/client/ThreadedSigClientInterface.hpp b/ingen/client/ThreadedSigClientInterface.hpp
index 633bd265..a89108bc 100644
--- a/ingen/client/ThreadedSigClientInterface.hpp
+++ b/ingen/client/ThreadedSigClientInterface.hpp
@@ -101,8 +101,8 @@ public:
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)); }
+ void disconnect_all(const Raul::Path& graph, const Raul::Path& path)
+ { push_sig(sigc::bind(disconnect_all_slot, graph, path)); }
void set_property(const Raul::URI& subject, const Raul::URI& key, const Raul::Atom& value)
{ push_sig(sigc::bind(property_change_slot, subject, key, value)); }
diff --git a/ingen/serialisation/Serialiser.hpp b/ingen/serialisation/Serialiser.hpp
index b4c0dfd3..ae18693e 100644
--- a/ingen/serialisation/Serialiser.hpp
+++ b/ingen/serialisation/Serialiser.hpp
@@ -52,7 +52,7 @@ public:
virtual void to_file(SharedPtr<const GraphObject> object,
const std::string& filename);
- virtual void write_bundle(SharedPtr<const GraphObject> patch,
+ virtual void write_bundle(SharedPtr<const GraphObject> graph,
const std::string& path);
virtual std::string to_string(SharedPtr<const GraphObject> object,
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-30 15:22:34 +0000