DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: start %1 duration %2\n", start, duration));
- _read_data_count = 0;
-
// Output parameters for read_event (which will allocate scratch in buffer as needed)
uint32_t ev_delta_t = 0;
uint32_t ev_type = 0;
break;
}
- _read_data_count += ev_size;
-
if (ev_size > scratch_size) {
scratch_size = ev_size;
}
mark_streaming_write_started ();
}
- _write_data_count = 0;
-
framepos_t time;
Evoral::EventType type;
uint32_t size;
Evoral::MIDIEvent<framepos_t> ev;
+ // cerr << "SMFSource::write unlocked, begins writing from src buffer with _last_write_end = " << _last_write_end << " dur = " << duration << endl;
+
while (true) {
- bool ret = source.peek ((uint8_t*)&time, sizeof (time));
- if (!ret || time > _last_write_end + duration) {
+ bool ret;
+
+ if (!(ret = source.peek ((uint8_t*)&time, sizeof (time)))) {
+ /* no more events to consider */
break;
}
- ret = source.read_prefix(&time, &type, &size);
- if (!ret) {
- cerr << "ERROR: Unable to read event prefix, corrupt MIDI ring buffer" << endl;
+ if ((duration != max_framecnt) && (time > (_last_write_end + duration))) {
+ DEBUG_TRACE (DEBUG::MidiIO, string_compose ("SMFSource::write_unlocked: dropping event @ %1 because it is later than %2 + %3\n",
+ time, _last_write_end, duration));
+ break;
+ }
+
+ if (!(ret = source.read_prefix (&time, &type, &size))) {
+ error << _("Unable to read event prefix, corrupt MIDI ring buffer") << endmsg;
break;
}
ret = source.read_contents(size, buf);
if (!ret) {
- cerr << "ERROR: Read time/size but not buffer, corrupt MIDI ring buffer" << endl;
+ error << _("Read time/size but not buffer, corrupt MIDI ring buffer") << endmsg;
break;
}
}
Evoral::SMF::flush();
- free(buf);
+ free (buf);
return duration;
}
return;
}
- /* printf("SMFSource: %s - append_event_unlocked_beats ID = %d time = %lf, size = %u, data = ",
+ /*printf("SMFSource: %s - append_event_unlocked_beats ID = %d time = %lf, size = %u, data = ",
name().c_str(), ev.id(), ev.time(), ev.size());
- for (size_t i = 0; i < ev.size(); ++i) printf("%X ", ev.buffer()[i]); printf("\n");*/
+ for (size_t i = 0; i < ev.size(); ++i) printf("%X ", ev.buffer()[i]); printf("\n");*/
assert(ev.time() >= 0);
if (ev.time() < _last_ev_time_beats) {
Evoral::SMF::append_event_delta(delta_time_ticks, ev.size(), ev.buffer(), event_id);
_last_ev_time_beats = ev.time();
-
- _write_data_count += ev.size();
-
}
/** Append an event with a timestamp in frames (framepos_t) */
{
assert(_writing);
if (ev.size() == 0) {
+ cerr << "SMFSource: asked to append zero-size event\n";
return;
}
_length_beats = max(_length_beats, ev_time_beats);
- const framepos_t delta_time_frames = ev.time() - _last_ev_time_frames;
- const double delta_time_beats = converter.from(delta_time_frames);
- const uint32_t delta_time_ticks = (uint32_t)(lrint(delta_time_beats * (double)ppqn()));
+ const Evoral::MusicalTime last_time_beats = converter.from (_last_ev_time_frames);
+ const Evoral::MusicalTime delta_time_beats = ev_time_beats - last_time_beats;
+ const uint32_t delta_time_ticks = (uint32_t)(lrint(delta_time_beats * (double)ppqn()));
Evoral::SMF::append_event_delta(delta_time_ticks, ev.size(), ev.buffer(), event_id);
_last_ev_time_frames = ev.time();
-
- _write_data_count += ev.size();
-
}
XMLNode&
void
SMFSource::mark_streaming_write_completed ()
+{
+ mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::DeleteStuckNotes);
+}
+
+void
+SMFSource::mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption stuck_notes_option, Evoral::MusicalTime when)
{
Glib::Mutex::Lock lm (_lock);
- MidiSource::mark_streaming_write_completed();
+ MidiSource::mark_midi_streaming_write_completed (stuck_notes_option, when);
if (!writable()) {
return;
bool
SMFSource::safe_midi_file_extension (const string& file)
{
- return (file.rfind(".mid") != string::npos);
+ return (file.rfind(".mid") != string::npos) || (file.rfind (".MID") != string::npos);
}
void
uint64_t time = 0; /* in SMF ticks */
Evoral::Event<double> ev;
- size_t scratch_size = 0; // keep track of scratch and minimize reallocs
+ uint32_t scratch_size = 0; // keep track of scratch and minimize reallocs
uint32_t delta_t = 0;
uint32_t size = 0;
_model->append (ev, event_id);
- if (ev.size() > scratch_size) {
- scratch_size = ev.size();
- }
-
- ev.size() = scratch_size; // ensure read_event only allocates if necessary
+ // Set size to max capacity to minimize allocs in read_event
+ scratch_size = std::max(size, scratch_size);
+ size = scratch_size;
_length_beats = max(_length_beats, ev.time());
}
have_event_id = false;
}
- _model->end_write(false);
- _model->set_edited(false);
+ _model->end_write (Evoral::Sequence<Evoral::MusicalTime>::ResolveStuckNotes, _length_beats);
+ _model->set_edited (false);
_model_iter = _model->begin();
return;
}
- Evoral::SMF::end_write();
+ Evoral::SMF::end_write ();
/* data in the file means its no longer removable */
mark_nonremovable ();
}