summaryrefslogtreecommitdiff
path: root/libs/ardour/transport_master.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2019-03-03 10:12:08 -0700
committerPaul Davis <paul@linuxaudiosystems.com>2019-03-03 10:12:08 -0700
commit86cac3768049693519fd9119198030f9c2e69ac3 (patch)
tree9b660ae7df71ed7f19ccf5aa11fff11e8e26f855 /libs/ardour/transport_master.cc
parent84aedbb532c46054f200d7312334da7c17776b8e (diff)
removed _locked property from TransportMaster (it's a method, not a property)
Diffstat (limited to 'libs/ardour/transport_master.cc')
-rw-r--r--libs/ardour/transport_master.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc
index dce72c5ed9..9da4fe8382 100644
--- a/libs/ardour/transport_master.cc
+++ b/libs/ardour/transport_master.cc
@@ -71,7 +71,6 @@ TransportMaster::TransportMaster (SyncSource t, std::string const & name)
, _pending_collect (true)
, _removeable (false)
, _request_mask (Properties::allowed_transport_requests, TransportRequestType (0))
- , _locked (Properties::locked, false)
, _sclock_synced (Properties::sclock_synced, false)
, _collect (Properties::collect, true)
, _connected (Properties::connected, false)
@@ -96,6 +95,11 @@ TransportMaster::speed_and_position (double& speed, samplepos_t& pos, samplepos_
return false;
}
+ if (!locked()) {
+ DEBUG_TRACE (DEBUG::Slave, string_compose ("%1: not locked, no speed and position!\n", name()));
+ return false;
+ }
+
SafeTime last;
current.safe_read (last);
@@ -147,7 +151,6 @@ TransportMaster::register_properties ()
_xml_node_name = state_node_name;
add_property (_name);
- add_property (_locked);
add_property (_collect);
add_property (_sclock_synced);
add_property (_request_mask);