ardour/livetrax
13
0
Fork 0
Code

Enable stationary playhead mode.

Browse Source 
stationary playhead needs to follow same rules as regular moving playhead.
This commit is contained in:
Ben Loftis 2015-06-04 15:49:56 -05:00
parent b36d95d971
commit 9e44e46c4a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/ardour.menus.in
View File

@ -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/>

13
gtk2_ardour/editor.cc
View File

@ -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);
}