X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fglobal_port_matrix.h;h=3def23a6a3d6c47c7f47d64d33931bbc015d04ea;hb=ab6ab082dd947a1a79fcc704968a6d1dc7701b66;hp=5a00ed4c75d415ca8c6e41fca6cdffd6ff27ca2d;hpb=7666413e1837214f2350330ce1d257a499a9344f;p=ardour.git

diff --git a/gtk2_ardour/global_port_matrix.h b/gtk2_ardour/global_port_matrix.h
index 5a00ed4c75..3def23a6a3 100644
--- a/gtk2_ardour/global_port_matrix.h
+++ b/gtk2_ardour/global_port_matrix.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,26 +23,21 @@
 #include <gtkmm/button.h>
 #include "port_matrix.h"
 #include "port_group.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 class GlobalPortMatrix : public PortMatrix
 {
 public:
-	GlobalPortMatrix (ARDOUR::Session&, ARDOUR::DataType);
+	GlobalPortMatrix (Gtk::Window*, ARDOUR::Session*, ARDOUR::DataType);
 
 	void setup_ports (int);
-	
+	void set_session (ARDOUR::Session* s);
+
 	void set_state (ARDOUR::BundleChannel c[2], bool);
-	State get_state (ARDOUR::BundleChannel c[2]) const;
+	PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
 
-	void add_channel (boost::shared_ptr<ARDOUR::Bundle>) {}
-	bool can_remove_channels (int d) const {
-		return false;
-	}
-	void remove_channel (ARDOUR::BundleChannel) {}
-	bool can_rename_channels (int d) const {
-		return false;
-	}
+	std::string disassociation_verb () const;
+	std::string channel_noun () const;
 
 	bool list_is_global (int) const {
 		return true;
@@ -51,20 +46,24 @@ public:
 private:
 	/* see PortMatrix: signal flow from 0 to 1 (out to in) */
 	enum {
-		OUT = 0,
-		IN = 1,
+		FLOW_OUT = 0,
+		FLOW_IN = 1,
 	};
 };
 
-
-class GlobalPortMatrixWindow : public Gtk::Window
+class GlobalPortMatrixWindow : public ArdourWindow
 {
 public:
-	GlobalPortMatrixWindow (ARDOUR::Session&, ARDOUR::DataType);
+	GlobalPortMatrixWindow (ARDOUR::Session *, ARDOUR::DataType);
+
+	void set_session (ARDOUR::Session *);
 
 private:
+	void on_show ();
+
 	GlobalPortMatrix _port_matrix;
 	Gtk::Button _rescan_button;
+	Gtk::CheckButton _show_ports_button;
 };