smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

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
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'> <menu name='Transport' action='Transport'>
<menuitem action='ToggleRoll'/> <menuitem action='ToggleRoll'/>
<menu action="PlayMenu"> <menu action="PlayMenu">
#if 0
<menuitem action='toggle-stationary-playhead'/>
#endif
<menuitem action='PlaySelection'/> <menuitem action='PlaySelection'/>
<menuitem action='PlayPreroll'/> <menuitem action='PlayPreroll'/>
<menuitem action='ToggleRollMaybe'/> <menuitem action='ToggleRollMaybe'/>
@ -149,6 +146,7 @@
<menuitem action='ToggleAutoReturn'/> <menuitem action='ToggleAutoReturn'/>
<menuitem action='ToggleClick'/> <menuitem action='ToggleClick'/>
<menuitem action='toggle-follow-playhead'/> <menuitem action='toggle-follow-playhead'/>
<menuitem action='toggle-stationary-playhead'/>
<menuitem action='ToggleFollowEdits'/> <menuitem action='ToggleFollowEdits'/>
<menuitem action='panic'/> <menuitem action='panic'/>
<separator/> <separator/>

13
gtk2_ardour/editor.cc
View file

@ -5688,13 +5688,14 @@ Editor::super_rapid_screen_update ()
} else { } else {
framepos_t const frame = playhead_cursor->current_frame (); if (!_dragging_playhead && _follow_playhead && _session->requested_return_frame() < 0 && !pending_visual_change.being_handled) {
double target = ((double)frame - (double)current_page_samples()/3.0); framepos_t const frame = playhead_cursor->current_frame ();
if (target <= 0.0) { double target = ((double)frame - (double)current_page_samples()/3.0);
target = 0.0; if (target <= 0.0) {
target = 0.0;
}
reset_x_origin (target);
} }
reset_x_origin (target);
} }