X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fsession.cc;h=61bfce14b6bfc995f0203b44e42bdf17652e60d8;hp=9ab82c7106acda07aa2b0853b769af4947a5436b;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=e55ef88ee9c95cb7e24077e78f459dbbbf615202

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 9ab82c7106..61bfce14b6 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -114,7 +114,7 @@
 
 #include "LuaBridge/LuaBridge.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #include <glibmm/checksum.h>
 
@@ -2030,59 +2030,55 @@ framepos_t
 Session::audible_frame () const
 {
 	framepos_t ret;
-	framepos_t tf;
-	framecnt_t offset;
 
-	offset = worst_playback_latency ();
+	frameoffset_t offset = worst_playback_latency (); // - _engine.samples_since_cycle_start ();
+	offset *= transport_speed ();
 
 	if (synced_to_engine()) {
 		/* Note: this is basically just sync-to-JACK */
-		tf = _engine.transport_frame();
+		ret = _engine.transport_frame();
 	} else {
-		tf = _transport_frame;
+		ret = _transport_frame;
 	}
 
-	ret = tf;
-
-	if (!non_realtime_work_pending()) {
-
-		/* MOVING */
+	if (transport_rolling()) {
+		ret -= offset;
 
 		/* Check to see if we have passed the first guaranteed
-		   audible frame past our last start position. if not,
-		   return that last start point because in terms
-		   of audible frames, we have not moved yet.
-
-		   `Start position' in this context means the time we last
-		   either started, located, or changed transport direction.
-		*/
+		 * audible frame past our last start position. if not,
+		 * return that last start point because in terms
+		 * of audible frames, we have not moved yet.
+		 *
+		 * `Start position' in this context means the time we last
+		 * either started, located, or changed transport direction.
+		 */
 
 		if (_transport_speed > 0.0f) {
 
 			if (!play_loop || !have_looped) {
-				if (tf < _last_roll_or_reversal_location + offset) {
+				if (ret < _last_roll_or_reversal_location) {
 					return _last_roll_or_reversal_location;
 				}
+			} else {
+				// latent loops
+				Location *location = _locations->auto_loop_location();
+				frameoffset_t lo = location->start() - ret;
+				if (lo > 0) {
+					ret = location->end () - lo;
+				}
 			}
 
-
-			/* forwards */
-			ret -= offset;
-
 		} else if (_transport_speed < 0.0f) {
 
 			/* XXX wot? no backward looping? */
 
-			if (tf > _last_roll_or_reversal_location - offset) {
+			if (ret > _last_roll_or_reversal_location) {
 				return _last_roll_or_reversal_location;
-			} else {
-				/* backwards */
-				ret += offset;
 			}
 		}
 	}
 
-	return ret;
+	return std::max ((framepos_t)0, ret);
 }
 
 void
@@ -3903,6 +3899,8 @@ Session::route_solo_changed (bool self_solo_changed, Controllable::GroupControlD
 
 		if ((*i)->solo_isolate_control()->solo_isolated() || !(*i)->can_solo()) {
 			/* route does not get solo propagated to it */
+			DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 excluded from solo because iso = %2 can_solo = %3\n", (*i)->name(), (*i)->solo_isolate_control()->solo_isolated(),
+			                                          (*i)->can_solo()));
 			continue;
 		}
 
@@ -4246,6 +4244,24 @@ Session::get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo
 	sl.sort (Stripable::PresentationOrderSorter());
 
 	for (StripableList::const_iterator s = sl.begin(); s != sl.end(); ++s) {
+
+		if ((*s)->presentation_info().hidden()) {
+			/* if the caller didn't explicitly ask for hidden
+			   stripables, ignore hidden ones. This matches
+			   the semantics of the pre-PresentationOrder
+			   "get by RID" logic of Ardour 4.x and earlier.
+
+			   XXX at some point we should likely reverse
+			   the logic of the flags, because asking for "the
+			   hidden stripables" is not going to be common,
+			   whereas asking for visible ones is normal.
+			*/
+
+			if (! (flags & PresentationInfo::Hidden)) {
+				continue;
+			}
+		}
+
 		if ((*s)->presentation_info().flag_match (flags)) {
 			if (match_cnt++ == n) {
 				return *s;