smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

removed _locked property from TransportMaster (it's a method, not a property)

Browse source
This commit is contained in:
Paul Davis 2019-03-03 10:12:08 -07:00
parent 84aedbb532
commit 86cac37680
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/ardour/transport_master.h
View file

@ -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;

7
libs/ardour/transport_master.cc
View file

@ -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);