X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=bf9c9cbd18c6b63bedaa42776ea6d05ef4030503;hb=767984b486086e3682e521179c2fb8364b3bba76;hp=5108df60142677a433dbf75fdd17cd9e27244d4e;hpb=b09ab546542040b1d468c9925c60bda2dfd80da8;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 5108df6014..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"
 
@@ -46,7 +45,6 @@ namespace ARDOUR {
 	class RouteGroup;
 	class Session;
 	class AudioDiskstream;
-	class AudioEngine;
 };
 
 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;
@@ -110,7 +110,7 @@ class Mixer_UI : public Gtk::Window
 
 	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);
@@ -193,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;
 	};