initial version of playback priority design. No GUI control over options yet

Conflicts:
	libs/ardour/ardour/session.h
	libs/ardour/ardour/types.h
	libs/ardour/enums.cc
	libs/ardour/session_transport.cc
	system_config

3 files changed, 26 insertions, 1 deletions

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 10587aba2e..1defe3d54a 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -163,6 +163,7 @@ CONFIG_VARIABLE (ShuttleUnits, shuttle_units, "shuttle-units", Percentage)
 CONFIG_VARIABLE (float, shuttle_max_speed, "shuttle-max-speed", 8.0f)
 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 (AutoReturnTarget, auto_return_target_list, "auto-return-target-list", AutoReturnTarget(LastLocate|RangeSelectionStart|Loop|RegionSelectionStart))
 
 /* metering */
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 48243179f8..0714077302 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -847,6 +847,14 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 
 	void maybe_update_session_range (framepos_t, framepos_t);
 
+	/* temporary hacks to allow selection to be pushed from GUI into backend.
+	   Whenever we move the selection object into libardour, these will go away.
+	 */
+	void set_range_selection (framepos_t start, framepos_t end);
+	void set_object_selection (framepos_t start, framepos_t end);
+	void clear_range_selection ();
+	void clear_object_selection ();
+	
 	/* buffers for gain and pan */
 
 	gain_t* gain_automation_buffer () const;
@@ -1445,6 +1453,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 	void engine_halted ();
 	void xrun_recovery ();
 	void set_track_loop (bool);
+	bool select_playhead_priority_target (framepos_t&);
+	void follow_playhead_priority ();
 	
 	/* These are synchronous and so can only be called from within the process
 	 * cycle
@@ -1669,6 +1679,12 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 	void set_play_range (std::list<AudioRange>&, bool leave_rolling);
 	void unset_play_range ();
 
+	/* temporary hacks to allow selection to be pushed from GUI into backend
+	   Whenever we move the selection object into libardour, these will go away.
+	*/
+	Evoral::Range<framepos_t> _range_selection;
+	Evoral::Range<framepos_t> _object_selection;
+	
 	/* main outs */
 	uint32_t main_outs;
 
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 8d7fb125a1..ba521f3b71 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -635,6 +635,13 @@ namespace ARDOUR {
 		Custom,
 	};
 
+	enum AutoReturnTarget {
+		LastLocate = 0x1,
+		RangeSelectionStart = 0x2,
+		Loop = 0x4,
+		RegionSelectionStart = 0x8,
+	};
+
 } // namespace ARDOUR
 
 
@@ -662,6 +669,7 @@ std::istream& operator>>(std::istream& o, ARDOUR::PositionLockStyle& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::FadeShape& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::RegionSelectionAfterSplit& sf);
 std::istream& operator>>(std::istream& o, ARDOUR::BufferingPreset& var);
+std::istream& operator>>(std::istream& o, ARDOUR::AutoReturnTarget& sf);
 
 std::ostream& operator<<(std::ostream& o, const ARDOUR::SampleFormat& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::HeaderFormat& sf);
@@ -684,7 +692,7 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::PositionLockStyle& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::FadeShape& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::RegionSelectionAfterSplit& sf);
 std::ostream& operator<<(std::ostream& o, const ARDOUR::BufferingPreset& var);
-
+std::ostream& operator<<(std::ostream& o, const ARDOUR::AutoReturnTarget& sf);
 
 /* because these operators work on types which can be used when making
    a UI_CONFIG_VARIABLE (in gtk2_ardour) we need them to be exported.