diff options
-rw-r--r-- | libs/ardour/ardour/transport_master.h | 1 | ||||
-rw-r--r-- | libs/ardour/transport_master.cc | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h index 98f8efae88..9ddc70c670 100644 --- a/libs/ardour/ardour/transport_master.h +++ b/libs/ardour/ardour/transport_master.h @@ -358,7 +358,6 @@ class LIBARDOUR_API TransportMaster : public PBD::Stateful { bool _pending_collect; bool _removeable; PBD::Property<TransportRequestType> _request_mask; /* lists transport requests still accepted when we're in control */ - PBD::Property<bool> _locked; PBD::Property<bool> _sclock_synced; PBD::Property<bool> _collect; PBD::Property<bool> _connected; 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); |