X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=5a3b746457c6b15d4d4e9e40dafa222b4f1deb4c;hb=e9b4f14668a54e32e83005f0b09889372d1abe11;hp=275c0151cda839b8198878cd27ae1da288dfc114;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 275c0151cd..5a3b746457 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -31,33 +31,35 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/treeview.h>
+#include <gtkmm/liststore.h>
 
 #include "pbd/stateful.h"
-#include "pbd/scoped_connections.h"
+#include "pbd/signals.h"
 
 #include "ardour/ardour.h"
 #include "ardour/session_handle.h"
 
-#include "route_processor_selection.h"
 #include "enums.h"
+#include "mixer_actor.h"
 
 namespace ARDOUR {
 	class Route;
 	class RouteGroup;
-	class AudioDiskstream;
 };
 
 class MixerStrip;
 class PluginSelector;
 class MixerGroupTabs;
+class MonitorSection;
 
-class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
+class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor
 {
   public:
-	Mixer_UI ();
+	static Mixer_UI* instance();
 	~Mixer_UI();
 
 	void set_session (ARDOUR::Session *);
+	void track_editor_selection ();
 
 	PluginSelector* plugin_selector();
 
@@ -79,9 +81,15 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void toggle_auto_rebinding ();
 	void set_auto_rebinding(bool);
 
-	RouteRedirectSelection& selection() { return _selection; }
+        MonitorSection* monitor_section() const { return _monitor_section; }
+
+  protected:
+	void set_route_targets_for_operation ();
 
   private:
+	Mixer_UI ();
+	static Mixer_UI* _instance;
+
 	bool					_visible;
 
 	Gtk::HBox				global_hpacker;
@@ -126,6 +134,8 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void add_strip (ARDOUR::RouteList&);
 	void remove_strip (MixerStrip *);
 
+	MixerStrip* strip_by_route (boost::shared_ptr<ARDOUR::Route>);
+
 	void hide_all_strips (bool with_select);
 	void unselect_all_strips();
 	void select_all_strips ();
@@ -140,8 +150,6 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void strip_select_op (bool audiotrack, bool select);
 	void select_strip_op (MixerStrip*, bool select);
 
-	void follow_strip_selection ();
-
 	gint start_updating ();
 	gint stop_updating ();
 
@@ -174,7 +182,6 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void show_all_audiotracks();
 	void hide_all_audiotracks ();
 
-	Gtk::Menu* route_group_context_menu;
 	bool in_group_row_change;
 
 	void group_selected (gint row, gint col, GdkEvent *ev);
@@ -182,23 +189,23 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void group_display_active_clicked();
 	void new_route_group ();
 	void remove_selected_route_group ();
-	void build_route_group_context_menu ();
 	void activate_all_route_groups ();
 	void disable_all_route_groups ();
 	void add_route_group (ARDOUR::RouteGroup *);
 	void route_groups_changed ();
-	void route_group_name_edit (const Glib::ustring&, const Glib::ustring&);
+	void route_group_name_edit (const std::string&, const std::string&);
 	void route_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter);
+	void route_group_row_deleted (Gtk::TreeModel::Path const &);
 
 	Gtk::Menu *track_menu;
 	void track_column_click (gint);
 	void build_track_menu ();
 
+        MonitorSection* _monitor_section;
 	PluginSelector    *_plugin_selector;
 
-	void strip_name_changed (MixerStrip *);
-
-	void group_flags_changed (void *src, ARDOUR::RouteGroup *);
+	void strip_property_changed (const PBD::PropertyChange&, MixerStrip *);
+	void route_group_property_changed (ARDOUR::RouteGroup *, const PBD::PropertyChange &);
 
 	/* various treeviews */
 
@@ -210,7 +217,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 		    add (strip);
 	    }
 	    Gtk::TreeModelColumn<bool>           visible;
-	    Gtk::TreeModelColumn<Glib::ustring>  text;
+	    Gtk::TreeModelColumn<std::string>  text;
 	    Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
 	    Gtk::TreeModelColumn<MixerStrip*>    strip;
 	};
@@ -222,7 +229,7 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 		    add (group);
 	    }
 	    Gtk::TreeModelColumn<bool>					visible;
-	    Gtk::TreeModelColumn<Glib::ustring>			text;
+	    Gtk::TreeModelColumn<std::string>			text;
 	    Gtk::TreeModelColumn<ARDOUR::RouteGroup*>	group;
 	};
 
@@ -240,8 +247,6 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 
 	bool strip_button_release_event (GdkEventButton*, MixerStrip*);
 
-	RouteRedirectSelection _selection;
-
 	Width _strip_width;
 
 	void sync_order_keys (std::string const &);
@@ -252,10 +257,24 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void parameter_changed (std::string const &);
 	void set_route_group_activation (ARDOUR::RouteGroup *, bool);
 
+	void setup_track_display ();
+	void new_track_or_bus ();
+
 	static const int32_t default_width = 478;
 	static const int32_t default_height = 765;
 
+	/** true if we are rebuilding the route group list, or clearing
+	    it during a session teardown.
+	*/
+	bool _in_group_rebuild_or_clear;
+
+	void update_title ();
+	MixerStrip* strip_by_x (int x);
+
 	friend class MixerGroupTabs;
+
+	void follow_editor_selection ();
+	bool _following_editor_selection;
 };
 
 #endif /* __ardour_mixer_ui_h__ */