summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-03-30 21:22:14 +0200
committerRobin Gareus <robin@gareus.org>2017-03-30 22:07:06 +0200
commit478f26b2adfa236e7f2ac3cafd92b249f0af3008 (patch)
tree60c1f5f6494ddc38ed0a5cdfaa68778ce91e9e02 /libs/ardour/ardour
parent6e4eed51ca5c3bb44974dc74e9a8ddfa13f040ff (diff)
Count-in is a no-roll operation.
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/session.h4
1 files changed, 2 insertions, 2 deletions
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<gint*>(&_mtc_active)); }
bool synced_to_ltc () const { return config.get_external_sync() && Config->get_sync_source() == LTC && g_atomic_int_get (const_cast<gint*>(&_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; }