X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_source.cc;h=59c19981a50c515b44846a559e7b712143449841;hb=1aadfeba45e943123b6577bfca4635892be0d9e1;hp=ac52b81ee59f5c1de02f40d4e2ed950ffb9db63d;hpb=9a30bb2aecabcdd16568e6548dd1aeade8effa48;p=ardour.git diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index ac52b81ee5..59c19981a5 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -28,15 +28,18 @@ #include #include -#include -#include -#include - -#include -#include -#include -#include -#include +#include "pbd/xml++.h" +#include "pbd/pthread_utils.h" +#include "pbd/basename.h" + +#include "ardour/audioengine.h" +#include "ardour/midi_model.h" +#include "ardour/midi_ring_buffer.h" +#include "ardour/midi_source.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/source_factory.h" +#include "ardour/tempo.h" #include "i18n.h" @@ -46,21 +49,25 @@ using namespace PBD; sigc::signal MidiSource::MidiSourceCreated; -MidiSource::MidiSource (Session& s, string name) - : Source (s, name, DataType::MIDI) - , _timeline_position(0) - , _model(new MidiModel(this)) +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) + , _length_beats(0.0) + , _last_read_end(0) + , _last_write_end(0) { - _read_data_count = 0; - _write_data_count = 0; } MidiSource::MidiSource (Session& s, const XMLNode& node) : Source (s, node) - , _timeline_position(0) - , _model(new MidiModel(this)) + , _read_data_count(0) + , _write_data_count(0) , _writing (false) + , _length_beats(0.0) + , _last_read_end(0) + , _last_write_end(0) { _read_data_count = 0; _write_data_count = 0; @@ -91,8 +98,6 @@ MidiSource::set_state (const XMLNode& node) { const XMLProperty* prop; - Source::set_state (node); - if ((prop = node.property ("captured-for")) != 0) { _captured_for = prop->value(); } @@ -100,25 +105,71 @@ MidiSource::set_state (const XMLNode& node) return 0; } +sframes_t +MidiSource::length (sframes_t pos) const +{ + BeatsFramesConverter converter(_session, pos); + return converter.to(_length_beats); +} + +void +MidiSource::update_length (sframes_t pos, sframes_t cnt) +{ + // You're not the boss of me! +} + +void +MidiSource::invalidate () +{ + _model_iter.invalidate(); +} + nframes_t -MidiSource::midi_read (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const +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 { Glib::Mutex::Lock lm (_lock); + + BeatsFramesConverter converter(_session, source_start); + if (_model) { - //const size_t n_events = - _model->read(dst, start, cnt, stamp_offset - negative_stamp_offset); - //cout << "Read " << n_events << " events from model." << endl; +#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()) { + //cerr << "MidiSource seeking to " << start << " from " << _last_read_end << endl; + for (i = _model->begin(); i != _model->end(); ++i) { + if (BEATS_TO_FRAMES(i->time()) >= start) { + break; + } + } + } + + _last_read_end = start + cnt; + + 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()); + } else { + break; + } + } return cnt; } else { - return read_unlocked (dst, start, cnt, stamp_offset, negative_stamp_offset); + return read_unlocked (dst, source_start, start, cnt, stamp_offset, negative_stamp_offset); } } nframes_t -MidiSource::midi_write (MidiRingBuffer& dst, nframes_t cnt) +MidiSource::midi_write (MidiRingBuffer& source, sframes_t source_start, nframes_t duration) { Glib::Mutex::Lock lm (_lock); - return write_unlocked (dst, cnt); + const nframes_t ret = write_unlocked (source, source_start, duration); + _last_write_end += duration; + return ret; } bool @@ -128,36 +179,42 @@ MidiSource::file_changed (string path) int e1 = stat (path.c_str(), &stat_file); - return ( !e1 ); + return !e1; } void -MidiSource::mark_streaming_midi_write_started (NoteMode mode, nframes_t start_frame) +MidiSource::mark_streaming_midi_write_started (NoteMode mode, sframes_t start_frame) { - set_timeline_position(start_frame); // why do I have a feeling this can break somehow... + set_timeline_position(start_frame); if (_model) { _model->set_note_mode(mode); _model->start_write(); } - + + _last_write_end = start_frame; _writing = true; } void MidiSource::mark_streaming_write_started () { - if (_model) + sframes_t start_frame = _session.transport_frame(); + + if (_model) { _model->start_write(); + } + _last_write_end = start_frame; _writing = true; } void MidiSource::mark_streaming_write_completed () { - if (_model) - _model->end_write(false); // FIXME: param? + if (_model) { + _model->end_write(false); + } _writing = false; } @@ -187,7 +244,8 @@ MidiSource::session_saved() string newpath = _session.session_directory().midi_path().to_string() +"/"+ newname + ".mid"; boost::shared_ptr newsrc = boost::dynamic_pointer_cast( - SourceFactory::createWritable(DataType::MIDI, _session, newpath, 1, 0, true)); + SourceFactory::createWritable(DataType::MIDI, _session, + newpath, true, false, _session.frame_rate())); newsrc->set_timeline_position(_timeline_position); _model->write_to(newsrc); @@ -202,3 +260,11 @@ MidiSource::session_saved() } } +void +MidiSource::set_note_mode(NoteMode mode) +{ + if (_model) { + _model->set_note_mode(mode); + } +} +