X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=624181356e8d8c32ff55b9fb8d1feface0823912;hb=e344f57a305d7f33f883cd18abcf22bd6ad39e27;hp=e03d2efebd835d2b43c755f3237669a8d97f6f97;hpb=fa701b8c065251d242342b86a54d91826d2290a0;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index e03d2efebd..624181356e 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -31,33 +31,36 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/treeview.h>
+#include <gtkmm/liststore.h>
 
 #include "pbd/stateful.h"
 #include "pbd/signals.h"
 
 #include "ardour/ardour.h"
+#include "ardour/types.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();
 
@@ -76,12 +79,16 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void hide_strip (MixerStrip *);
 
 	void ensure_float (Gtk::Window&);
-	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;
@@ -123,9 +130,11 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void scroll_left ();
 	void scroll_right ();
 
-	void add_strip (ARDOUR::RouteList&);
+	void add_strips (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 ();
@@ -134,14 +143,9 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	void unselect_all_audiobus_strips ();
 	void select_all_audiobus_strips ();
 
-	void auto_rebind_midi_controls ();
-	bool auto_rebinding;
-
 	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 ();
 
@@ -157,15 +161,16 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
 	bool track_display_button_press (GdkEventButton*);
 	void strip_width_changed ();
 
-	void track_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
 	void track_list_delete (const Gtk::TreeModel::Path&);
 	void track_list_reorder (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter, int* new_order);
 
 	void initial_track_display ();
 	void show_track_list_menu ();
-
+      
 	void set_all_strips_visibility (bool yn);
 	void set_all_audio_visibility (int tracks, bool yn);
+        void track_visibility_changed (std::string const & path);
+        void update_track_visibility ();
 
 	void hide_all_routes ();
 	void show_all_routes ();
@@ -174,7 +179,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 +186,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_property_changed (const PBD::PropertyChange&, MixerStrip *);
-
-	void group_flags_changed (void *src, ARDOUR::RouteGroup *);
+	void route_group_property_changed (ARDOUR::RouteGroup *, const PBD::PropertyChange &);
 
 	/* various treeviews */
 
@@ -210,7 +214,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 +226,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,22 +244,38 @@ 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 &);
-	bool strip_redisplay_does_not_reset_order_keys;
-	bool strip_redisplay_does_not_sync_order_keys;
-	bool ignore_sync;
+        void sync_order_keys_from_treeview ();
+        void sync_treeview_from_order_keys (ARDOUR::RouteSortOrderKey);
+        void reset_remote_control_ids ();
+        void reset_order_keys (ARDOUR::RouteSortOrderKey);
+
+        bool ignore_reorder;
 
 	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;
+
+	void monitor_section_going_away ();
 };
 
 #endif /* __ardour_mixer_ui_h__ */