#include "ardour/ardour.h"
#include "ardour/audioengine.h"
+#include "ardour/butler.h"
#include "ardour/configuration.h"
#include "ardour/cycle_timer.h"
+#include "ardour/debug.h"
#include "ardour/io.h"
#include "ardour/midi_diskstream.h"
#include "ardour/midi_playlist.h"
set_block_size (_session.get_block_size());
allocate_temporary_buffers ();
- const size_t size = _session.midi_diskstream_buffer_size();
+ const size_t size = _session.butler()->midi_diskstream_buffer_size();
_playback_buf = new MidiRingBuffer<nframes_t>(size);
_capture_buf = new MidiRingBuffer<nframes_t>(size);
delete *ci;
}
+ if (_playlist) {
+ midi_playlist()->clear_note_trackers ();
+ }
+
capture_info.clear ();
capture_start_frame = 0;
}
if (_session.config.get_punch_in() && ((pi = _session.locations()->auto_punch_location()) != 0)) {
snprintf (buf, sizeof (buf), "%" PRId64, pi->start());
} else {
- snprintf (buf, sizeof (buf), "%" PRIu32, _session.transport_frame());
+ snprintf (buf, sizeof (buf), "%" PRId64, _session.transport_frame());
}
cs_child->add_property (X_("at"), buf);
}
_write_source->set_allow_remove_if_empty (true);
+ _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame());
return 0;
}
void
MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/)
{
- if (!recordable()) {
+ if (!_session.writable() || !recordable()) {
return;
}
}
use_new_write_source (0);
-
- if (record_enabled()) {
- //_capturing_sources.push_back (_write_source);
- }
}
int
// Translates stamps to be relative to start
- _playback_buf->read(dst, start, end);
-#if 0
+#ifndef NDEBUG
const size_t events_read = _playback_buf->read(dst, start, end);
- cout << _name << ": MDS events read = " << events_read
- << " start = " << start << " end = " << end
- << " readspace " << _playback_buf->read_space()
- << " writespace " << _playback_buf->write_space() << endl;
+ DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("%1 MDS events read %2 range %3 .. %4 rspace %5 wspace %6\n", _name, events_read, start, end,
+ _playback_buf->read_space(), _playback_buf->write_space()));
+#else
+ _playback_buf->read(dst, start, end);
#endif
gint32 frames_read = end - start;