add JAG to author list

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index d8c80f664a68f503c7f8b729a35764df173df8c0..809e7a759c60fac1f3cd6ffaa5e556c9476891c6 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -113,12 +113,15 @@ class Mixer_UI : public Gtk::Window
        void get_window_pos_and_size ();
 
        bool on_key_press_event (GdkEventKey*);
+       bool on_scroll_event (GdkEventScroll*);
 
        void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
        
        list<MixerStrip *> strips;
 
        bool strip_scroller_button_release (GdkEventButton*);
+       void scroll_left ();
+       void scroll_right ();
 
        void add_strip (ARDOUR::Session::RouteList&);
        void remove_strip (MixerStrip *);
@@ -152,6 +155,9 @@ class Mixer_UI : public Gtk::Window
        void redisplay_track_list ();
        bool no_track_list_redisplay;
        bool track_display_button_press (GdkEventButton*);
+#ifdef GTKOSX
+       void queue_draw_all_strips ();
+#endif
        
        void track_list_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
        void track_list_delete (const Gtk::TreeModel::Path&);
@@ -181,6 +187,8 @@ class Mixer_UI : public Gtk::Window
        void build_mix_group_context_menu ();
        void activate_all_mix_groups ();
        void disable_all_mix_groups ();
+       void show_all_mix_groups ();
+       void hide_all_mix_groups ();
        void add_mix_group (ARDOUR::RouteGroup *);
        void mix_groups_changed ();
        void mix_group_name_edit (const Glib::ustring&, const Glib::ustring&);
@@ -242,8 +250,9 @@ class Mixer_UI : public Gtk::Window
 
        Width _strip_width;
 
-       void sync_order_keys (void *src);
-       bool ignore_route_reorder;
+       void sync_order_keys (const char *src);
+       bool strip_redisplay_does_not_reset_order_keys;
+       bool strip_redisplay_does_not_sync_order_keys;
 
        static const int32_t default_width = 478;
        static const int32_t default_height = 765;