diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-02-17 12:20:16 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-02-17 12:20:16 +0000 |
| commit | c905d80ce4712faa66f2b11f3faea3b0fc112898 (patch) | |
| tree | 48f4a40c02ca887f507444bdb0c1d59618733ebf /libs/ardour/session.cc | |
| parent | 126d74e971d1d9651bcf74c91ddd98bf7891fb8f (diff) | |
Remove beat entry from meter dialog (beats are not allowed in API), clean up some hardware monitoring code, new configuration vars: ADAT Monitor Mode (documented) and Rubberbanding Snaps to Grid (self explanitory I hope, defaults to off), add some monitoring documentation.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3076 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session.cc')
| -rw-r--r-- | libs/ardour/session.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 034f87ad4a..a992e89458 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1311,11 +1311,11 @@ Session::step_back_from_record () if (g_atomic_int_get (&_record_status) == Recording) { g_atomic_int_set (&_record_status, Enabled); - if (Config->get_monitoring_model() == HardwareMonitoring) { + if (Config->get_monitoring_model() == HardwareMonitoring && Config->get_auto_input()) { boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader(); for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) { - if (Config->get_auto_input() && (*i)->record_enabled ()) { + if ((*i)->record_enabled ()) { //cerr << "switching from input" << __FILE__ << __LINE__ << endl << endl; (*i)->monitor_input (false); } |