diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-07-01 01:14:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-07-01 01:14:14 +0000 |
| commit | 92e412661772e6b9c83109b7ee4996f4c040d3f4 (patch) | |
| tree | 1f1006c61d03b6b68855d812561d931606ff84b3 /gtk2_ardour/port_matrix.h | |
| parent | aad230da6937358b11976c1db3986575b2e412a0 (diff) | |
Allow port matrix to show both audio and midi ports at the same time, and use that facility for route IO selectors.
git-svn-id: svn://localhost/ardour2/branches/3.0@7344 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/port_matrix.h')
| -rw-r--r-- | gtk2_ardour/port_matrix.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h index 52e2f1663b..a67292829b 100644 --- a/gtk2_ardour/port_matrix.h +++ b/gtk2_ardour/port_matrix.h @@ -124,6 +124,9 @@ 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; + /** @param c Channels; where c[0] is from _ports[0] and c[1] is from _ports[1]. * @param s New state. */ @@ -136,7 +139,7 @@ public: 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 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>); @@ -171,7 +174,7 @@ 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); @@ -192,7 +195,7 @@ private: 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; |