X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_source.cc;h=1e890170c46dc02aa8f3b6eebb0c34f112e3f21f;hb=d9c9acaa80d1701b210eae82f5a365cb3e63c56a;hp=86f0b86f95fdf73107bdf5203ee9cb6c6f60ac88;hpb=a7c37f6a2da278803a0f66cf29da95813da6e48e;p=ardour.git diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 86f0b86f95..1e890170c4 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -33,6 +33,7 @@ #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" @@ -48,14 +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) , _read_data_count(0) , _write_data_count(0) , _writing(false) - , _model_iterator_valid(true) + , _model_iter_valid(false) , _length_beats(0.0) , _last_read_end(0) , _last_write_end(0) @@ -67,7 +68,7 @@ MidiSource::MidiSource (Session& s, const XMLNode& node) , _read_data_count(0) , _write_data_count(0) , _writing(false) - , _model_iterator_valid(true) + , _model_iter_valid(false) , _length_beats(0.0) , _last_read_end(0) , _last_write_end(0) @@ -111,7 +112,7 @@ MidiSource::set_state (const XMLNode& node, int /*version*/) sframes_t MidiSource::length (sframes_t pos) const { - BeatsFramesConverter converter(_session, pos); + BeatsFramesConverter converter(_session.tempo_map(), pos); return converter.to(_length_beats); } @@ -124,58 +125,58 @@ MidiSource::update_length (sframes_t /*pos*/, sframes_t /*cnt*/) void MidiSource::invalidate () { - _model_iterator_valid = false; + _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, - MidiStateTracker* tracker) 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) { - //cerr << "READ @ " << start << " * " << cnt << " (source @ " << source_start << " {" << endl; -#define BEATS_TO_FRAMES(t) (converter.to(t) + stamp_offset - negative_stamp_offset) - Evoral::Sequence::const_iterator& i = _model_iter; // If the cached iterator is invalid, search for the first event past start - if (_last_read_end == 0 || start != _last_read_end || !_model_iterator_valid) { + 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_iterator_valid = true; + _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 source_start + start + cnt + // Read events up to end for (; i != _model->end(); ++i) { - const sframes_t time_frames = BEATS_TO_FRAMES(i->time()); - //cerr << "Read? " << time_frames << " < " << source_start + start + cnt << endl; - if (time_frames < source_start + start + cnt) { - //cerr << "Read @ " << time_frames << endl; - 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 { - //cerr << "End" << endl; break; } } - //cerr << "}" << endl; return cnt; } else { return read_unlocked (dst, source_start, start, cnt, stamp_offset, negative_stamp_offset, tracker); @@ -191,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) { @@ -218,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 @@ -264,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); @@ -275,7 +260,7 @@ MidiSource::session_saved() newsrc->flush_midi(); - Switched.emit(newsrc); + Switched (newsrc); /* EMIT SIGNAL */ } }