ardour/livetrax
13
0
Fork 0
Code

different version of previous commit that leaves previous semantics intact unless punch in/out are enabled

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13200 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-09-27 14:11:01 +00:00
parent f940452bc0
commit 02a98547f1
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/ardour/track.cc
View File

@ -832,10 +832,22 @@ Track::monitoring_state () const
bool const roll = _session.transport_rolling (); bool const roll = _session.transport_rolling ();
bool const track_rec = _diskstream->record_enabled (); bool const track_rec = _diskstream->record_enabled ();
bool const session_rec = _session.actively_recording ();
bool const auto_input = _session.config.get_auto_input (); bool const auto_input = _session.config.get_auto_input ();
bool const software_monitor = Config->get_monitoring_model() == SoftwareMonitoring; bool const software_monitor = Config->get_monitoring_model() == SoftwareMonitoring;
bool const tape_machine_mode = Config->get_tape_machine_mode (); bool const tape_machine_mode = Config->get_tape_machine_mode ();
bool session_rec;
/* I suspect that just use actively_recording() is good enough all the
* time, but just to keep the semantics the same as they were before
* sept 26th 2012, we differentiate between the cases where punch is
* enabled and those where it is not.
*/
if (_session.config.get_punch_in() || _session.config.get_punch_out()) {
session_rec = _session.actively_recording ();
} else {
session_rec = _session.get_record_enabled();
}
if (track_rec) { if (track_rec) {