X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsmf_source.cc;h=f48fc301f71cd7d77de994c964814a8b91e29d06;hb=7d96960b162d25da87c388a3083775e8770bba56;hp=9833824697f8c43b5116f8bbd5b7e2256cbeef2c;hpb=03536cd399131e3fec54c95ae5ac6f11dca05aef;p=ardour.git diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 9833824697..f48fc301f7 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis Written by Dave Robillard, 2006 This program is free software; you can redistribute it and/or modify @@ -39,6 +39,7 @@ #include "ardour/event_type_map.h" #include "ardour/midi_model.h" #include "ardour/midi_ring_buffer.h" +#include "ardour/midi_state_tracker.h" #include "ardour/session.h" #include "ardour/smf_source.h" @@ -48,21 +49,24 @@ using namespace ARDOUR; using namespace Glib; /** Constructor used for new internal-to-session files. File cannot exist. */ -SMFSource::SMFSource (Session& s, const ustring& path, bool embedded, Source::Flag flags) +SMFSource::SMFSource (Session& s, const ustring& path, Source::Flag flags) : Source(s, DataType::MIDI, path, flags) , MidiSource(s, path) - , FileSource(s, DataType::MIDI, path, embedded, flags) + , FileSource(s, DataType::MIDI, path, flags) , Evoral::SMF() , _last_ev_time_beats(0.0) , _last_ev_time_frames(0) + , _smf_last_read_end (0) { - if (init(_name, false)) { + if (init(_path, false)) { throw failed_constructor (); } - + if (create(path)) { throw failed_constructor (); } + + load_model(true, true); // FIXME } /** Constructor used for existing internal-to-session files. */ @@ -72,18 +76,21 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist) , FileSource(s, node, must_exist) , _last_ev_time_beats(0.0) , _last_ev_time_frames(0) + , _smf_last_read_end (0) { - if (set_state(node)) { + if (set_state(node, Stateful::loading_state_version)) { throw failed_constructor (); } - - if (init(_name, true)) { + + if (init(_path, true)) { throw failed_constructor (); } - + if (open(_path)) { throw failed_constructor (); } + + load_model(true, true); // FIXME } SMFSource::~SMFSource () @@ -95,9 +102,10 @@ SMFSource::~SMFSource () /** All stamps in audio frames */ nframes_t -SMFSource::read_unlocked (MidiRingBuffer& dst, sframes_t position, - sframes_t start, nframes_t dur, - sframes_t stamp_offset, sframes_t negative_stamp_offset) const +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, + MidiStateTracker* tracker) const { int ret = 0; uint64_t time = 0; // in SMF ticks, 1 tick per _ppqn @@ -111,45 +119,67 @@ SMFSource::read_unlocked (MidiRingBuffer& dst, sframes_t position, uint8_t* ev_buffer = 0; size_t scratch_size = 0; // keep track of scratch to minimize reallocs - - BeatsFramesConverter converter(_session, position); + + BeatsFramesConverter converter(_session.tempo_map(), source_start); const uint64_t start_ticks = (uint64_t)(converter.from(start) * ppqn()); - if (_last_read_end == 0 || start != _last_read_end) { - cerr << "SMFSource::read_unlocked seeking to " << start << endl; + if (_smf_last_read_end == 0 || start != _smf_last_read_end) { + //cerr << "SMFSource::read_unlocked seeking to " << start << endl; Evoral::SMF::seek_to_start(); while (time < start_ticks) { ret = read_event(&ev_delta_t, &ev_size, &ev_buffer); if (ret == -1) { // EOF - _last_read_end = start + dur; - return dur; + _smf_last_read_end = start + duration; + return duration; } time += ev_delta_t; // accumulate delta time } } - - _last_read_end = start + dur; + + _smf_last_read_end = start + duration; while (true) { ret = read_event(&ev_delta_t, &ev_size, &ev_buffer); if (ret == -1) { // EOF break; } - + time += ev_delta_t; // accumulate delta time if (ret == 0) { // meta-event (skipped, just accumulate time) continue; } - + 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 + assert(time >= start_ticks); const sframes_t ev_frame_time = converter.to(time / (double)ppqn()) + stamp_offset; - if (ev_frame_time < start + dur) { - dst.write(ev_frame_time - negative_stamp_offset, ev_type, ev_size, ev_buffer); +#if 0 + cerr << " frames = " << ev_frame_time + << " w/offset = " << ev_frame_time - negative_stamp_offset + << endl; +#endif + + if (ev_frame_time < start + duration) { + destination.write(ev_frame_time - negative_stamp_offset, ev_type, ev_size, ev_buffer); + + if (tracker) { + if (ev_buffer[0] & MIDI_CMD_NOTE_ON) { + tracker->add (ev_buffer[1], ev_buffer[0] & 0xf); + } else if (ev_buffer[0] & MIDI_CMD_NOTE_OFF) { + tracker->remove (ev_buffer[1], ev_buffer[0] & 0xf); + } + } } else { break; } @@ -161,23 +191,23 @@ SMFSource::read_unlocked (MidiRingBuffer& dst, sframes_t position, } ev_size = scratch_size; // ensure read_event only allocates if necessary } - - return dur; + + return duration; } /** All stamps in audio frames */ nframes_t -SMFSource::write_unlocked (MidiRingBuffer& src, sframes_t position, nframes_t dur) +SMFSource::write_unlocked (MidiRingBuffer& source, sframes_t position, nframes_t duration) { _write_data_count = 0; - + nframes_t time; Evoral::EventType type; uint32_t size; size_t buf_capacity = 4; uint8_t* buf = (uint8_t*)malloc(buf_capacity); - + if (_model && ! _model->writing()) { _model->start_write(); } @@ -185,12 +215,12 @@ SMFSource::write_unlocked (MidiRingBuffer& src, sframes_t position, n Evoral::MIDIEvent ev; while (true) { - bool ret = src.peek_time(&time); - if (!ret || time > _last_write_end + dur) { + bool ret = source.peek_time(&time); + if (!ret || time > _last_write_end + duration) { break; } - ret = src.read_prefix(&time, &type, &size); + ret = source.read_prefix(&time, &type, &size); if (!ret) { cerr << "ERROR: Unable to read event prefix, corrupt MIDI ring buffer" << endl; break; @@ -201,23 +231,23 @@ SMFSource::write_unlocked (MidiRingBuffer& src, sframes_t position, n buf = (uint8_t*)realloc(buf, size); } - ret = src.read_contents(size, buf); + ret = source.read_contents(size, buf); if (!ret) { cerr << "ERROR: Read time/size but not buffer, corrupt MIDI ring buffer" << endl; break; } - + assert(time >= position); time -= position; - + ev.set(buf, size, time); ev.set_event_type(EventTypeMap::instance().midi_event_type(ev.buffer()[0])); 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; + /*cerr << "SMFSource: WARNING: caller tried to write non SMF-Event of type " + << std::hex << int(ev.buffer()[0]) << endl;*/ continue; } - + append_event_unlocked_frames(ev, position); } @@ -228,32 +258,33 @@ SMFSource::write_unlocked (MidiRingBuffer& src, sframes_t position, n Evoral::SMF::flush(); free(buf); - ViewDataRangeReady(position + _last_write_end, dur); /* EMIT SIGNAL */ + ViewDataRangeReady(position + _last_write_end, duration); /* EMIT SIGNAL */ - return dur; + return duration; } - + /** Append an event with a timestamp in beats (double) */ void SMFSource::append_event_unlocked_beats (const Evoral::Event& ev) { + assert(_writing); if (ev.size() == 0) { return; } /*printf("SMFSource: %s - append_event_unlocked_beats time = %lf, size = %u, data = ", - name().c_str(), ev.time(), ev.size()); + name().c_str(), 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) { cerr << "SMFSource: Warning: Skipping event with non-monotonic time" << endl; return; } - + _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()); @@ -271,23 +302,24 @@ SMFSource::append_event_unlocked_beats (const Evoral::Event& ev) void SMFSource::append_event_unlocked_frames (const Evoral::Event& ev, sframes_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()); + name().c_str(), 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; return; } - - BeatsFramesConverter converter(_session, position); - + + BeatsFramesConverter converter(_session.tempo_map(), position); + _length_beats = max(_length_beats, converter.from(ev.time())); - + 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())); @@ -312,17 +344,17 @@ SMFSource::get_state () } int -SMFSource::set_state (const XMLNode& node) +SMFSource::set_state (const XMLNode& node, int version) { - if (Source::set_state (node)) { + if (Source::set_state (node, version)) { return -1; } - if (MidiSource::set_state (node)) { + if (MidiSource::set_state (node, version)) { return -1; } - - if (FileSource::set_state (node)) { + + if (FileSource::set_state (node, version)) { return -1; } @@ -332,6 +364,7 @@ SMFSource::set_state (const XMLNode& node) void SMFSource::mark_streaming_midi_write_started (NoteMode mode, sframes_t start_frame) { + Glib::Mutex::Lock lm (_lock); MidiSource::mark_streaming_midi_write_started (mode, start_frame); Evoral::SMF::begin_write (); _last_ev_time_beats = 0.0; @@ -341,12 +374,13 @@ SMFSource::mark_streaming_midi_write_started (NoteMode mode, sframes_t start_fra void SMFSource::mark_streaming_write_completed () { + Glib::Mutex::Lock lm (_lock); MidiSource::mark_streaming_write_completed(); if (!writable()) { return; } - + _model->set_edited(false); Evoral::SMF::end_write (); } @@ -363,10 +397,10 @@ SMFSource::load_model (bool lock, bool force_reload) if (_writing) { return; } - - if (lock) { - Glib::Mutex::Lock lm (_lock); - } + + boost::shared_ptr lm; + if (lock) + lm = boost::shared_ptr(new Glib::Mutex::Lock(_lock)); if (_model && !force_reload) { return; @@ -374,10 +408,10 @@ SMFSource::load_model (bool lock, bool force_reload) if (! _model) { _model = boost::shared_ptr(new MidiModel(this)); - cerr << _name << " loaded new model " << _model.get() << endl; + //cerr << _name << " loaded new model " << _model.get() << endl; } else { - cerr << _name << " reloading model " << _model.get() - << " (" << _model->n_notes() << " notes)" <n_notes() << " notes)" << endl;*/ _model->clear(); } @@ -386,9 +420,9 @@ SMFSource::load_model (bool lock, bool force_reload) uint64_t time = 0; /* in SMF ticks */ Evoral::Event ev; - + size_t scratch_size = 0; // keep track of scratch and minimize reallocs - + uint32_t delta_t = 0; uint32_t size = 0; uint8_t* buf = NULL; @@ -396,7 +430,7 @@ SMFSource::load_model (bool lock, bool force_reload) while ((ret = read_event(&delta_t, &size, &buf)) >= 0) { time += delta_t; ev.set(buf, size, time / (double)ppqn()); - + if (ret > 0) { // didn't skip (meta) event ev.set_event_type(EventTypeMap::instance().midi_event_type(buf[0])); _model->append(ev); @@ -406,12 +440,12 @@ SMFSource::load_model (bool lock, bool force_reload) scratch_size = ev.size(); } ev.size() = scratch_size; // ensure read_event only allocates if necessary - + _length_beats = max(_length_beats, ev.time()); } set_default_controls_interpolation(); - + _model->end_write(false); _model->set_edited(false); @@ -420,8 +454,6 @@ SMFSource::load_model (bool lock, bool force_reload) free(buf); } -#define LINEAR_INTERPOLATION_MODE_WORKS_PROPERLY 0 - void SMFSource::set_default_controls_interpolation () { @@ -429,12 +461,7 @@ SMFSource::set_default_controls_interpolation () Evoral::ControlSet::Controls controls = _model->controls(); for (Evoral::ControlSet::Controls::iterator c = controls.begin(); c != controls.end(); ++c) { (*c).second->list()->set_interpolation( - // to be enabled when ControlList::rt_safe_earliest_event_linear_unlocked works properly - #if LINEAR_INTERPOLATION_MODE_WORKS_PROPERLY EventTypeMap::instance().interpolation_of((*c).first)); - #else - Evoral::ControlList::Discrete); - #endif } }