From e5675ebfeb93175e16762d0a078bd51d15d05f63 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 13 Sep 2006 06:11:25 +0000
Subject: Heavy-duty redesign of client library and GUI (now fully signal
 driven with clean Model/View separation). Smarter, centralized window
 creation/management (should make window unification easy (panes?)). Typed
 metadata system, no more fugly string conversion of floats.  Supports OSC
 fundamental types string, int, float, blob for now (though blob isn't working
 over the wire yet).

git-svn-id: http://svn.drobilla.net/lad/ingen@131 a436a847-0d15-0410-975c-d299462d15a1
---
 src/progs/ingenuity/PatchWindow.h | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'src/progs/ingenuity/PatchWindow.h')

diff --git a/src/progs/ingenuity/PatchWindow.h b/src/progs/ingenuity/PatchWindow.h
index d538db78..2e0a388b 100644
--- a/src/progs/ingenuity/PatchWindow.h
+++ b/src/progs/ingenuity/PatchWindow.h
@@ -24,13 +24,15 @@
 #include <libglademm.h>
 #include "util/Path.h"
 #include "util/CountedPtr.h"
-#include "PatchController.h"
+#include "PatchModel.h"
+#include "PatchView.h"
+using Ingen::Client::PatchModel;
+
 using std::string; using std::list;
 
 
 namespace Ingen { namespace Client {
 	class PatchModel;
-	class NodeModel;
 	class PortModel;
 	class ControlModel;
 	class MetadataModel;
@@ -40,7 +42,6 @@ using namespace Ingen::Client;
 
 namespace Ingenuity {
 	
-class PatchController;
 class OmFlowCanvas;
 class LoadPluginWindow;
 class LoadPatchWindow;
@@ -64,13 +65,10 @@ public:
 	PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml);
 	~PatchWindow();
 	
-	void set_patch_from_path(const Path& path);
-	void set_patch(CountedPtr<PatchController> pc);
+	void set_patch_from_path(const Path& path, CountedPtr<PatchView> view);
+	void set_patch(CountedPtr<PatchModel> pc, CountedPtr<PatchView> view);
 
-	CountedPtr<PatchController> patch_controller()     const { return m_patch; }
-	LoadPluginWindow*           load_plugin_window()   const { return m_load_plugin_window; }
-	LoadSubpatchWindow*         load_subpatch_window() const { return m_load_subpatch_window; }
-	NewSubpatchWindow*          new_subpatch_window()  const { return m_new_subpatch_window; }
+	CountedPtr<PatchModel> patch()     const { return m_patch; }
 
 	Gtk::MenuItem* menu_view_control_window() { return m_menu_view_control_window; }
 
@@ -93,12 +91,8 @@ private:
 	void event_show_controls();
 	void event_show_engine();
 
-	CountedPtr<PatchController> m_patch;
-
-	LoadPluginWindow*       m_load_plugin_window;
-	LoadPatchWindow*        m_load_patch_window;
-	NewSubpatchWindow*      m_new_subpatch_window;
-	LoadSubpatchWindow*     m_load_subpatch_window;
+	CountedPtr<PatchModel> m_patch;
+	CountedPtr<PatchView>  m_view;
 	
 	bool m_enable_signal;
 	bool m_position_stored;
-- 
cgit v1.2.1