#include "ardour/midi_source.h"
#include "ardour/midi_state_tracker.h"
#include "ardour/session.h"
+#include "ardour/tempo.h"
#include "ardour/session_directory.h"
#include "ardour/source_factory.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
namespace ARDOUR { template <typename T> class MidiRingBuffer; }
int
MidiSource::set_state (const XMLNode& node, int /*version*/)
{
- const XMLProperty* prop;
+ XMLProperty const * prop;
if ((prop = node.property ("captured-for")) != 0) {
_captured_for = prop->value();
}
framecnt_t cnt,
MidiStateTracker* tracker,
MidiChannelFilter* filter,
- const std::set<Evoral::Parameter>& filtered) const
+ const std::set<Evoral::Parameter>& filtered,
+ double beat,
+ double start_beat) const
{
- BeatsFramesConverter converter(_session.tempo_map(), source_start);
+ //BeatsFramesConverter converter(_session.tempo_map(), source_start);
DEBUG_TRACE (DEBUG::MidiSourceIO,
string_compose ("MidiSource::midi_read() %5 sstart %1 start %2 cnt %3 tracker %4\n",
* some way (maybe keep an iterator per playlist).
*/
for (i = _model->begin(); i != _model->end(); ++i) {
- const framecnt_t time_frames = converter.to(i->time());
- if (time_frames >= start) {
+ if (i->time().to_double() + (beat - start_beat) >= beat) {
break;
}
}
_model_iter_valid = true;
+ if (!linear_read) {
+ _model->active_notes().clear();
+ }
#endif
}
// Copy events in [start, start + cnt) into dst
for (; i != _model->end(); ++i) {
- const framecnt_t time_frames = converter.to(i->time());
- if (time_frames < start + cnt) {
+ const framecnt_t time_frames = _session.tempo_map().frame_at_beat (i->time().to_double() + (beat - start_beat));
+
+ if (time_frames < start + cnt + source_start) {
if (filter && filter->filter(i->buffer(), i->size())) {
DEBUG_TRACE (DEBUG::MidiSourceIO,
string_compose ("%1: filter event @ %2 type %3 size %4\n",
- _name, time_frames + source_start, i->event_type(), i->size()));
+ _name, time_frames, i->event_type(), i->size()));
continue;
}
-
// Offset by source start to convert event time to session time
- dst.write (time_frames + source_start, i->event_type(), i->size(), i->buffer());
+ dst.write (time_frames, i->event_type(), i->size(), i->buffer());
DEBUG_TRACE (DEBUG::MidiSourceIO,
string_compose ("%1: add event @ %2 type %3 size %4\n",
- _name, time_frames + source_start, i->event_type(), i->size()));
+ _name, time_frames, i->event_type(), i->size()));
if (tracker) {
tracker->track (*i);
mark_midi_streaming_write_completed (lock, Evoral::Sequence<Evoral::Beats>::DeleteStuckNotes);
}
+int
+MidiSource::export_write_to (const Lock& lock, boost::shared_ptr<MidiSource> newsrc, Evoral::Beats begin, Evoral::Beats end)
+{
+ Lock newsrc_lock (newsrc->mutex ());
+
+ if (!_model) {
+ error << string_compose (_("programming error: %1"), X_("no model for MidiSource during export"));
+ return -1;
+ }
+
+ _model->write_section_to (newsrc, newsrc_lock, begin, end, true);
+
+ newsrc->flush_midi(newsrc_lock);
+
+ return 0;
+}
+
int
MidiSource::write_to (const Lock& lock, boost::shared_ptr<MidiSource> newsrc, Evoral::Beats begin, Evoral::Beats end)
{