From 001b459dfaf5d2ed53e4f7a5daea2a408aba1a2d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 21 Jan 2018 00:41:34 +0100 Subject: Replace Glib::Module --- ingen/Library.hpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ ingen/Module.hpp | 15 ++++++++------- 2 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 ingen/Library.hpp (limited to 'ingen') diff --git a/ingen/Library.hpp b/ingen/Library.hpp new file mode 100644 index 00000000..71257900 --- /dev/null +++ b/ingen/Library.hpp @@ -0,0 +1,48 @@ +/* + This file is part of Ingen. + Copyright 2018 David Robillard + + Ingen is free software: you can redistribute it and/or modify it under the + terms of the GNU Affero General Public License as published by the Free + Software Foundation, either version 3 of the License, or any later version. + + Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU Affero General Public License for details. + + You should have received a copy of the GNU Affero General Public License + along with Ingen. If not, see . +*/ + +#ifndef INGEN_LIBRARY_HPP +#define INGEN_LIBRARY_HPP + +#include "ingen/FilePath.hpp" +#include "ingen/ingen.h" + +namespace Ingen { + +/** A dynamically loaded library (module, plugin). */ +class INGEN_API Library { +public: + Library(const FilePath& path); + ~Library(); + + Library(const Library&) = delete; + Library& operator=(const Library&) = delete; + + using VoidFuncPtr = void (*)(void); + + VoidFuncPtr get_function(const char* const name); + + static const char* get_last_error(); + + operator bool() const { return _lib; } + +private: + void* _lib; +}; + +} // namespace Ingen + +#endif // INGEN_LIBRARY_HPP diff --git a/ingen/Module.hpp b/ingen/Module.hpp index d0065efc..df47b70b 100644 --- a/ingen/Module.hpp +++ b/ingen/Module.hpp @@ -17,9 +17,11 @@ #ifndef INGEN_MODULE_HPP #define INGEN_MODULE_HPP -#include "ingen/ingen.h" +#include -namespace Glib { class Module; } +#include "ingen/FilePath.hpp" +#include "ingen/Library.hpp" +#include "ingen/ingen.h" namespace Ingen { @@ -35,6 +37,9 @@ public: Module() : library(nullptr) {} virtual ~Module() = default; + Module(const Module&) = delete; + Module& operator=(const Module&) = delete; + virtual void load(Ingen::World* world) = 0; virtual void run(Ingen::World* world) {} @@ -44,11 +49,7 @@ public: * in this destructor could possibly reference code from the library * afterwards and cause a segfault on exit. */ - Glib::Module* library; - -private: - Module(const Module& noncopyable) = delete; - Module& operator=(const Module& noncopyable) = delete; + std::unique_ptr library; }; } // namespace Ingen -- cgit v1.2.1