summaryrefslogtreecommitdiffstats
path: root/src/gui/ThreadedLoader.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-08-02 15:23:19 +0200
committerDavid Robillard <d@drobilla.net>2020-08-02 15:23:19 +0200
commitbdbdf42f3fe990c713c5437724db39274c387eee (patch)
tree7f921a04fd580da6bcb6fc8975fa2aebfcd93e0f /src/gui/ThreadedLoader.hpp
parentec0b87a18623c17c16f6a648fcf277abe14142b7 (diff)
downloadingen-bdbdf42f3fe990c713c5437724db39274c387eee.tar.gz
ingen-bdbdf42f3fe990c713c5437724db39274c387eee.tar.bz2
ingen-bdbdf42f3fe990c713c5437724db39274c387eee.zip
Remove std::shared_ptr alias
Diffstat (limited to 'src/gui/ThreadedLoader.hpp')
-rw-r--r--src/gui/ThreadedLoader.hpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index 3ab8f4a2..ec591a9c 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -27,6 +27,7 @@
#include <sigc++/sigc++.h>
#include <list>
+#include <memory>
#include <mutex>
#include <thread>
#include <utility>
@@ -56,7 +57,7 @@ class ThreadedLoader
{
public:
ThreadedLoader(App& app,
- SPtr<Interface> engine);
+ std::shared_ptr<Interface> engine);
~ThreadedLoader();
@@ -66,9 +67,10 @@ public:
boost::optional<Raul::Symbol> engine_symbol,
boost::optional<Properties> engine_data);
- void save_graph(SPtr<const client::GraphModel> model, const URI& uri);
+ void
+ save_graph(std::shared_ptr<const client::GraphModel> model, const URI& uri);
- SPtr<Parser> parser();
+ std::shared_ptr<Parser> parser();
private:
void load_graph_event(const FilePath& file_path,
@@ -76,21 +78,21 @@ private:
boost::optional<Raul::Symbol> engine_symbol,
boost::optional<Properties> engine_data);
- void save_graph_event(SPtr<const client::GraphModel> model,
- const URI& filename);
+ void save_graph_event(std::shared_ptr<const client::GraphModel> model,
+ const URI& filename);
/** Returns nothing and takes no parameters (because they have all been bound) */
using Closure = sigc::slot<void>;
void run();
- App& _app;
- Raul::Semaphore _sem;
- SPtr<Interface> _engine;
- std::mutex _mutex;
- std::list<Closure> _events;
- bool _exit_flag;
- std::thread _thread;
+ App& _app;
+ Raul::Semaphore _sem;
+ std::shared_ptr<Interface> _engine;
+ std::mutex _mutex;
+ std::list<Closure> _events;
+ bool _exit_flag;
+ std::thread _thread;
};
} // namespace gui