X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsmf_source.cc;h=f134ff53351be085c73cc790eb35fec230fc21bc;hb=e47dd1a96aef5ff5eb175e39da73154e86425480;hp=e4727761b537ff0d41130c57be49ed948f6ecf72;hpb=f1114dedeecf4279a4c19a85be0c11e9fde5610b;p=ardour.git diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index e4727761b5..f134ff5335 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -41,22 +41,27 @@ #include "ardour/midi_state_tracker.h" #include "ardour/session.h" #include "ardour/smf_source.h" +#include "ardour/debug.h" #include "i18n.h" using namespace ARDOUR; using namespace Glib; +using namespace PBD; /** Constructor used for new internal-to-session files. File cannot exist. */ -SMFSource::SMFSource (Session& s, const ustring& path, Source::Flag flags) +SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) : Source(s, DataType::MIDI, path, flags) - , MidiSource(s, path) - , FileSource(s, DataType::MIDI, path, flags) + , MidiSource(s, path, flags) + , FileSource(s, DataType::MIDI, path, string(), flags) , Evoral::SMF() , _last_ev_time_beats(0.0) , _last_ev_time_frames(0) , _smf_last_read_end (0) + , _smf_last_read_time (0) { + /* note that origin remains empty */ + if (init(_path, false)) { throw failed_constructor (); } @@ -64,8 +69,6 @@ SMFSource::SMFSource (Session& s, const ustring& path, Source::Flag flags) if (create(path)) { throw failed_constructor (); } - - load_model(true, true); // FIXME } /** Constructor used for existing internal-to-session files. */ @@ -76,6 +79,7 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist) , _last_ev_time_beats(0.0) , _last_ev_time_frames(0) , _smf_last_read_end (0) + , _smf_last_read_time (0) { if (set_state(node, Stateful::loading_state_version)) { throw failed_constructor (); @@ -88,8 +92,6 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist) if (open(_path)) { throw failed_constructor (); } - - load_model(true, true); // FIXME } SMFSource::~SMFSource () @@ -100,15 +102,16 @@ SMFSource::~SMFSource () } /** All stamps in audio frames */ -nframes_t -SMFSource::read_unlocked (Evoral::EventSink& destination, sframes_t source_start, - sframes_t start, nframes_t duration, - sframes_t stamp_offset, sframes_t negative_stamp_offset, +framecnt_t +SMFSource::read_unlocked (Evoral::EventSink& destination, framepos_t const source_start, + framepos_t start, framecnt_t duration, MidiStateTracker* tracker) const { int ret = 0; uint64_t time = 0; // in SMF ticks, 1 tick per _ppqn + 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) @@ -122,29 +125,38 @@ SMFSource::read_unlocked (Evoral::EventSink& destination, sframes_t s BeatsFramesConverter converter(_session.tempo_map(), source_start); const uint64_t start_ticks = (uint64_t)(converter.from(start) * ppqn()); + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: start in ticks %1\n", start_ticks)); if (_smf_last_read_end == 0 || start != _smf_last_read_end) { - //cerr << "SMFSource::read_unlocked seeking to " << start << endl; + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: seek to %1\n", start)); Evoral::SMF::seek_to_start(); while (time < start_ticks) { - ret = read_event(&ev_delta_t, &ev_size, &ev_buffer); + gint ignored; + + ret = read_event(&ev_delta_t, &ev_size, &ev_buffer, &ignored); if (ret == -1) { // EOF _smf_last_read_end = start + duration; return duration; } time += ev_delta_t; // accumulate delta time } + } else { + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: set time to %1\n", _smf_last_read_time)); + time = _smf_last_read_time; } _smf_last_read_end = start + duration; while (true) { - ret = read_event(&ev_delta_t, &ev_size, &ev_buffer); + gint ignored; /* XXX don't ignore note id's ??*/ + + ret = read_event(&ev_delta_t, &ev_size, &ev_buffer, &ignored); if (ret == -1) { // EOF break; } time += ev_delta_t; // accumulate delta time + _smf_last_read_time = time; if (ret == 0) { // meta-event (skipped, just accumulate time) continue; @@ -152,25 +164,18 @@ SMFSource::read_unlocked (Evoral::EventSink& destination, sframes_t s ev_type = EventTypeMap::instance().midi_event_type(ev_buffer[0]); -#if 0 - cerr << "+++ SMF source read " - << " delta = " << ev_delta_t - << " time = " << time - << " buf[0] " << hex << (int) ev_buffer[0] << dec - << " type = " << ev_type; -#endif + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked delta %1, time %2, buf[0] %3, type %4\n", + ev_delta_t, time, ev_buffer[0], ev_type)); assert(time >= start_ticks); - const sframes_t ev_frame_time = converter.to(time / (double)ppqn()) + stamp_offset; -#if 0 - cerr << " frames = " << ev_frame_time - << " w/offset = " << ev_frame_time - negative_stamp_offset - << endl; -#endif + /* Note that we add on the source start time (in session frames) here so that ev_frame_time + is in session frames. + */ + const framepos_t ev_frame_time = converter.to(time / (double)ppqn()) + source_start; if (ev_frame_time < start + duration) { - destination.write(ev_frame_time - negative_stamp_offset, ev_type, ev_size, ev_buffer); + destination.write (ev_frame_time, ev_type, ev_size, ev_buffer); if (tracker) { if (ev_buffer[0] & MIDI_CMD_NOTE_ON) { @@ -194,13 +199,16 @@ SMFSource::read_unlocked (Evoral::EventSink& destination, sframes_t s return duration; } -/** All stamps in audio frames */ -nframes_t -SMFSource::write_unlocked (MidiRingBuffer& source, sframes_t position, nframes_t duration) +/** Write data to this source from a MidiRingBuffer. + * @param source Buffer to read from. + * @param position This source's start position in session frames. + */ +framecnt_t +SMFSource::write_unlocked (MidiRingBuffer& source, framepos_t position, framecnt_t duration) { _write_data_count = 0; - nframes_t time; + framepos_t time; Evoral::EventType type; uint32_t size; @@ -211,7 +219,7 @@ SMFSource::write_unlocked (MidiRingBuffer& source, sframes_t position _model->start_write(); } - Evoral::MIDIEvent ev; + Evoral::MIDIEvent ev; while (true) { bool ret = source.peek_time(&time); @@ -236,11 +244,14 @@ SMFSource::write_unlocked (MidiRingBuffer& source, sframes_t position break; } + /* convert from session time to time relative to the source start */ assert(time >= position); time -= position; ev.set(buf, size, time); ev.set_event_type(EventTypeMap::instance().midi_event_type(ev.buffer()[0])); + ev.set_id (Evoral::next_event_id()); + if (!(ev.is_channel_event() || ev.is_smf_meta_event() || ev.is_sysex())) { /*cerr << "SMFSource: WARNING: caller tried to write non SMF-Event of type " << std::hex << int(ev.buffer()[0]) << endl;*/ @@ -250,15 +261,9 @@ SMFSource::write_unlocked (MidiRingBuffer& source, sframes_t position append_event_unlocked_frames(ev, position); } - if (_model) { - set_default_controls_interpolation(); - } - Evoral::SMF::flush(); free(buf); - ViewDataRangeReady(position + _last_write_end, duration); /* EMIT SIGNAL */ - return duration; } @@ -271,10 +276,10 @@ SMFSource::append_event_unlocked_beats (const Evoral::Event& ev) if (ev.size() == 0) { return; } - - /*printf("SMFSource: %s - append_event_unlocked_beats time = %lf, size = %u, data = ", - name().c_str(), 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_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");*/ assert(ev.time() >= 0); if (ev.time() < _last_ev_time_beats) { @@ -282,33 +287,42 @@ SMFSource::append_event_unlocked_beats (const Evoral::Event& ev) return; } + Evoral::event_id_t event_id; + + if (ev.id() < 0) { + event_id = Evoral::next_event_id(); + } else { + event_id = ev.id(); + } + + if (_model) { + _model->append (ev, event_id); + } + _length_beats = max(_length_beats, ev.time()); const double delta_time_beats = ev.time() - _last_ev_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()); + 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(); - if (_model) { - _model->append(ev); - } } -/** Append an event with a timestamp in frames (nframes_t) */ +/** Append an event with a timestamp in frames (framepos_t) */ void -SMFSource::append_event_unlocked_frames (const Evoral::Event& ev, sframes_t position) +SMFSource::append_event_unlocked_frames (const Evoral::Event& ev, framepos_t position) { assert(_writing); if (ev.size() == 0) { return; } - /*printf("SMFSource: %s - append_event_unlocked_frames time = %u, size = %u, data = ", - name().c_str(), 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; @@ -316,30 +330,42 @@ SMFSource::append_event_unlocked_frames (const Evoral::Event& ev, sfr } BeatsFramesConverter converter(_session.tempo_map(), position); + const double ev_time_beats = converter.from(ev.time()); + Evoral::event_id_t event_id; - _length_beats = max(_length_beats, converter.from(ev.time())); + if (ev.id() < 0) { + event_id = Evoral::next_event_id(); + } else { + event_id = ev.id(); + } + + if (_model) { + const Evoral::Event beat_ev (ev.event_type(), + ev_time_beats, + ev.size(), + (uint8_t*)ev.buffer()); + _model->append (beat_ev, event_id); + } - const sframes_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())); + _length_beats = max(_length_beats, ev_time_beats); - Evoral::SMF::append_event_delta(delta_time_ticks, ev.size(), ev.buffer()); + 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())); + + 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(); - if (_model) { - const double ev_time_beats = converter.from(ev.time()); - const Evoral::Event beat_ev( - ev.event_type(), ev_time_beats, ev.size(), (uint8_t*)ev.buffer()); - _model->append(beat_ev); - } } XMLNode& SMFSource::get_state () { - return MidiSource::get_state(); + XMLNode& node = MidiSource::get_state(); + node.add_property (X_("origin"), _origin); + return node; } int @@ -361,7 +387,7 @@ SMFSource::set_state (const XMLNode& node, int version) } void -SMFSource::mark_streaming_midi_write_started (NoteMode mode, sframes_t start_frame) +SMFSource::mark_streaming_midi_write_started (NoteMode mode, framepos_t start_frame) { Glib::Mutex::Lock lm (_lock); MidiSource::mark_streaming_midi_write_started (mode, start_frame); @@ -380,14 +406,21 @@ SMFSource::mark_streaming_write_completed () return; } - _model->set_edited(false); + if (_model) { + _model->set_edited(false); + } + Evoral::SMF::end_write (); + + /* data in the file now, not removable */ + + mark_nonremovable (); } bool -SMFSource::safe_midi_file_extension (const Glib::ustring& file) +SMFSource::safe_midi_file_extension (const string& file) { - return (file.rfind(".mid") != Glib::ustring::npos); + return (file.rfind(".mid") != string::npos); } void @@ -405,12 +438,9 @@ SMFSource::load_model (bool lock, bool force_reload) return; } - if (! _model) { - _model = boost::shared_ptr(new MidiModel(this)); - //cerr << _name << " loaded new model " << _model.get() << endl; + if (!_model) { + _model = boost::shared_ptr (new MidiModel (shared_from_this ())); } else { - /*cerr << _name << " reloading model " << _model.get() - << " (" << _model->n_notes() << " notes)" << endl;*/ _model->clear(); } @@ -426,25 +456,65 @@ SMFSource::load_model (bool lock, bool force_reload) uint32_t size = 0; uint8_t* buf = NULL; int ret; - while ((ret = read_event(&delta_t, &size, &buf)) >= 0) { + gint event_id; + bool have_event_id = false; + + while ((ret = read_event (&delta_t, &size, &buf, &event_id)) >= 0) { + time += delta_t; - ev.set(buf, size, time / (double)ppqn()); + + if (ret == 0) { + + /* meta-event : did we get an event ID ? + */ + + if (event_id >= 0) { + have_event_id = true; + } - if (ret > 0) { // didn't skip (meta) event + continue; + } + + if (ret > 0) { + + /* not a meta-event */ + + ev.set (buf, size, time / (double)ppqn()); ev.set_event_type(EventTypeMap::instance().midi_event_type(buf[0])); - _model->append(ev); - } - if (ev.size() > scratch_size) { - scratch_size = ev.size(); + if (!have_event_id) { + event_id = Evoral::next_event_id(); + } +#ifndef NDEBUG + std::string ss; + + for (uint32_t xx = 0; xx < size; ++xx) { + char b[8]; + snprintf (b, sizeof (b), "0x%x ", buf[xx]); + ss += b; + } + + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF %6 load model delta %1, time %2, size %3 buf %4, type %5\n", + delta_t, time, size, ss , ev.event_type(), name())); +#endif + + _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 + + _length_beats = max(_length_beats, ev.time()); } - ev.size() = scratch_size; // ensure read_event only allocates if necessary - _length_beats = max(_length_beats, ev.time()); + /* event ID's must immediately precede the event they are for + */ + + have_event_id = false; } - set_default_controls_interpolation(); - _model->end_write(false); _model->set_edited(false); @@ -453,18 +523,6 @@ SMFSource::load_model (bool lock, bool force_reload) free(buf); } -void -SMFSource::set_default_controls_interpolation () -{ - // set interpolation style to defaults, can be changed by the GUI later - Evoral::ControlSet::Controls controls = _model->controls(); - for (Evoral::ControlSet::Controls::iterator c = controls.begin(); c != controls.end(); ++c) { - (*c).second->list()->set_interpolation( - EventTypeMap::instance().interpolation_of((*c).first)); - } -} - - void SMFSource::destroy_model () { @@ -475,6 +533,18 @@ SMFSource::destroy_model () void SMFSource::flush_midi () { + if (!writable()) { + return; + } + Evoral::SMF::end_write(); + /* data in the file means its no longer removable */ + mark_nonremovable (); } +void +SMFSource::set_path (const string& p) +{ + FileSource::set_path (p); + SMF::set_path (_path); +}