diff options
Diffstat (limited to 'include/ingen/client')
-rw-r--r-- | include/ingen/client/ArcModel.hpp | 4 | ||||
-rw-r--r-- | include/ingen/client/BlockModel.hpp | 14 | ||||
-rw-r--r-- | include/ingen/client/ClientStore.hpp | 18 | ||||
-rw-r--r-- | include/ingen/client/GraphModel.hpp | 6 | ||||
-rw-r--r-- | include/ingen/client/ObjectModel.hpp | 12 | ||||
-rw-r--r-- | include/ingen/client/PluginModel.hpp | 2 | ||||
-rw-r--r-- | include/ingen/client/PortModel.hpp | 2 | ||||
-rw-r--r-- | include/ingen/client/SocketClient.hpp | 10 |
8 files changed, 34 insertions, 34 deletions
diff --git a/include/ingen/client/ArcModel.hpp b/include/ingen/client/ArcModel.hpp index 635c2d41..a76f274f 100644 --- a/include/ingen/client/ArcModel.hpp +++ b/include/ingen/client/ArcModel.hpp @@ -40,8 +40,8 @@ public: std::shared_ptr<PortModel> tail() const { return _tail; } std::shared_ptr<PortModel> head() const { return _head; } - const Raul::Path& tail_path() const override { return _tail->path(); } - const Raul::Path& head_path() const override { return _head->path(); } + const raul::Path& tail_path() const override { return _tail->path(); } + const raul::Path& head_path() const override { return _head->path(); } private: friend class ClientStore; diff --git a/include/ingen/client/BlockModel.hpp b/include/ingen/client/BlockModel.hpp index ee2c88d8..060d454f 100644 --- a/include/ingen/client/BlockModel.hpp +++ b/include/ingen/client/BlockModel.hpp @@ -29,10 +29,10 @@ #include <string> #include <vector> -namespace Raul { +namespace raul { class Path; class Symbol; -} // namespace Raul +} // namespace raul namespace ingen { @@ -57,7 +57,7 @@ public: using Ports = std::vector<std::shared_ptr<const PortModel>>; - std::shared_ptr<const PortModel> get_port(const Raul::Symbol& symbol) const; + std::shared_ptr<const PortModel> get_port(const raul::Symbol& symbol) const; std::shared_ptr<const PortModel> get_port(uint32_t index) const; Node* port(uint32_t index) const override; @@ -89,19 +89,19 @@ public: protected: friend class ClientStore; - BlockModel(URIs& uris, URI plugin_uri, const Raul::Path& path); + BlockModel(URIs& uris, URI plugin_uri, const raul::Path& path); BlockModel(URIs& uris, const std::shared_ptr<PluginModel>& plugin, - const Raul::Path& path); + const raul::Path& path); - explicit BlockModel(const Raul::Path& path); + explicit BlockModel(const raul::Path& path); void add_child(const std::shared_ptr<ObjectModel>& c) override; bool remove_child(const std::shared_ptr<ObjectModel>& c) override; void add_port(const std::shared_ptr<PortModel>& pm); void remove_port(const std::shared_ptr<PortModel>& port); - void remove_port(const Raul::Path& port_path); + void remove_port(const raul::Path& port_path); void set(const std::shared_ptr<ObjectModel>& model) override; virtual void clear(); diff --git a/include/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp index b1d40881..3aec363f 100644 --- a/include/ingen/client/ClientStore.hpp +++ b/include/ingen/client/ClientStore.hpp @@ -28,9 +28,9 @@ #include <memory> #include <utility> -namespace Raul { +namespace raul { class Path; -} // namespace Raul +} // namespace raul namespace ingen { @@ -61,7 +61,7 @@ public: URI uri() const override { return URI("ingen:/clients/store"); } - std::shared_ptr<const ObjectModel> object(const Raul::Path& path) const; + std::shared_ptr<const ObjectModel> object(const raul::Path& path) const; std::shared_ptr<const PluginModel> plugin(const URI& uri) const; std::shared_ptr<const Resource> resource(const URI& uri) const; @@ -100,22 +100,22 @@ public: INGEN_SIGNAL(plugin_deleted, void, URI) private: - std::shared_ptr<ObjectModel> _object(const Raul::Path& path); + std::shared_ptr<ObjectModel> _object(const raul::Path& path); std::shared_ptr<PluginModel> _plugin(const URI& uri); std::shared_ptr<PluginModel> _plugin(const Atom& uri); std::shared_ptr<Resource> _resource(const URI& uri); void add_object(const std::shared_ptr<ObjectModel>& object); - std::shared_ptr<ObjectModel> remove_object(const Raul::Path& path); + std::shared_ptr<ObjectModel> remove_object(const raul::Path& path); void add_plugin(const std::shared_ptr<PluginModel>& pm); - std::shared_ptr<GraphModel> connection_graph(const Raul::Path& tail_path, - const Raul::Path& head_path); + std::shared_ptr<GraphModel> connection_graph(const raul::Path& tail_path, + const raul::Path& head_path); // Slots for SigClientInterface signals - bool attempt_connection(const Raul::Path& tail_path, - const Raul::Path& head_path); + bool attempt_connection(const raul::Path& tail_path, + const raul::Path& head_path); URIs& _uris; Log& _log; diff --git a/include/ingen/client/GraphModel.hpp b/include/ingen/client/GraphModel.hpp index fb95b716..59d1bb65 100644 --- a/include/ingen/client/GraphModel.hpp +++ b/include/ingen/client/GraphModel.hpp @@ -26,9 +26,9 @@ #include <cstdint> #include <memory> -namespace Raul { +namespace raul { class Path; -} // namespace Raul +} // namespace raul namespace ingen { @@ -67,7 +67,7 @@ public: private: friend class ClientStore; - GraphModel(URIs& uris, const Raul::Path& graph_path) + GraphModel(URIs& uris, const raul::Path& graph_path) : BlockModel(uris, static_cast<const URI&>(uris.ingen_Graph), graph_path) diff --git a/include/ingen/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp index 73e2080e..e92618f8 100644 --- a/include/ingen/client/ObjectModel.hpp +++ b/include/ingen/client/ObjectModel.hpp @@ -58,8 +58,8 @@ public: void on_property(const URI& uri, const Atom& value) override; void on_property_removed(const URI& uri, const Atom& value) override; - const Raul::Path& path() const override { return _path; } - const Raul::Symbol& symbol() const override { return _symbol; } + const raul::Path& path() const override { return _path; } + const raul::Symbol& symbol() const override { return _symbol; } std::shared_ptr<ObjectModel> parent() const { return _parent; } bool polyphonic() const; @@ -77,10 +77,10 @@ public: protected: friend class ClientStore; - ObjectModel(URIs& uris, const Raul::Path& path); + ObjectModel(URIs& uris, const raul::Path& path); ObjectModel(const ObjectModel& copy); - void set_path(const Raul::Path& p) override; + void set_path(const raul::Path& p) override; virtual void set_parent(const std::shared_ptr<ObjectModel>& p); virtual void add_child(const std::shared_ptr<ObjectModel>& c) {} virtual bool remove_child(const std::shared_ptr<ObjectModel>& c) { return true; } @@ -90,8 +90,8 @@ protected: std::shared_ptr<ObjectModel> _parent; private: - Raul::Path _path; - Raul::Symbol _symbol; + raul::Path _path; + raul::Symbol _symbol; }; } // namespace client diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp index 07905ebb..b0a61e94 100644 --- a/include/ingen/client/PluginModel.hpp +++ b/include/ingen/client/PluginModel.hpp @@ -68,7 +68,7 @@ public: const Atom& get_property(const URI& key) const override; - Raul::Symbol default_block_symbol() const; + raul::Symbol default_block_symbol() const; std::string human_name() const; std::string port_human_name(uint32_t index) const; diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp index b081a74d..9323b84b 100644 --- a/include/ingen/client/PortModel.hpp +++ b/include/ingen/client/PortModel.hpp @@ -78,7 +78,7 @@ private: friend class ClientStore; PortModel(URIs& uris, - const Raul::Path& path, + const raul::Path& path, uint32_t index, Direction dir) : ObjectModel(uris, path) diff --git a/include/ingen/client/SocketClient.hpp b/include/ingen/client/SocketClient.hpp index 0e651250..1e75ae80 100644 --- a/include/ingen/client/SocketClient.hpp +++ b/include/ingen/client/SocketClient.hpp @@ -42,7 +42,7 @@ class INGEN_API SocketClient : public SocketWriter public: SocketClient(World& world, const URI& uri, - const std::shared_ptr<Raul::Socket>& sock, + const std::shared_ptr<raul::Socket>& sock, const std::shared_ptr<Interface>& respondee) : SocketWriter(world.uri_map(), world.uris(), uri, sock) , _respondee(respondee) @@ -63,11 +63,11 @@ public: const URI& uri, const std::shared_ptr<ingen::Interface>& respondee) { - const Raul::Socket::Type type = (uri.scheme() == "unix" - ? Raul::Socket::Type::UNIX - : Raul::Socket::Type::TCP); + const raul::Socket::Type type = (uri.scheme() == "unix" + ? raul::Socket::Type::UNIX + : raul::Socket::Type::TCP); - std::shared_ptr<Raul::Socket> sock(new Raul::Socket(type)); + std::shared_ptr<raul::Socket> sock(new raul::Socket(type)); if (!sock->connect(uri)) { world.log().error("Failed to connect <%1%> (%2%)\n", sock->uri(), strerror(errno)); |