Merged with trunk R992.

[ardour.git] / gtk2_ardour / editor_mixer.cc

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 410474114a0c7c8fe38f378327edbea62d4363cd..da09a956880c7a13095e51df9c137d8f02615c6c 100644 (file)
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -36,8 +36,6 @@ Editor::editor_mixer_button_toggled ()
        Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
        if (act) {
                Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
-               bool yn = tact->get_active();
-               cerr << "button toggled, state = " << yn << endl;
                show_editor_mixer (tact->get_active());
        }
 }
@@ -133,7 +131,7 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
 
                /* might be nothing to do */
 
-               if (&current_mixer_strip->route() == &at->route()) {
+               if (current_mixer_strip->route() == at->route()) {
                        return;
                }
 
@@ -159,7 +157,7 @@ Editor::update_current_screen ()
 {
        if (session && engine.running()) {
 
-               jack_nframes_t frame;
+               nframes_t frame;
 
                frame = session->audible_frame();
 
@@ -167,19 +165,30 @@ Editor::update_current_screen ()
 
                if (_follow_playhead) {
 
-                 playhead_cursor->canvas_item.show();
+
+                       playhead_cursor->canvas_item.show();
                        if (frame != last_update_frame) {
+                               const jack_nframes_t page_width = current_page_frames();
+
+                               // Percentage width of the visible range to use as a scroll interval
+                               // Idea: snap this to the nearest bar/beat/tick/etc, would make scrolling much
+                               // less jarring when zoomed in.. and it would be fun to watch :)
+                               static const double scroll_pct = 3.0/4.0;
+
+                               const jack_nframes_t rightmost_frame = leftmost_frame + page_width;
+                               const jack_nframes_t scroll_interval = (jack_nframes_t)(page_width * scroll_pct);
+                               const jack_nframes_t padding = (jack_nframes_t)floor((page_width-scroll_interval) / 2.0);
+
+                               if (frame < leftmost_frame + padding || frame > rightmost_frame - padding) {
 
-                               if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
-                                       
                                        if (session->transport_speed() < 0) {
-                                               if (frame > (current_page_frames()/2)) {
-                                                       center_screen (frame-(current_page_frames()/2));
+                                               if (frame > scroll_interval) {
+                                                       center_screen (frame - scroll_interval/2);
                                                } else {
-                                                       center_screen (current_page_frames()/2);
+                                                       center_screen (scroll_interval);
                                                }
                                        } else {
-                                               center_screen (frame+(current_page_frames()/2));
+                                               center_screen(frame + scroll_interval/2);
                                        }
                                }
 
@@ -187,7 +196,7 @@ Editor::update_current_screen ()
                        }
 
                } else {
-                       
+
                        if (frame != last_update_frame) {
                                if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
                                        playhead_cursor->canvas_item.hide();
@@ -202,7 +211,7 @@ Editor::update_current_screen ()
                if (current_mixer_strip) {
                        current_mixer_strip->fast_update ();
                }
-               
+
        }
 }
 
@@ -223,7 +232,7 @@ Editor::current_mixer_strip_hidden ()
                AudioTimeAxisView* tmp;
                
                if ((tmp = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-                       if (&(tmp->route()) == &(current_mixer_strip->route())) {
+                       if (tmp->route() == current_mixer_strip->route()) {
                                (*i)->set_selected (false);
                                break;
                        }
@@ -249,15 +258,15 @@ Editor::session_going_away ()
        cut_buffer->clear ();
 
        clicked_regionview = 0;
-       clicked_trackview = 0;
-       clicked_audio_trackview = 0;
+       clicked_axisview = 0;
+       clicked_routeview = 0;
        clicked_crossfadeview = 0;
        entered_regionview = 0;
        entered_track = 0;
        latest_regionview = 0;
        last_update_frame = 0;
        drag_info.item = 0;
-       last_audition_region = 0;
+       last_canvas_frame = 0;
 
        /* hide all tracks */
 
@@ -271,8 +280,6 @@ Editor::session_going_away ()
        group_model->clear ();
 
        edit_cursor_clock.set_session (0);
-       selection_start_clock.set_session (0);
-       selection_end_clock.set_session (0);
        zoom_range_clock.set_session (0);
        nudge_clock.set_session (0);