diff options
Diffstat (limited to 'include/ingen/URIMap.hpp')
| -rw-r--r-- | include/ingen/URIMap.hpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/include/ingen/URIMap.hpp b/include/ingen/URIMap.hpp index 465f87f1..fbb0523c 100644 --- a/include/ingen/URIMap.hpp +++ b/include/ingen/URIMap.hpp @@ -17,12 +17,12 @@ #ifndef INGEN_URIMAP_HPP #define INGEN_URIMAP_HPP -#include "ingen/LV2Features.hpp" -#include "ingen/ingen.h" -#include "ingen/memory.hpp" -#include "lv2/core/lv2.h" -#include "lv2/urid/urid.h" -#include "raul/Noncopyable.hpp" +#include <ingen/LV2Features.hpp> +#include <ingen/ingen.h> +#include <ingen/memory.hpp> +#include <lv2/core/lv2.h> +#include <lv2/urid/urid.h> +#include <raul/Noncopyable.hpp> #include <cstdint> #include <memory> @@ -34,13 +34,12 @@ namespace ingen { class Log; -class Node; -class World; /** URI to integer map and implementation of LV2 URID extension. * @ingroup IngenShared */ -class INGEN_API URIMap : public raul::Noncopyable { +class INGEN_API URIMap : public raul::Noncopyable +{ public: URIMap(Log& log, LV2_URID_Map* map, LV2_URID_Unmap* unmap); @@ -48,7 +47,8 @@ public: uint32_t map_uri(const std::string& uri) { return map_uri(uri.c_str()); } const char* unmap_uri(uint32_t urid) const; - class Feature : public LV2Features::Feature { + class Feature : public LV2Features::Feature + { public: Feature(const char* URI, void* data) : _feature{URI, data} {} @@ -56,8 +56,7 @@ public: std::shared_ptr<LV2_Feature> feature(World&, Node*) override { - return std::shared_ptr<LV2_Feature>(&_feature, - NullDeleter<LV2_Feature>); + return {&_feature, NullDeleter<LV2_Feature>}; } private: @@ -93,8 +92,13 @@ public: const LV2_URID_Map& urid_map() const { return _urid_map_feature->data(); } LV2_URID_Map& urid_map() { return _urid_map_feature->data(); } - const LV2_URID_Unmap& urid_unmap() const { return _urid_unmap_feature->data(); } - LV2_URID_Unmap& urid_unmap() { return _urid_unmap_feature->data(); } + + const LV2_URID_Unmap& urid_unmap() const + { + return _urid_unmap_feature->data(); + } + + LV2_URID_Unmap& urid_unmap() { return _urid_unmap_feature->data(); } std::shared_ptr<URIDMapFeature> urid_map_feature() { |