#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"
sigc::signal<void,MidiSource *> 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)
{
}
-MidiSource::MidiSource (Session& s, const XMLNode& node)
- : Source (s, node)
+MidiSource::MidiSource (Session& s, const XMLNode& 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)
_read_data_count = 0;
_write_data_count = 0;
- if (set_state (node)) {
+ if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor();
}
}
}
int
-MidiSource::set_state (const XMLNode& node)
+MidiSource::set_state (const XMLNode& node, int /*version*/)
{
const XMLProperty* prop;
sframes_t
MidiSource::length (sframes_t pos) const
{
- BeatsFramesConverter converter(_session, pos);
+ BeatsFramesConverter converter(_session.tempo_map(), pos);
return converter.to(_length_beats);
}
void
MidiSource::invalidate ()
{
+ _model_iter_valid = false;
_model_iter.invalidate();
}
nframes_t
-MidiSource::midi_read (MidiRingBuffer<nframes_t>& 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<nframes_t>& 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<double>::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<Evoral::MusicalTime>& ev (*(Evoral::MIDIEvent<Evoral::MusicalTime>*) (&(*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);
}
}
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)
{
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
boost::shared_ptr<MidiSource> newsrc = boost::dynamic_pointer_cast<MidiSource>(
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);
// cyclic dependency here, ugly :(
newsrc->set_model(_model);
_model->set_midi_source(newsrc.get());
-
+
newsrc->flush_midi();
Switched.emit(newsrc);
projects / ardour.git / blobdiff