diff options
Diffstat (limited to 'ingen/client')
| -rw-r--r-- | ingen/client/PluginModel.hpp | 9 | ||||
| -rw-r--r-- | ingen/client/SocketClient.hpp | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp index 5f43b3c4..c2d291f0 100644 --- a/ingen/client/PluginModel.hpp +++ b/ingen/client/PluginModel.hpp @@ -25,7 +25,7 @@ #include "ingen/types.hpp" #include "lilv/lilv.h" #include "raul/Symbol.hpp" -#include "sord/sordmm.hpp" +#include "serd/serd.hpp" #include <cstdint> #include <map> @@ -88,12 +88,6 @@ public: std::string documentation(bool html) const; std::string port_documentation(uint32_t index, bool html) const; - static void set_rdf_world(Sord::World& world) { - _rdf_world = &world; - } - - static Sord::World* rdf_world() { return _rdf_world; } - // Signals INGEN_SIGNAL(changed, void); INGEN_SIGNAL(property, void, const URI&, const Atom&); @@ -111,7 +105,6 @@ protected: private: std::string get_documentation(const LilvNode* subject, bool html) const; - static Sord::World* _rdf_world; static LilvWorld* _lilv_world; static const LilvPlugins* _lilv_plugins; diff --git a/ingen/client/SocketClient.hpp b/ingen/client/SocketClient.hpp index 092ef9d2..b3656d92 100644 --- a/ingen/client/SocketClient.hpp +++ b/ingen/client/SocketClient.hpp @@ -33,9 +33,13 @@ public: const URI& uri, SPtr<Raul::Socket> sock, SPtr<Interface> respondee) - : SocketWriter(world.uri_map(), world.uris(), uri, sock) - , _respondee(respondee) - , _reader(world, *respondee.get(), sock) + : SocketWriter(world.rdf_world(), + world.uri_map(), + world.uris(), + uri, + sock) + , _respondee(respondee) + , _reader(world, *respondee.get(), sock) {} SPtr<Interface> respondee() const override { @@ -56,7 +60,7 @@ public: : Raul::Socket::Type::TCP); SPtr<Raul::Socket> sock(new Raul::Socket(type)); - if (!sock->connect(uri)) { + if (!sock->connect(uri.str())) { world.log().error("Failed to connect <%1%> (%2%)\n", sock->uri(), strerror(errno)); return SPtr<Interface>(); |