diff options
Diffstat (limited to 'src/AtomWriter.cpp')
| -rw-r--r-- | src/AtomWriter.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/AtomWriter.cpp b/src/AtomWriter.cpp index 27f224fc..e18b48b8 100644 --- a/src/AtomWriter.cpp +++ b/src/AtomWriter.cpp @@ -64,13 +64,11 @@ #include "raul/Path.hpp" #include "serd/serd.h" -#include <boost/variant/apply_visitor.hpp> - #include <cassert> #include <cstdint> -#include <memory> -#include <string> +#include <map> #include <utility> +#include <variant> namespace ingen { @@ -78,9 +76,8 @@ AtomWriter::AtomWriter(URIMap& map, URIs& uris, AtomSink& sink) : _map(map) , _uris(uris) , _sink(sink) - , _forge(map.urid_map_feature()->urid_map) -{ -} + , _forge(map.urid_map()) +{} void AtomWriter::finish_msg() @@ -93,7 +90,7 @@ AtomWriter::finish_msg() void AtomWriter::message(const Message& message) { - boost::apply_visitor(*this, message); + std::visit(*this, message); } /** @page protocol @@ -135,7 +132,8 @@ AtomWriter::operator()(const BundleEnd& message) void AtomWriter::forge_uri(const URI& uri) { - if (serd_uri_string_has_scheme((const uint8_t*)uri.c_str())) { + if (serd_uri_string_has_scheme( + reinterpret_cast<const uint8_t*>(uri.c_str()))) { lv2_atom_forge_urid(&_forge, _map.map_uri(uri.c_str())); } else { lv2_atom_forge_uri(&_forge, uri.c_str(), uri.length()); @@ -157,7 +155,7 @@ AtomWriter::forge_properties(const Properties& properties) } void -AtomWriter::forge_arc(const Raul::Path& tail, const Raul::Path& head) +AtomWriter::forge_arc(const raul::Path& tail, const raul::Path& head) { LV2_Atom_Forge_Frame arc; lv2_atom_forge_object(&_forge, &arc, 0, _uris.ingen_Arc); @@ -503,7 +501,7 @@ AtomWriter::operator()(const Connect& message) LV2_Atom_Forge_Frame msg; forge_request(&msg, _uris.patch_Put, message.seq); lv2_atom_forge_key(&_forge, _uris.patch_subject); - forge_uri(path_to_uri(Raul::Path::lca(message.tail, message.head))); + forge_uri(path_to_uri(raul::Path::lca(message.tail, message.head))); lv2_atom_forge_key(&_forge, _uris.patch_body); forge_arc(message.tail, message.head); lv2_atom_forge_pop(&_forge, &msg); @@ -629,8 +627,7 @@ AtomWriter::operator()(const Response& response) void AtomWriter::operator()(const Error&) -{ -} +{} /** @page protocol * @section loading Loading and Unloading Bundles |