diff options
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/World.cpp b/src/World.cpp index 27d92632..03a47773 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -20,7 +20,6 @@ #include "ingen/Configuration.hpp" #include "ingen/DataAccess.hpp" #include "ingen/EngineBase.hpp" -#include "ingen/FilePath.hpp" #include "ingen/Forge.hpp" #include "ingen/InstanceAccess.hpp" #include "ingen/LV2Features.hpp" @@ -40,6 +39,7 @@ #include "sord/sordmm.hpp" #include <cstdint> +#include <filesystem> #include <list> #include <map> #include <memory> @@ -72,6 +72,8 @@ ingen_load_library(Log& log, const string& name) return nullptr; } + log.info("Loading module %1%\n", path); + std::unique_ptr<Library> library = std::make_unique<Library>(path); if (*library) { return library; @@ -88,9 +90,7 @@ class World::Impl { public: Impl(LV2_URID_Map* map, LV2_URID_Unmap* unmap, LV2_Log_Log* log_feature) - : argc(nullptr) - , argv(nullptr) - , lv2_features(nullptr) + : lv2_features(new LV2Features()) , rdf_world(new Sord::World()) , lilv_world(lilv_world_new(), lilv_world_free) , uri_map(log, map, unmap) @@ -99,7 +99,6 @@ public: , conf(forge) , log(log_feature, uris) { - lv2_features = new LV2Features(); lv2_features->add_feature(uri_map.urid_map_feature()); lv2_features->add_feature(uri_map.urid_unmap_feature()); lv2_features->add_feature(std::make_shared<InstanceAccess>()); @@ -185,8 +184,8 @@ public: using LilvWorldUPtr = std::unique_ptr<LilvWorld, decltype(&lilv_world_free)>; - int* argc; - char*** argv; + int* argc{nullptr}; + char*** argv{nullptr}; LV2Features* lv2_features; std::unique_ptr<Sord::World> rdf_world; LilvWorldUPtr lilv_world; @@ -344,7 +343,7 @@ World::load_module(const char* name) if (i != _impl->modules.end()) { return true; } - log().info("Loading %1% module\n", name); + std::unique_ptr<ingen::Library> lib = ingen_load_library(log(), name); ingen::Module* (*module_load)() = @@ -387,8 +386,8 @@ std::shared_ptr<Interface> World::new_interface(const URI& engine_uri, const std::shared_ptr<Interface>& respondee) { - const Impl::InterfaceFactories::const_iterator i = - _impl->interface_factories.find(std::string(engine_uri.scheme())); + const auto i = + _impl->interface_factories.find(std::string{engine_uri.scheme()}); if (i == _impl->interface_factories.end()) { log().warn("Unknown URI scheme `%1%'\n", engine_uri.scheme()); return nullptr; @@ -401,8 +400,7 @@ World::new_interface(const URI& engine_uri, bool World::run(const std::string& mime_type, const std::string& filename) { - const Impl::ScriptRunners::const_iterator i = - _impl->script_runners.find(mime_type); + const auto i = _impl->script_runners.find(mime_type); if (i == _impl->script_runners.end()) { log().warn("Unknown script MIME type `%1%'\n", mime_type); return false; |