ardour/livetrax
13
0
Fork 0
Code

Hopefully fix disappearing MIDI recorded regions on the first record of a new session.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8993 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-03-01 02:03:52 +00:00
parent f9b1e437a5
commit 78310ad792
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/midi_source.h
View File

@ -81,6 +81,7 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this<
virtual void mark_streaming_midi_write_started (NoteMode mode, framepos_t start_time); virtual void mark_streaming_midi_write_started (NoteMode mode, framepos_t start_time);
virtual void mark_streaming_write_started (); virtual void mark_streaming_write_started ();
virtual void mark_streaming_write_completed (); virtual void mark_streaming_write_completed ();
void mark_write_starting_now ();
virtual void session_saved(); virtual void session_saved();

1
libs/ardour/midi_diskstream.cc
View File

@ -520,6 +520,7 @@ MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can
calculate_record_range(ot, transport_frame, nframes, rec_nframes, rec_offset); calculate_record_range(ot, transport_frame, nframes, rec_nframes, rec_offset);
if (rec_nframes && !was_recording) { if (rec_nframes && !was_recording) {
_write_source->mark_write_starting_now ();
capture_captured = 0; capture_captured = 0;
was_recording = true; was_recording = true;
} }

21
libs/ardour/midi_source.cc
View File

@ -267,17 +267,32 @@ MidiSource::midi_write (MidiRingBuffer<framepos_t>& source, framepos_t source_st
void void
MidiSource::mark_streaming_midi_write_started (NoteMode mode, framepos_t start_frame) MidiSource::mark_streaming_midi_write_started (NoteMode mode, framepos_t start_frame)
{ {
set_timeline_position(start_frame);
if (_model) { if (_model) {
_model->set_note_mode(mode); _model->set_note_mode(mode);
_model->start_write(); _model->start_write();
} }
_last_write_end = start_frame;
_writing = true; _writing = true;
} }
void
MidiSource::mark_write_starting_now ()
{
/* I'm not sure if this is the best way to approach this, but
_last_write_end needs to be set up with the transport frame
when a record actually starts, as it is used by
SMFSource::write_unlocked to decide whether incoming notes
are within the correct time range.
mark_streaming_midi_write_started (perhaps a more logical
place to do this) is not called at exactly the time when
record starts, and I don't think it necessarily can be
because it is not RT-safe.
*/
set_timeline_position (_session.transport_frame ());
_last_write_end = _session.transport_frame ();
}
void void
MidiSource::mark_streaming_write_started () MidiSource::mark_streaming_write_started ()
{ {