Fix incorrect positioning of tempo line subdivisions if first meter is non-zero

[ardour.git] / gtk2_ardour / mixer_ui.h

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 27a5575f77f9ad7c01287b622e8d6e2e52a8f3cd..4e2bda711b4fc82ef5c5b532322164d036fc366d 100644 (file)
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -47,6 +47,7 @@
 #include "gtkmm2ext/tabbable.h"
 #include "gtkmm2ext/treeutils.h"
 
+#include "axis_provider.h"
 #include "enums.h"
 #include "route_processor_selection.h"
 
@@ -76,7 +77,7 @@ protected:
        virtual bool row_drop_possible_vfunc (const Gtk::TreeModel::Path&, const Gtk::SelectionData&) const;
 };
 
-class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
+class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public AxisViewProvider
 {
   public:
        static Mixer_UI* instance();
@@ -86,7 +87,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void show_window ();
 
        void set_session (ARDOUR::Session *);
-       void track_editor_selection ();
 
        PluginSelector* plugin_selector();
 
@@ -112,8 +112,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void select_strip (MixerStrip&, bool add=false);
        void select_none ();
 
-       bool window_not_visible () const;
-
        void do_vca_assign (boost::shared_ptr<ARDOUR::VCA>);
        void do_vca_unassign (boost::shared_ptr<ARDOUR::VCA>);
        void show_spill (boost::shared_ptr<ARDOUR::Stripable>);
@@ -122,6 +120,9 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        sigc::signal1<void,boost::shared_ptr<ARDOUR::Stripable> > show_spill_change;
 
        RouteProcessorSelection& selection() { return _selection; }
+
+       void show_editor_window () const;
+
        void register_actions ();
 
         void load_bindings ();
@@ -187,7 +188,10 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        void remove_master (VCAMasterStrip*);
 
        MixerStrip* strip_by_route (boost::shared_ptr<ARDOUR::Route>) const;
-       AxisView* axis_by_stripable (boost::shared_ptr<ARDOUR::Stripable>) const;
+       MixerStrip* strip_by_stripable (boost::shared_ptr<ARDOUR::Stripable>) const;
+
+       AxisView* axis_view_by_stripable (boost::shared_ptr<ARDOUR::Stripable>) const;
+       AxisView* axis_view_by_control (boost::shared_ptr<ARDOUR::AutomationControl>) const;
 
        void hide_all_strips (bool with_select);
        void unselect_all_strips();
@@ -238,7 +242,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
        ARDOUR::PluginPresetPtr selected_plugin ();
 
        void initial_track_display ();
-       void show_track_list_menu ();
 
        void set_all_strips_visibility (bool yn);
        void set_all_audio_midi_visibility (int, bool);
@@ -336,8 +339,9 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 
        Width _strip_width;
 
+       void presentation_info_changed (PBD::PropertyChange const &);
+       void sync_treeview_from_presentation_info (PBD::PropertyChange const &);
        void sync_presentation_info_from_treeview ();
-       void sync_treeview_from_presentation_info ();
 
        bool ignore_reorder;
 
@@ -361,9 +365,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 
        friend class MixerGroupTabs;
 
-       void follow_editor_selection ();
-       bool _following_editor_selection;
-
        void monitor_section_going_away ();
 
        void monitor_section_attached ();