diff options
Diffstat (limited to 'src/gui/ThreadedLoader.hpp')
-rw-r--r-- | src/gui/ThreadedLoader.hpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index a6389df8..96c64af3 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -1,5 +1,5 @@ /* This file is part of Ingen. - * Copyright (C) 2007-2009 David Robillard <http://drobilla.net> + * Copyright (C) 2007-2011 David Robillard <http://drobilla.net> * * Ingen is free software; you can redistribute it and/or modify it under the * terms of the GNU General Public License as published by the Free Software @@ -26,7 +26,6 @@ #include "raul/Slave.hpp" #include <glibmm/thread.h> #include "interface/EngineInterface.hpp" -#include "client/DeprecatedLoader.hpp" #include "serialisation/Serialiser.hpp" #include "serialisation/Parser.hpp" using std::string; @@ -40,7 +39,6 @@ using namespace Serialisation; namespace GUI { - /** Thread for loading patch files. * * This is a seperate thread so it can send all the loading message without @@ -55,11 +53,11 @@ namespace GUI { class ThreadedLoader : public Raul::Slave { public: - ThreadedLoader(SharedPtr<Shared::LV2URIMap> uris, SharedPtr<EngineInterface> engine); + ThreadedLoader(SharedPtr<Shared::LV2URIMap> uris, + SharedPtr<EngineInterface> engine); void load_patch(bool merge, const Glib::ustring& document_uri, - optional<Raul::Path> data_path, optional<Raul::Path> engine_parent, optional<Raul::Symbol> engine_symbol, optional<GraphObject::Properties> engine_data); @@ -79,12 +77,10 @@ private: SharedPtr<EngineInterface> _engine; - DeprecatedLoader _deprecated_loader; - Glib::Mutex _mutex; - list<Closure> _events; + Glib::Mutex _mutex; + list<Closure> _events; }; - } // namespace GUI } // namespace Ingen |