diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-09 22:25:18 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-09 22:25:18 +0000 |
| commit | 9b99745c5a15f84c24915e2b3882517f6fbc0162 (patch) | |
| tree | 1d73fb3d5044efce2aac3da2194deda516f565ae | |
| parent | e7bb933477f7cd3b6cb160776acd1e706b256af9 (diff) | |
fix auditioning (bystander casualty of monitoring fixes)
git-svn-id: svn://localhost/ardour2/branches/3.0@11212 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/ardour/auditioner.h | 2 | ||||
| -rw-r--r-- | libs/ardour/auditioner.cc | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 97ed164494..8c5a21bea6 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -48,6 +48,8 @@ class Auditioner : public AudioTrack int play_audition (framecnt_t nframes); + MonitorState monitoring_state () const; + void cancel_audition () { g_atomic_int_set (&_auditioning, 0); } diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index 7ba5e966fc..cdbe063acd 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -289,3 +289,9 @@ Auditioner::input_streams () const return ChanCount (); } + +MonitorState +Auditioner::monitoring_state () const +{ + return MonitoringDisk; +} |