append_event_unlocked_frames(ev, position);
}
- Evoral::SMF::flush();
+ Evoral::SMF::flush ();
free (buf);
return duration;
return;
}
- /* printf("SMFSource: %s - append_event_unlocked_frames ID = %d time = %u, 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");*/
+ // printf("SMFSource: %s - append_event_unlocked_frames ID = %d time = %u, 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");
if (ev.time() < _last_ev_time_frames) {
cerr << "SMFSource: Warning: Skipping event with non-monotonic time" << endl;
const Evoral::Event<double> beat_ev (ev.event_type(),
ev_time_beats,
ev.size(),
- (uint8_t*)ev.buffer());
+ const_cast<uint8_t*>(ev.buffer()));
_model->append (beat_ev, event_id);
}
void
SMFSource::mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption stuck_notes_option, Evoral::MusicalTime when)
{
- Glib::Mutex::Lock lm (_lock);
+ Glib::Threads::Mutex::Lock lm (_lock);
MidiSource::mark_midi_streaming_write_completed (stuck_notes_option, when);
if (!writable()) {
+ warning << string_compose ("attempt to write to unwritable SMF file %1", _path) << endmsg;
return;
}
return;
}
- boost::shared_ptr<Glib::Mutex::Lock> lm;
+ boost::shared_ptr<Glib::Threads::Mutex::Lock> lm;
if (lock)
- lm = boost::shared_ptr<Glib::Mutex::Lock>(new Glib::Mutex::Lock(_lock));
+ lm = boost::shared_ptr<Glib::Threads::Mutex::Lock>(new Glib::Threads::Mutex::Lock(_lock));
if (_model && !force_reload) {
return;