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

1 files changed, 10 insertions, 6 deletions

diff --git a/src/progs/ingenuity/LoadPatchWindow.h b/src/progs/ingenuity/LoadPatchWindow.h
index e22b1c1a..2c6035c8 100644
--- a/src/progs/ingenuity/LoadPatchWindow.h
+++ b/src/progs/ingenuity/LoadPatchWindow.h
@@ -22,12 +22,12 @@
 #include <libglademm/xml.h>
 #include <gtkmm.h>
 #include "util/CountedPtr.h"
-#include "PatchController.h"
+#include "PatchModel.h"
+using Ingen::Client::PatchModel;
+using Ingen::Client::MetadataMap;
 
 namespace Ingenuity {
 	
-class PatchController;
-
 
 /** 'Load Patch' window.
  *
@@ -44,11 +44,13 @@ class LoadPatchWindow : public Gtk::FileChooserDialog
 public:
 	LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml);
 
-	void set_patch(CountedPtr<PatchController> pc);
+	void set_patch(CountedPtr<PatchModel> patch);
 
 	void set_replace() { m_replace = true; }
 	void set_merge()   { m_replace = false; }
 
+	void present(CountedPtr<PatchModel> patch, MetadataMap data);
+
 protected:
 	void on_show();
 
@@ -58,8 +60,10 @@ private:
 	void ok_clicked();
 	void cancel_clicked();
 
-	CountedPtr<PatchController> m_patch_controller;
-	bool                        m_replace;
+	MetadataMap m_initial_data;
+
+	CountedPtr<PatchModel> m_patch;
+	bool                   m_replace;
 
 	Gtk::RadioButton* m_poly_from_current_radio;
 	Gtk::RadioButton* m_poly_from_file_radio;