Enable stationary playhead mode.

stationary playhead needs to follow same rules as regular moving playhead.

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 9b51920b32c7c7f8a93142e7c8ee0d6163d3b63b..3fe9bb9ea548b9b5ac858b7abdbe59282ce39865 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -54,9 +54,6 @@
     <menu name='Transport' action='Transport'>
       <menuitem action='ToggleRoll'/>
       <menu action="PlayMenu">
-#if 0
-        <menuitem action='toggle-stationary-playhead'/>
-#endif
         <menuitem action='PlaySelection'/>
         <menuitem action='PlayPreroll'/>
         <menuitem action='ToggleRollMaybe'/>
@@ -149,6 +146,7 @@
       <menuitem action='ToggleAutoReturn'/>
       <menuitem action='ToggleClick'/>
       <menuitem action='toggle-follow-playhead'/>
+      <menuitem action='toggle-stationary-playhead'/>
       <menuitem action='ToggleFollowEdits'/>
       <menuitem action='panic'/>
      <separator/>

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index fe5e1a6b985eb12c6c4ac1d6da7ee5aea9b39cb2..e5aa60d9ab7f4960306f46630446de15fe4ab5c2 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -5688,13 +5688,14 @@ Editor::super_rapid_screen_update ()
 
                } else {
 
-                       framepos_t const frame = playhead_cursor->current_frame ();
-                       double target = ((double)frame - (double)current_page_samples()/3.0);
-                       if (target <= 0.0) {
-                               target = 0.0;
+                       if (!_dragging_playhead && _follow_playhead && _session->requested_return_frame() < 0 && !pending_visual_change.being_handled) {
+                               framepos_t const frame = playhead_cursor->current_frame ();
+                               double target = ((double)frame - (double)current_page_samples()/3.0);
+                               if (target <= 0.0) {
+                                       target = 0.0;
+                               }
+                               reset_x_origin (target);
                        }
-                       reset_x_origin (target);
-
 
                }