X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_source.cc;h=2b0efd78e165d7a02f40433722a72e241e3c813c;hb=8f59346592b8232e910ce0bbdc247cf8cecde4dd;hp=f92d6a2a4fe784c17e39a3bc18b16417eace367f;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index f92d6a2a4f..2b0efd78e1 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -33,8 +33,10 @@ #include "pbd/basename.h" #include "ardour/audioengine.h" +#include "ardour/debug.h" #include "ardour/midi_model.h" #include "ardour/midi_ring_buffer.h" +#include "ardour/midi_state_tracker.h" #include "ardour/midi_source.h" #include "ardour/session.h" #include "ardour/session_directory.h" @@ -47,13 +49,14 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -sigc::signal MidiSource::MidiSourceCreated; +PBD::Signal1 MidiSource::MidiSourceCreated; MidiSource::MidiSource (Session& s, string name, Source::Flag flags) - : Source (s, DataType::MIDI, name, flags) + : Source(s, DataType::MIDI, name, flags) , _read_data_count(0) , _write_data_count(0) - , _writing (false) + , _writing(false) + , _model_iter_valid(false) , _length_beats(0.0) , _last_read_end(0) , _last_write_end(0) @@ -61,10 +64,11 @@ MidiSource::MidiSource (Session& s, string name, Source::Flag flags) } MidiSource::MidiSource (Session& s, const XMLNode& node) - : Source (s, node) + : Source(s, node) , _read_data_count(0) , _write_data_count(0) - , _writing (false) + , _writing(false) + , _model_iter_valid(false) , _length_beats(0.0) , _last_read_end(0) , _last_write_end(0) @@ -72,7 +76,7 @@ MidiSource::MidiSource (Session& s, const XMLNode& node) _read_data_count = 0; _write_data_count = 0; - if (set_state (node)) { + if (set_state (node, Stateful::loading_state_version)) { throw failed_constructor(); } } @@ -94,7 +98,7 @@ MidiSource::get_state () } int -MidiSource::set_state (const XMLNode& node) +MidiSource::set_state (const XMLNode& node, int /*version*/) { const XMLProperty* prop; @@ -108,7 +112,7 @@ MidiSource::set_state (const XMLNode& node) sframes_t MidiSource::length (sframes_t pos) const { - BeatsFramesConverter converter(_session, pos); + BeatsFramesConverter converter(_session.tempo_map(), pos); return converter.to(_length_beats); } @@ -121,44 +125,61 @@ MidiSource::update_length (sframes_t /*pos*/, sframes_t /*cnt*/) void MidiSource::invalidate () { + _model_iter_valid = false; _model_iter.invalidate(); } nframes_t -MidiSource::midi_read (MidiRingBuffer& dst, sframes_t source_start, - sframes_t start, nframes_t cnt, - sframes_t stamp_offset, sframes_t negative_stamp_offset) const +MidiSource::midi_read (Evoral::EventSink& dst, sframes_t source_start, + sframes_t start, nframes_t cnt, + sframes_t stamp_offset, sframes_t negative_stamp_offset, + MidiStateTracker* tracker) const { Glib::Mutex::Lock lm (_lock); - BeatsFramesConverter converter(_session, source_start); + BeatsFramesConverter converter(_session.tempo_map(), source_start); if (_model) { -#define BEATS_TO_FRAMES(t) (converter.to(t) + stamp_offset - negative_stamp_offset) - Evoral::Sequence::const_iterator& i = _model_iter; - if (_last_read_end == 0 || start != _last_read_end || !i.valid()) { + // If the cached iterator is invalid, search for the first event past start + if (_last_read_end == 0 || start != _last_read_end || !_model_iter_valid) { + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 search for relevant iterator for %1 / %2\n", _name, source_start, start)); for (i = _model->begin(); i != _model->end(); ++i) { - if (BEATS_TO_FRAMES(i->time()) >= start) { + if (converter.to(i->time()) >= start) { break; } } + _model_iter_valid = true; + } else { + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 use cached iterator for %1 / %2\n", _name, source_start, start)); } _last_read_end = start + cnt; + // Read events up to end for (; i != _model->end(); ++i) { - const sframes_t time_frames = BEATS_TO_FRAMES(i->time()); - if (time_frames < source_start + start + cnt) { - dst.write(time_frames, i->event_type(), i->size(), i->buffer()); + const sframes_t time_frames = converter.to(i->time()); + if (time_frames < start + cnt) { + dst.write(time_frames + stamp_offset - negative_stamp_offset, + i->event_type(), i->size(), i->buffer()); + if (tracker) { + Evoral::MIDIEvent& ev (*(Evoral::MIDIEvent*) (&(*i))); + if (ev.is_note_on()) { + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 add note on %2 @ %3\n", _name, ev.note(), time_frames)); + tracker->add (ev.note(), ev.channel()); + } else if (ev.is_note_off()) { + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 add note off %2 @ %3\n", _name, ev.note(), time_frames)); + tracker->remove (ev.note(), ev.channel()); + } + } } else { break; } } return cnt; } else { - return read_unlocked (dst, source_start, start, cnt, stamp_offset, negative_stamp_offset); + return read_unlocked (dst, source_start, start, cnt, stamp_offset, negative_stamp_offset, tracker); } } @@ -171,16 +192,6 @@ MidiSource::midi_write (MidiRingBuffer& source, sframes_t source_star return ret; } -bool -MidiSource::file_changed (string path) -{ - struct stat stat_file; - - int e1 = stat (path.c_str(), &stat_file); - - return !e1; -} - void MidiSource::mark_streaming_midi_write_started (NoteMode mode, sframes_t start_frame) { @@ -198,14 +209,8 @@ MidiSource::mark_streaming_midi_write_started (NoteMode mode, sframes_t start_fr void MidiSource::mark_streaming_write_started () { - sframes_t start_frame = _session.transport_frame(); - - if (_model) { - _model->start_write(); - } - - _last_write_end = start_frame; - _writing = true; + NoteMode note_mode = _model ? _model->note_mode() : Sustained; + mark_streaming_midi_write_started(note_mode, _session.transport_frame()); } void @@ -225,7 +230,7 @@ MidiSource::session_saved() if (_model && _model->edited()) { string newname; - const string basename = PBD::basename_nosuffix(_name); + const string basename = PBD::basename_nosuffix(_name.val()); string::size_type last_dash = basename.find_last_of("-"); if (last_dash == string::npos || last_dash == basename.find_first_of("-")) { newname = basename + "-1"; @@ -244,7 +249,7 @@ MidiSource::session_saved() boost::shared_ptr newsrc = boost::dynamic_pointer_cast( SourceFactory::createWritable(DataType::MIDI, _session, - newpath, true, false, _session.frame_rate())); + newpath, false, _session.frame_rate())); newsrc->set_timeline_position(_timeline_position); _model->write_to(newsrc); @@ -255,7 +260,7 @@ MidiSource::session_saved() newsrc->flush_midi(); - Switched.emit(newsrc); + Switched (newsrc); /* EMIT SIGNAL */ } }