diff options
| author | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
| commit | df1447c665e6c3631961297a9d3e9aff4e94c47f (patch) | |
| tree | c0ff117c362e6d571f430f886ab62f372b59af08 /src/gui/ThreadedLoader.cpp | |
| parent | bb335dca695273622b7a4ebbefbe9e089edb9ab4 (diff) | |
| download | ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.gz ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.bz2 ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.zip | |
Remove Raul::SharedPtr and switch to std::shared_ptr.
Use project local short type aliases for shared_ptr and friends.
Move Raul::Disposable and Raul::Manageable into Raul::Maid.
Use sets to store machina nodes and edges to avoid O(n) searches.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4939 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/ThreadedLoader.cpp')
| -rw-r--r-- | src/gui/ThreadedLoader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 9575734b..597a728d 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -30,7 +30,7 @@ using namespace std; namespace Ingen { namespace GUI { -ThreadedLoader::ThreadedLoader(App& app, SharedPtr<Interface> engine) +ThreadedLoader::ThreadedLoader(App& app, SPtr<Interface> engine) : Raul::Thread() , _app(app) , _sem(0) @@ -49,7 +49,7 @@ ThreadedLoader::~ThreadedLoader() _sem.post(); } -SharedPtr<Serialisation::Parser> +SPtr<Serialisation::Parser> ThreadedLoader::parser() { Ingen::World* world = _app.world(); @@ -108,8 +108,8 @@ ThreadedLoader::load_graph(bool merge, } void -ThreadedLoader::save_graph(SharedPtr<const Client::GraphModel> model, - const string& filename) +ThreadedLoader::save_graph(SPtr<const Client::GraphModel> model, + const string& filename) { _mutex.lock(); @@ -122,8 +122,8 @@ ThreadedLoader::save_graph(SharedPtr<const Client::GraphModel> model, } void -ThreadedLoader::save_graph_event(SharedPtr<const Client::GraphModel> model, - const string& filename) +ThreadedLoader::save_graph_event(SPtr<const Client::GraphModel> model, + const string& filename) { if (_app.serialiser()) { if (filename.find(".ingen") != string::npos) |