Tidy.

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 853304095f1b50aebea5304e51372470e6c6b3b3..01460b61dcb7f20b6c871dfb778a1af5e0571339 100644 (file)
--- 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,20 +32,19 @@
 #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 "route_processor_selection.h"
 #include "enums.h"
 
 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,35 +70,47 @@ 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 *);
 
        void ensure_float (Gtk::Window&);
+       void toggle_auto_rebinding ();
+       void set_auto_rebinding(bool);
 
        RouteRedirectSelection& selection() { return _selection; }
+
+       static const char* get_order_key();
        
   private:
-       ARDOUR::AudioEngine&     engine;
        ARDOUR::Session         *session;
+
+       bool                                    _visible;
        
-       Gtk::HBox                global_hpacker;
-       Gtk::VBox                global_vpacker;
-       Gtk::ScrolledWindow      scroller;
-       Gtk::EventBox            scroller_base;
-       Gtk::HBox                scroller_hpacker;
-       Gtk::VBox                mixer_scroller_vpacker;
-       Gtk::VBox                list_vpacker;
-       Gtk::Label               group_display_button_label;
-       Gtk::Button              group_display_button;
-       Gtk::ScrolledWindow      track_display_scroller;
-       Gtk::ScrolledWindow      group_display_scroller;
-       Gtk::VBox                group_display_vbox;
-       Gtk::Frame               track_display_frame;
-       Gtk::Frame               group_display_frame;
-       Gtk::VPaned              rhs_pane1;
-       Gtk::HBox                strip_packer;
-       Gtk::HBox                out_packer;
-       Gtk::HPaned              list_hpane;
+       Gtk::HBox                               global_hpacker;
+       Gtk::VBox                               global_vpacker;
+       Gtk::ScrolledWindow             scroller;
+       Gtk::EventBox                   scroller_base;
+       Gtk::HBox                               scroller_hpacker;
+       Gtk::VBox                               mixer_scroller_vpacker;
+       Gtk::VBox                               list_vpacker;
+       Gtk::Label                              group_display_button_label;
+       Gtk::Button                             group_display_button;
+       Gtk::ScrolledWindow             track_display_scroller;
+       Gtk::ScrolledWindow             group_display_scroller;
+       Gtk::VBox                               group_display_vbox;
+       Gtk::Frame                              track_display_frame;
+       Gtk::Frame                              group_display_frame;
+       Gtk::VPaned                             rhs_pane1;
+       Gtk::HBox                               strip_packer;
+       Gtk::HBox                               out_packer;
+       Gtk::HPaned                             list_hpane;
+
+       // for restoring window geometry.
+       int m_root_x, m_root_y, m_width, m_height;
+       
+       void set_window_pos_and_size ();
+       void get_window_pos_and_size ();
 
        bool on_key_press_event (GdkEventKey*);
 
@@ -110,7 +120,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);
@@ -121,6 +131,9 @@ class Mixer_UI : public Gtk::Window
        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);
 
@@ -131,8 +144,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 ();
 
@@ -144,6 +155,7 @@ class Mixer_UI : public Gtk::Window
        
        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 ();
@@ -180,7 +192,7 @@ class Mixer_UI : public Gtk::Window
 
        PluginSelector    *_plugin_selector;
 
-       void strip_name_changed (void *src, MixerStrip *);
+       void strip_name_changed (MixerStrip *);
 
        void group_flags_changed (void *src, ARDOUR::RouteGroup *);
 
@@ -195,7 +207,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;
        };
 
@@ -206,10 +218,10 @@ class Mixer_UI : public Gtk::Window
                    add (text);
                    add (group);
            }
-           Gtk::TreeModelColumn<bool>                active;
-           Gtk::TreeModelColumn<bool>  visible;
-           Gtk::TreeModelColumn<Glib::ustring>       text;
-           Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group;
+           Gtk::TreeModelColumn<bool>                                  active;
+           Gtk::TreeModelColumn<bool>                                  visible;
+           Gtk::TreeModelColumn<Glib::ustring>                 text;
+           Gtk::TreeModelColumn<ARDOUR::RouteGroup*>   group;
        };
 
        TrackDisplayModelColumns    track_columns;
@@ -230,7 +242,11 @@ class Mixer_UI : public Gtk::Window
 
        Width _strip_width;
 
-       static const int32_t default_width = -1;
+       void sync_order_keys ();
+       bool ignore_route_reorder;
+       bool ignore_sync;
+
+       static const int32_t default_width = 478;
        static const int32_t default_height = 765;
 };