From b15864870d34a1188eda93ad215734275037278e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 11 Sep 2006 11:10:35 +0000 Subject: Switched homebrew CountedPtr to boost::shared_ptr. Factories for patch windows, controller. Robustness updated in many places. Tons of cleanups, rewrites, bugfixes, etc. git-svn-id: http://svn.drobilla.net/lad/ingen@128 a436a847-0d15-0410-975c-d299462d15a1 --- src/progs/ingenuity/Loader.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/progs/ingenuity/Loader.h') diff --git a/src/progs/ingenuity/Loader.h b/src/progs/ingenuity/Loader.h index 7ff6f189..58c301af 100644 --- a/src/progs/ingenuity/Loader.h +++ b/src/progs/ingenuity/Loader.h @@ -53,15 +53,15 @@ protected: class LoadPatchEvent : public LoaderEvent { public: - LoadPatchEvent(PatchLibrarian* pl, PatchModel* model, bool wait, bool merge) + LoadPatchEvent(PatchLibrarian* pl, CountedPtr model, bool wait, bool merge) : m_patch_librarian(pl), m_patch_model(model), m_wait(wait), m_merge(merge) {} virtual ~LoadPatchEvent() {} void execute(); private: - PatchLibrarian* m_patch_librarian; - PatchModel* m_patch_model; - bool m_wait; - bool m_merge; + PatchLibrarian* m_patch_librarian; + CountedPtr m_patch_model; + bool m_wait; + bool m_merge; }; @@ -72,15 +72,15 @@ private: class SavePatchEvent : public LoaderEvent { public: - SavePatchEvent(PatchLibrarian* pl, PatchModel* pm, const string& filename, bool recursive) + SavePatchEvent(PatchLibrarian* pl, CountedPtr pm, const string& filename, bool recursive) : m_patch_librarian(pl), m_patch_model(pm), m_filename(filename), m_recursive(recursive) {} virtual ~SavePatchEvent() {} void execute(); private: - PatchLibrarian* m_patch_librarian; - PatchModel* m_patch_model; - string m_filename; - bool m_recursive; + PatchLibrarian* m_patch_librarian; + CountedPtr m_patch_model; + string m_filename; + bool m_recursive; }; /* @@ -129,8 +129,8 @@ public: void launch(); void exit() { m_thread_exit_flag = true; } - void load_patch(PatchModel* model, bool wait, bool merge); - void save_patch(PatchModel* model, const string& filename, bool recursive); + void load_patch(CountedPtr model, bool wait, bool merge); + void save_patch(CountedPtr model, const string& filename, bool recursive); //void load_session(const string& filename); //void save_session(const string& filename); -- cgit v1.2.1