fix the naming and behavior of always-play-range to match the button, which is follow-edits. when you select a range, the playhead should jump to the start of the range and begin to play the selection. BUT (unlike previous implementation) if the user wants to relocate the playhead, then that should be allowed. The user should always remain in charge of the playhead location. NOTE: your previous config setting will be invalidated. You must re-save a session to overwrite with the new config variable

This commit is contained in:
Ben Loftis
2014-07-03 12:25:35 -05:00
parent 53a5f5d8ca
commit 043b76569d
12 changed files with 23 additions and 15 deletions

View File

@@ -148,7 +148,7 @@ CONFIG_VARIABLE (bool, secondary_clock_delta_edit_cursor, "secondary-clock-delta
CONFIG_VARIABLE (bool, show_track_meters, "show-track-meters", true)
CONFIG_VARIABLE (bool, locate_while_waiting_for_sync, "locate-while-waiting-for-sync", false)
CONFIG_VARIABLE (bool, disable_disarm_during_roll, "disable-disarm-during-roll", false)
CONFIG_VARIABLE (bool, always_play_range, "always-play-range", false)
CONFIG_VARIABLE (bool, follow_edits, "follow-edits", false)
CONFIG_VARIABLE (bool, super_rapid_clock_update, "super-rapid-clock-update", false)
/* metering */

View File

@@ -502,6 +502,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
framepos_t transport_frame () const {return _transport_frame; }
framepos_t audible_frame () const;
framepos_t requested_return_frame() const { return _requested_return_frame; }
void set_requested_return_frame(framepos_t return_to);
enum PullupFormat {
pullup_Plus4Plus1,

View File

@@ -1635,6 +1635,13 @@ Session::request_bounded_roll (framepos_t start, framepos_t end)
lar.push_back (ar);
request_play_range (&lar, true);
}
void
Session::set_requested_return_frame (framepos_t return_to)
{
_requested_return_frame = return_to;
}
void
Session::request_roll_at_and_return (framepos_t start, framepos_t return_to)
{