diff options
| author | Robin Gareus <robin@gareus.org> | 2017-10-01 03:03:44 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-10-01 03:03:44 +0200 |
| commit | 05ab7a46b5cf4482ca999625da7405d47fd700a6 (patch) | |
| tree | e5caae0434d5fa192ae6593bce112a89679d2d6e /libs/ardour/disk_writer.cc | |
| parent | 0431ed3d3e1d91a19f9ce382a5531f71449b2d0c (diff) | |
Fix recording MIDI
- Fix API call to add region(midi_region) -- set count to "1"
- Forward DataRecorded() signal
- remove botched merge/rebase"
a4a87f56 accidentally brought back code from old-destructive API
which was removed in af103cf3 and 08c13007
There is no per track NonLayered record mode anymore, it's session global.
- set can_record correctly to not accidentally clear last capture sources
for cont'd recording (toggle track's rec-arm)
Diffstat (limited to 'libs/ardour/disk_writer.cc')
| -rw-r--r-- | libs/ardour/disk_writer.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc index 06218d1ff1..8fec82fa2a 100644 --- a/libs/ardour/disk_writer.cc +++ b/libs/ardour/disk_writer.cc @@ -359,7 +359,7 @@ DiskWriter::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_samp bool re = record_enabled (); bool punch_in = _session.config.get_punch_in () && _session.locations()->auto_punch_location (); bool can_record = _session.actively_recording (); - can_record |= _session.get_record_enabled () && punch_in && _session.transport_sample () <= _session.locations()->auto_punch_location ()->start (); + can_record |= speed != 0 && _session.get_record_enabled () && punch_in && _session.transport_sample () <= _session.locations()->auto_punch_location ()->start (); _need_butler = false; @@ -1371,14 +1371,8 @@ DiskWriter::use_destructive_playlist () assert((*chan)->write_source); (*chan)->write_source->set_allow_remove_if_empty (false); - /* this might be false if we switched modes, so force it */ - -#ifdef XXX_OLD_DESTRUCTIVE_API_XXX - (*chan)->write_source->set_destructive (true); -#else // should be set when creating the source or loading the state assert ((*chan)->write_source->destructive()); -#endif } /* the source list will never be reset for a destructive track */ |