X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=bf9c9cbd18c6b63bedaa42776ea6d05ef4030503;hb=185be4e841e182bbe7cb7820f9cb6371ebebe15d;hp=256757a97cb0ee79ef454bf49f1e238c87290be5;hpb=32c182088c161667ca8927be7cf46f0dc067457b;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 256757a97c..bf9c9cbd18 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_mixer_ui_h__
@@ -33,11 +32,11 @@
 #include <gtkmm/menu.h>
 #include <gtkmm/treeview.h>
 
+#include <pbd/stateful.h>
+
 #include <ardour/ardour.h>
-#include <ardour/stateful.h>
 #include <ardour/io.h>
 
-#include "keyboard_target.h"
 #include "route_redirect_selection.h"
 #include "enums.h"
 
@@ -45,8 +44,7 @@ namespace ARDOUR {
 	class Route;
 	class RouteGroup;
 	class Session;
-	class DiskStream;
-	class AudioEngine;
+	class AudioDiskstream;
 };
 
 class MixerStrip;
@@ -55,7 +53,7 @@ class PluginSelector;
 class Mixer_UI : public Gtk::Window
 {
   public:
-	Mixer_UI (ARDOUR::AudioEngine&);
+	Mixer_UI ();
 	~Mixer_UI();
 
 	void connect_to_session (ARDOUR::Session *);
@@ -72,6 +70,7 @@ class Mixer_UI : public Gtk::Window
 	int set_state (const XMLNode& );
 
 	void show_window ();
+	bool hide_window (GdkEventAny *ev);
 	void show_strip (MixerStrip *);
 	void hide_strip (MixerStrip *);
 
@@ -80,8 +79,9 @@ class Mixer_UI : public Gtk::Window
 	RouteRedirectSelection& selection() { return _selection; }
 	
   private:
-	ARDOUR::AudioEngine&     engine;
 	ARDOUR::Session         *session;
+
+	bool _visible;
 	
 	Gtk::HBox                global_hpacker;
 	Gtk::VBox                global_vpacker;
@@ -102,13 +102,15 @@ class Mixer_UI : public Gtk::Window
 	Gtk::HBox                out_packer;
 	Gtk::HPaned		 list_hpane;
 
+	bool on_key_press_event (GdkEventKey*);
+
 	void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
 	
 	list<MixerStrip *> strips;
 
 	bool strip_scroller_button_release (GdkEventButton*);
 
-	void add_strip (ARDOUR::Route*);
+	void add_strip (ARDOUR::Session::RouteList&);
 	void remove_strip (MixerStrip *);
 
 	void hide_all_strips (bool with_select);
@@ -129,8 +131,6 @@ class Mixer_UI : public Gtk::Window
 
 	void disconnect_from_session ();
 	
-	sigc::connection screen_update_connection;
-	void update_strips ();
 	sigc::connection fast_screen_update_connection;
 	void fast_update_strips ();
 
@@ -156,11 +156,21 @@ class Mixer_UI : public Gtk::Window
 	void show_all_audiotracks();
 	void hide_all_audiotracks ();
 
+	Gtk::Menu* mix_group_context_menu;
+	bool in_group_row_change;
+
 	void group_selected (gint row, gint col, GdkEvent *ev);
 	void group_unselected (gint row, gint col, GdkEvent *ev);
 	void group_display_active_clicked();
 	void new_mix_group ();
+	void remove_selected_mix_group ();
+	void build_mix_group_context_menu ();
+	void activate_all_mix_groups ();
+	void disable_all_mix_groups ();
 	void add_mix_group (ARDOUR::RouteGroup *);
+	void mix_groups_changed ();
+	void mix_group_name_edit (const Glib::ustring&, const Glib::ustring&);
+	void mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter);
 
 	Gtk::Menu *track_menu;
 	void track_column_click (gint);
@@ -183,7 +193,7 @@ class Mixer_UI : public Gtk::Window
 	    }
 	    Gtk::TreeModelColumn<bool>           visible;
 	    Gtk::TreeModelColumn<Glib::ustring>  text;
-	    Gtk::TreeModelColumn<ARDOUR::Route*> route;
+	    Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route;
 	    Gtk::TreeModelColumn<MixerStrip*>    strip;
 	};
 
@@ -200,14 +210,14 @@ class Mixer_UI : public Gtk::Window
 	    Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group;
 	};
 
-	TrackDisplayModelColumns    track_display_columns;
-	GroupDisplayModelColumns    group_display_columns;
+	TrackDisplayModelColumns    track_columns;
+	GroupDisplayModelColumns    group_columns;
 
 	Gtk::TreeView track_display;
 	Gtk::TreeView group_display;
 
-	Glib::RefPtr<Gtk::ListStore> track_display_model;
-	Glib::RefPtr<Gtk::ListStore> group_display_model;
+	Glib::RefPtr<Gtk::ListStore> track_model;
+	Glib::RefPtr<Gtk::ListStore> group_model;
 
 	bool group_display_button_press (GdkEventButton*);
 	void group_display_selection_changed ();
@@ -218,7 +228,7 @@ class Mixer_UI : public Gtk::Window
 
 	Width _strip_width;
 
-	static const int32_t default_width = -1;
+	static const int32_t default_width = 478;
 	static const int32_t default_height = 765;
 };