From 3c0ed6b66b6e99c68fc01c86b5796a55d74a5977 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 9 Mar 2019 17:44:36 +0100 Subject: WIP: Port to serd1 --- ingen/TurtleWriter.hpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'ingen/TurtleWriter.hpp') diff --git a/ingen/TurtleWriter.hpp b/ingen/TurtleWriter.hpp index 9c88be2e..09c01d26 100644 --- a/ingen/TurtleWriter.hpp +++ b/ingen/TurtleWriter.hpp @@ -23,7 +23,7 @@ #include "ingen/ingen.h" #include "lv2/atom/atom.h" #include "serd/serd.h" -#include "sratom/sratom.h" +#include "sratom/sratom.hpp" #include #include @@ -41,7 +41,7 @@ class URIs; class INGEN_API TurtleWriter : public AtomWriter, public AtomSink { public: - TurtleWriter(URIMap& map, URIs& uris, URI uri); + TurtleWriter(serd::World& world, URIMap& map, URIs& uris, const URI& uri); ~TurtleWriter() override; @@ -54,14 +54,13 @@ public: URI uri() const override { return _uri; } protected: - URIMap& _map; - Sratom* _sratom; - SerdNode _base; - SerdURI _base_uri; - SerdEnv* _env; - SerdWriter* _writer; - URI _uri; - bool _wrote_prefixes; + URIMap& _map; + sratom::Streamer _streamer; + serd::Node _base; + serd::Env _env; + serd::Writer _writer; + URI _uri; + bool _wrote_prefixes; }; } // namespace ingen -- cgit v1.2.1