More port matrix re-working. Global matrix now has separate visibility buttons

for ins and outs.  The matrix will now be arranged so that more ports are labelled
horizontally than vertically, to aid readability.


git-svn-id: svn://localhost/ardour2/branches/3.0@4467 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 17 insertions, 22 deletions

diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index 8ab4279117..aa13967bff 100644
--- a/gtk2_ardour/bundle_manager.h
+++ b/gtk2_ardour/bundle_manager.h
@@ -35,33 +35,28 @@ class BundleEditorMatrix : public PortMatrix
 {
   public:
 	BundleEditorMatrix (ARDOUR::Session &, boost::shared_ptr<ARDOUR::Bundle>);
-	~BundleEditorMatrix ();
-
-	void set_state (
-		boost::shared_ptr<ARDOUR::Bundle> ab,
-		uint32_t ac,
-		boost::shared_ptr<ARDOUR::Bundle> bb,
-		uint32_t bc,
-		bool s,
-		uint32_t k
-		);
-	
-	State get_state (
-		boost::shared_ptr<ARDOUR::Bundle> ab,
-		uint32_t ac,
-		boost::shared_ptr<ARDOUR::Bundle> bb,
-		uint32_t bc
-		) const;
 
+	void set_state (ARDOUR::BundleChannel c[2], bool s);
+	State get_state (ARDOUR::BundleChannel c[2]) const;
 	void add_channel (boost::shared_ptr<ARDOUR::Bundle>);
-	void remove_channel (boost::shared_ptr<ARDOUR::Bundle>, uint32_t);
-	bool can_rename_channels () const {
-		return true;
+	bool can_remove_channels (int d) const {
+		return d == OURS;
+	}
+	void remove_channel (ARDOUR::BundleChannel);
+	bool can_rename_channels (int d) const {
+		return d == OURS;
 	}
-	void rename_channel (boost::shared_ptr<ARDOUR::Bundle>, uint32_t);
+	void rename_channel (ARDOUR::BundleChannel);
+	void setup ();
 
   private:
-	PortGroup* _port_group;
+	enum {
+		OTHER = 0,
+		OURS = 1
+	};
+		
+	boost::shared_ptr<PortGroup> _port_group;
+	boost::shared_ptr<ARDOUR::Bundle> _bundle;
 };
 
 class BundleEditor : public ArdourDialog