diff options
Diffstat (limited to 'ingen/Interface.hpp')
| -rw-r--r-- | ingen/Interface.hpp | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp index 2221f8f0..a6654afe 100644 --- a/ingen/Interface.hpp +++ b/ingen/Interface.hpp @@ -33,12 +33,12 @@ namespace Raul { class Path; -class URI; } namespace Ingen { class Atom; +class URI; /** Abstract interface for Ingen servers and clients. * @@ -53,7 +53,7 @@ public: virtual ~Interface() = default; - virtual Raul::URI uri() const = 0; + virtual URI uri() const = 0; virtual SPtr<Interface> respondee() const { return SPtr<Interface>(); } @@ -67,22 +67,19 @@ public: inline void operator()(const Message& msg) { message(msg); } - inline void set_response_id(int32_t id) { - _seq = id; - } + inline void set_response_id(int32_t id) { _seq = id; } inline void bundle_begin() { message(BundleBegin{_seq++}); } + inline void bundle_end() { message(BundleEnd{_seq++}); } - inline void bundle_end() { message(BundleEnd{_seq++}); } - - inline void put(const Raul::URI& uri, + inline void put(const URI& uri, const Properties& properties, Resource::Graph ctx = Resource::Graph::DEFAULT) { message(Put{_seq++, uri, properties, ctx}); } - inline void delta(const Raul::URI& uri, + inline void delta(const URI& uri, const Properties& remove, const Properties& add, Resource::Graph ctx = Resource::Graph::DEFAULT) @@ -90,7 +87,7 @@ public: message(Delta{_seq++, uri, remove, add, ctx}); } - inline void copy(const Raul::URI& old_uri, const Raul::URI& new_uri) + inline void copy(const URI& old_uri, const URI& new_uri) { message(Copy{_seq++, old_uri, new_uri}); } @@ -100,7 +97,7 @@ public: message(Move{_seq++, old_path, new_path}); } - inline void del(const Raul::URI& uri) { message(Del{_seq++, uri}); } + inline void del(const URI& uri) { message(Del{_seq++, uri}); } inline void connect(const Raul::Path& tail, const Raul::Path& head) { @@ -117,10 +114,10 @@ public: message(DisconnectAll{_seq++, graph, path}); } - inline void set_property(const Raul::URI& subject, - const Raul::URI& predicate, - const Atom& value, - Resource::Graph ctx = Resource::Graph::DEFAULT) + inline void set_property(const URI& subject, + const URI& predicate, + const Atom& value, + Resource::Graph ctx = Resource::Graph::DEFAULT) { message(SetProperty{_seq++, subject, predicate, value, ctx}); } @@ -129,15 +126,15 @@ public: inline void redo() { message(Redo{_seq++}); } - inline void get(const Raul::URI& uri) { message(Get{_seq++, uri}); } + inline void get(const URI& uri) { message(Get{_seq++, uri}); } - inline void response(int32_t id, - Status status, - const std::string& subject) { + inline void response(int32_t id, Status status, const std::string& subject) + { message(Response{id, status, subject}); } - inline void error(const std::string& error_message) { + inline void error(const std::string& error_message) + { message(Error{_seq++, error_message}); } |