X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix.h;h=09c334b5efe7222f3e5bb570f08e0e6e26e0b378;hb=735d791e420c3e4944fdbc8ac7f6a26251d90d87;hp=0c0a52a1a1ea9ccc2e9d04c43cdd6dca4f3570d4;hpb=6e49c73bb0ba1037346d8a7b589185d281c97211;p=ardour.git

diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h
index 0c0a52a1a1..09c334b5ef 100644
--- a/gtk2_ardour/port_matrix.h
+++ b/gtk2_ardour/port_matrix.h
@@ -35,7 +35,6 @@
 
 #include "port_group.h"
 #include "port_matrix_types.h"
-#include "i18n.h"
 
 /** The `port matrix' UI.  This is a widget which lets the user alter
  *  associations between one set of ports and another.  e.g. to connect
@@ -86,7 +85,7 @@ public:
 		LEFT_TO_BOTTOM ///< row labels to the left, column labels on the bottom
 	};
 
-	
+
 	/** @return Arrangement in use */
 	Arrangement arrangement () const {
 		return _arrangement;
@@ -117,7 +116,7 @@ public:
 	}
 
 	boost::shared_ptr<const PortGroup> visible_ports (int d) const;
-	
+
 	void init ();
 	void setup ();
 	virtual void setup_ports (int) = 0;
@@ -125,6 +124,15 @@ public:
 
 	std::pair<uint32_t, uint32_t> max_size () const;
 
+	bool should_show (ARDOUR::DataType) const;
+	uint32_t count_of_our_type (ARDOUR::ChanCount) const;
+	uint32_t count_of_our_type_min_1 (ARDOUR::ChanCount) const;
+
+	PortMatrixNode::State get_association (PortMatrixNode) const;
+
+	void flip ();
+	bool key_press (GdkEventKey *);
+
 	/** @param c Channels; where c[0] is from _ports[0] and c[1] is from _ports[1].
 	 *  @param s New state.
 	 */
@@ -136,8 +144,8 @@ public:
 	virtual PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const = 0;
 	virtual bool list_is_global (int) const = 0;
 
-	virtual bool can_add_channel (boost::shared_ptr<ARDOUR::Bundle>) const;
-	virtual void add_channel (boost::shared_ptr<ARDOUR::Bundle>);
+	virtual bool can_add_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
+	virtual void add_channel (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::DataType);
 	virtual bool can_remove_channels (boost::shared_ptr<ARDOUR::Bundle>) const;
 	virtual void remove_channel (ARDOUR::BundleChannel);
 	virtual void remove_all_channels (boost::weak_ptr<ARDOUR::Bundle>);
@@ -146,7 +154,7 @@ public:
 	}
 	virtual void rename_channel (ARDOUR::BundleChannel) {}
 	virtual std::string disassociation_verb () const = 0;
-	virtual std::string channel_noun () const { return _("channel"); }
+	virtual std::string channel_noun () const;
 
 	enum Result {
 		Cancelled,
@@ -155,6 +163,8 @@ public:
 
 	sigc::signal<void, Result> Finished;
 
+	static bool bundle_with_channels (boost::shared_ptr<ARDOUR::Bundle>);
+
 protected:
 
 	/** We have two port group lists.  One will be presented on the rows of the matrix,
@@ -172,12 +182,13 @@ private:
 	void routes_changed ();
 	void reconnect_to_routes ();
 	void select_arrangement ();
-	void add_channel_proxy (boost::weak_ptr<ARDOUR::Bundle>);
+	void add_channel_proxy (boost::weak_ptr<ARDOUR::Bundle>, ARDOUR::DataType);
 	void remove_channel_proxy (boost::weak_ptr<ARDOUR::Bundle>, uint32_t);
 	void rename_channel_proxy (boost::weak_ptr<ARDOUR::Bundle>, uint32_t);
 	void disassociate_all_on_channel (boost::weak_ptr<ARDOUR::Bundle>, uint32_t, int);
 	void disassociate_all_on_bundle (boost::weak_ptr<ARDOUR::Bundle>, int);
 	void setup_global_ports ();
+        void setup_global_ports_proxy ();
 	void toggle_show_only_bundles ();
 	bool on_scroll_event (GdkEventScroll *);
 	boost::shared_ptr<ARDOUR::IO> io_from_bundle (boost::shared_ptr<ARDOUR::Bundle>) const;
@@ -190,10 +201,13 @@ private:
 	void add_remove_option (Gtk::Menu_Helpers::MenuList &, boost::weak_ptr<ARDOUR::Bundle>, int);
 	void add_disassociate_option (Gtk::Menu_Helpers::MenuList &, boost::weak_ptr<ARDOUR::Bundle>, int, int);
 	void port_connected_or_disconnected ();
+	void update_tab_highlighting ();
+	std::pair<int, int> check_flip () const;
+	bool can_flip () const;
 
 	Gtk::Window* _parent;
 
-	/// port type that we are working with
+	/** port type that we are working with, or NIL if we are working with all of them */
 	ARDOUR::DataType _type;
 	PBD::ScopedConnectionList _route_connections;
 	PBD::ScopedConnectionList _changed_connections;