MidiSource::MidiSource (Session& s, string name, Source::Flag flags)
: Source(s, DataType::MIDI, name, flags)
- , _read_data_count(0)
- , _write_data_count(0)
, _writing(false)
, _model_iter_valid(false)
, _length_beats(0.0)
MidiSource::MidiSource (Session& s, const XMLNode& node)
: Source(s, node)
- , _read_data_count(0)
- , _write_data_count(0)
, _writing(false)
, _model_iter_valid(false)
, _length_beats(0.0)
, _last_read_end(0)
, _last_write_end(0)
{
- _read_data_count = 0;
- _write_data_count = 0;
-
if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor();
}
BeatsFramesConverter converter(_session.tempo_map(), source_start);
- DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("MidiSource::midi-read() sstart %1 start %2 cnt %3 tracker %4\n",
- source_start, start, cnt, tracker));
+ DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("MidiSource::midi-read() %5 sstart %1 start %2 cnt %3 tracker %4\n",
+ source_start, start, cnt, tracker, name()));
if (_model) {
Evoral::Sequence<double>::const_iterator& i = _model_iter;
DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 search for relevant iterator for %1 / %2\n", _name, source_start, start));
for (i = _model->begin(0, false, filtered); i != _model->end(); ++i) {
if (converter.to(i->time()) >= start) {
+ DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("***\tstop iterator search @ %1\n", i->time()));
break;
}
}
}
}
} else {
+ DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("%1: reached end with event @ %2 vs. %3\n",
+ _name, time_frames, start+cnt));
break;
}
}
MidiSource::midi_write (MidiRingBuffer<framepos_t>& source, framepos_t source_start, framecnt_t duration)
{
Glib::Mutex::Lock lm (_lock);
- cerr << "MidiSource calling write unlocked\n";
+
const framecnt_t ret = write_unlocked (source, source_start, duration);
- _last_write_end += duration;
- cerr << name() << " last write end now @ " << _last_write_end << endl;
+
+ if (duration == max_framecnt) {
+ _last_read_end = 0;
+ } else {
+ _last_write_end += duration;
+ }
+
return ret;
}
}
void
-MidiSource::mark_streaming_write_completed ()
+MidiSource::mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption option, Evoral::MusicalTime end)
{
if (_model) {
- _model->end_write (false);
+ _model->end_write (option, end);
}
_writing = false;
}
+void
+MidiSource::mark_streaming_write_completed ()
+{
+ mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::DeleteStuckNotes);
+}
+
boost::shared_ptr<MidiSource>
MidiSource::clone (Evoral::MusicalTime begin, Evoral::MusicalTime end)
{
try to update it.
*/
- boost::shared_ptr<MidiModel> mm = _model ;
+ boost::shared_ptr<MidiModel> mm = _model;
_model.reset ();
/* flush model contents to disk