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, 13 insertions, 7 deletions

diff --git a/src/progs/ingenuity/NodeControlWindow.h b/src/progs/ingenuity/NodeControlWindow.h
index b30223d7..91ccbc49 100644
--- a/src/progs/ingenuity/NodeControlWindow.h
+++ b/src/progs/ingenuity/NodeControlWindow.h
@@ -14,7 +14,6 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
 #ifndef NODECONTROLWINDOW_H
 #define NODECONTROLWINDOW_H
 
@@ -23,12 +22,17 @@
 #include <gtkmm.h>
 #include <libglademm.h>
 #include <sigc++/sigc++.h>
+#include "util/CountedPtr.h"
 using std::string; using std::vector;
 
+namespace Ingen { namespace Client {
+	class NodeModel;
+} }
+using Ingen::Client::NodeModel;
+
 namespace Ingenuity {
 	
 class ControlGroup;
-class NodeController;
 class ControlPanel;
 
 
@@ -39,10 +43,12 @@ class ControlPanel;
 class NodeControlWindow : public Gtk::Window
 {
 public:
-	NodeControlWindow(NodeController* node, size_t poly);
-	NodeControlWindow(NodeController* node, ControlPanel* panel);
+	NodeControlWindow(CountedPtr<NodeModel> node, size_t poly);
+	NodeControlWindow(CountedPtr<NodeModel> node, ControlPanel* panel);
 	virtual ~NodeControlWindow();
 
+	CountedPtr<NodeModel> node() { return m_node; }
+
 	ControlPanel* control_panel() const { return m_control_panel; }
 	
 	void resize();
@@ -52,9 +58,9 @@ protected:
 	void on_hide();
 
 private:
-	NodeController*  m_node;
-	ControlPanel*    m_control_panel;
-	bool             m_callback_enabled;
+	CountedPtr<NodeModel>    m_node;
+	ControlPanel* m_control_panel;
+	bool          m_callback_enabled;
 	
 	bool m_position_stored;
 	int  m_x;