summaryrefslogtreecommitdiffstats
path: root/src/client/PatchModel.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-05-13 04:05:32 +0000
committerDavid Robillard <d@drobilla.net>2009-05-13 04:05:32 +0000
commit19928bb583e72802746b89e322f71ecc0fcb7427 (patch)
tree95912dc84d8c9dcf57939398514feaf148c1cd63 /src/client/PatchModel.hpp
parent96f839e64de70a23210847e322d24690299287fe (diff)
downloadingen-19928bb583e72802746b89e322f71ecc0fcb7427.tar.gz
ingen-19928bb583e72802746b89e322f71ecc0fcb7427.tar.bz2
ingen-19928bb583e72802746b89e322f71ecc0fcb7427.zip
The great ID refactoring of 2009.
Path is now actually URI (scheme path: for now). Therefore ingen nodes and such live in the same namespace as ... well, everything. Including plugins. Thar be profit, laddies. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1992 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client/PatchModel.hpp')
-rw-r--r--src/client/PatchModel.hpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp
index 4a8b3ee7..b07924cc 100644
--- a/src/client/PatchModel.hpp
+++ b/src/client/PatchModel.hpp
@@ -19,7 +19,6 @@
#define PATCHMODEL_H
#include <cassert>
-#include <string>
#include <sigc++/sigc++.h>
#include "raul/SharedPtr.hpp"
#include "interface/Patch.hpp"
@@ -27,8 +26,6 @@
#include "ConnectionModel.hpp"
-using std::string;
-
namespace Ingen {
namespace Client {
@@ -46,8 +43,8 @@ public:
const Connections& connections() const { return *_connections.get(); }
- SharedPtr<ConnectionModel> get_connection(const string& src_port_path,
- const string& dst_port_path) const;
+ SharedPtr<ConnectionModel> get_connection(const Raul::Path& src_port_path,
+ const Raul::Path& dst_port_path) const;
uint32_t poly() const { return _poly; }
uint32_t internal_polyphony() const { return _poly; }
@@ -63,7 +60,7 @@ public:
signal_editable.emit(e);
} }
- virtual void set_variable(const string& key, const Atom& value);
+ virtual void set_variable(const Raul::URI& key, const Raul::Atom& value);
// Signals
sigc::signal<void, SharedPtr<NodeModel> > signal_new_node;
@@ -75,7 +72,7 @@ public:
private:
friend class ClientStore;
- PatchModel(const Path& patch_path, size_t internal_poly)
+ PatchModel(const Raul::Path& patch_path, size_t internal_poly)
: NodeModel("ingen:Patch", patch_path)
, _connections(new Connections())
, _poly(internal_poly)
@@ -88,15 +85,13 @@ private:
bool remove_child(SharedPtr<ObjectModel> c);
void add_connection(SharedPtr<ConnectionModel> cm);
- void remove_connection(const string& src_port_path, const string& dst_port_path);
+ void remove_connection(const Raul::Path& src_port_path, const Raul::Path& dst_port_path);
SharedPtr<Connections> _connections;
uint32_t _poly;
bool _editable;
};
-typedef Raul::Table<string, SharedPtr<PatchModel> > PatchModelMap;
-
} // namespace Client
} // namespace Ingen