diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-07 15:15:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-07 15:15:25 +0000 |
| commit | eead73098d19743446c1d5d615e1106efe6e37a1 (patch) | |
| tree | c957ae9c3985430f36117ef1ea6d764790d7f0e7 /libs/ardour/audio_track.cc | |
| parent | b83f21c3cf6f9385697ce4b2ca2b0f840a8438aa (diff) | |
reimplement Route::shift() from 2.X for "Insert Time"
git-svn-id: svn://localhost/ardour2/branches/3.0@8209 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_track.cc')
| -rw-r--r-- | libs/ardour/audio_track.cc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 182fdccd26..0b963f19bc 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -503,21 +503,11 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram bufs.set_count (chn); } - /* don't waste time with automation if we're recording or we've just stopped (yes it can happen) */ + /* final argument: don't waste time with automation if we're recording or we've just stopped (yes it can happen) */ - if (!diskstream->record_enabled() && _session.transport_rolling()) { -#ifdef XXX_MOVE_THIS_TO_AMP - Glib::Mutex::Lock am (data().control_lock(), Glib::TRY_LOCK); + process_output_buffers (bufs, start_frame, end_frame, nframes, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick, + (!diskstream->record_enabled() && _session.transport_rolling())); - if (am.locked() && gain_control()->automation_playback()) { - _amp->apply_gain_automation( - gain_control()->list()->curve().rt_safe_get_vector ( - start_frame, end_frame, _session.gain_automation_buffer(), nframes)); - } -#endif - } - - process_output_buffers (bufs, start_frame, end_frame, nframes, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick); } else { /* problem with the diskstream; just be quiet for a bit */ |