From 478f26b2adfa236e7f2ac3cafd92b249f0af3008 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 30 Mar 2017 21:22:14 +0200 Subject: Count-in is a no-roll operation. --- libs/ardour/ardour/session.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 5dcf460085..ad2e69d083 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -720,9 +720,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool synced_to_mtc () const { return config.get_external_sync() && Config->get_sync_source() == MTC && g_atomic_int_get (const_cast(&_mtc_active)); } bool synced_to_ltc () const { return config.get_external_sync() && Config->get_sync_source() == LTC && g_atomic_int_get (const_cast(&_ltc_active)); } - double transport_speed() const { return _transport_speed; } + double transport_speed() const { return _count_in_samples > 0 ? 0. : _transport_speed; } bool transport_stopped() const { return _transport_speed == 0.0; } - bool transport_rolling() const { return _transport_speed != 0.0; } + bool transport_rolling() const { return _transport_speed != 0.0 && _count_in_samples == 0; } bool silent () { return _silent; } -- cgit v1.2.3