, _playback_buf(0)
, _capture_buf(0)
, _source_port(0)
- , _last_flush_frame(0)
, _note_mode(Sustained)
, _frames_written_to_ringbuffer(0)
, _frames_read_from_ringbuffer(0)
{
- /* prevent any write sources from being created */
-
in_set_state = true;
init ();
, _playback_buf(0)
, _capture_buf(0)
, _source_port(0)
- , _last_flush_frame(0)
, _note_mode(Sustained)
, _frames_written_to_ringbuffer(0)
, _frames_read_from_ringbuffer(0)
if (_write_source) {
_write_source->set_timeline_position (position);
}
- seek(position, false);
+ seek (position, false);
}
}
if (input_change_pending.type & IOChange::ConfigurationChanged) {
- if (_io->n_ports().n_midi() != _n_channels.n_midi()) {
- error << "Can not feed IO " << _io->n_ports()
- << " with diskstream " << _n_channels << endl;
+ uint32_t ni = _io->n_ports().n_midi();
+
+ if (ni != _n_channels.n_midi()) {
+ error << string_compose (_("%1: I/O configuration change %4 requested to use %2, but channel setup is %3"),
+ name(),
+ _io->n_ports(),
+ _n_channels, input_change_pending.type)
+ << endmsg;
}
- }
- get_input_sources ();
- set_capture_offset ();
+ if (ni == 0) {
+ _source_port = 0;
+ } else {
+ _source_port = _io->midi(0);
+ }
+ }
- if (first_input_change) {
- set_align_style (_persistent_alignment_style);
- first_input_change = false;
- } else {
+ if (input_change_pending.type & IOChange::ConnectionsChanged) {
+ set_capture_offset ();
set_align_style_from_io ();
}
seek (_session.transport_frame());
}
- _last_flush_frame = _session.transport_frame();
-}
-
-void
-MidiDiskstream::get_input_sources ()
-{
- uint32_t ni = _io->n_ports().n_midi();
-
- if (ni == 0) {
- return;
+ if (_write_source) {
+ _write_source->set_last_write_end (_session.transport_frame());
}
-
- // This is all we do for now at least
- assert(ni == 1);
-
- _source_port = _io->midi(0);
-
- // do... stuff?
}
int
int
MidiDiskstream::set_destructive (bool yn)
{
+ yn = 0; // stop pedantic gcc complaints about unused parameter
assert( ! destructive());
assert( ! yn);
return -1;
#endif
int
-MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler)
+MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool& need_butler)
{
int ret = -1;
framecnt_t rec_offset = 0;
return 0;
}
+ if (_source_port == 0) {
+ return 1;
+ }
+
Glib::Mutex::Lock sm (state_lock, Glib::TRY_LOCK);
if (!sm.locked()) {
}
}
-
if (can_record && !_last_capture_sources.empty()) {
_last_capture_sources.clear ();
}
for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
const Evoral::MIDIEvent<MidiBuffer::TimeType> ev(*i, false);
assert(ev.buffer());
+#ifndef NDEBUG
+ if (DEBUG::MidiIO & PBD::debug_bits) {
+ const uint8_t* __data = ev.buffer();
+ DEBUG_STR_DECL(a);
+ DEBUG_STR_APPEND(a, string_compose ("mididiskstream %1 capture event @ %2 + %3 sz %4 ", this, ev.time(), transport_frame, ev.size()));
+ for (size_t i=0; i < ev.size(); ++i) {
+ DEBUG_STR_APPEND(a,hex);
+ DEBUG_STR_APPEND(a,"0x");
+ DEBUG_STR_APPEND(a,(int)__data[i]);
+ DEBUG_STR_APPEND(a,' ');
+ }
+ DEBUG_STR_APPEND(a,'\n');
+ DEBUG_TRACE (DEBUG::MidiIO, DEBUG_STR(a).str());
+ }
+#endif
_capture_buf->write(ev.time() + transport_frame, ev.type(), ev.size(), ev.buffer());
}
if (buf.size() != 0) {
+ /* XXX this needs fixing - realtime new() call for
+ every time we get MIDI data in a process callback!
+ */
+
/* Make a copy of this data and emit it for the GUI to see */
boost::shared_ptr<MidiBuffer> copy (new MidiBuffer (buf.capacity ()));
for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
} else {
if (was_recording) {
- finish_capture (rec_monitors_input);
+ finish_capture ();
}
}
/* called from audio thread, so we can use the read ptr and playback sample as we wish */
_pending_overwrite = yn;
-
overwrite_frame = playback_sample;
}
g_atomic_int_set (&_frames_written_to_ringbuffer, 0);
read (overwrite_frame, disk_io_chunk_frames, false);
+ file_frame = overwrite_frame; // it was adjusted by ::read()
overwrite_queued = false;
_pending_overwrite = false;
int
MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush)
{
- uint32_t to_write;
- int32_t ret = 0;
+ framecnt_t to_write;
framecnt_t total;
+ int32_t ret = 0;
- _write_data_count = 0;
+ if (!_write_source) {
+ return 0;
+ }
- total = _session.transport_frame() - _last_flush_frame;
+ assert (!destructive());
- if (_last_flush_frame > _session.transport_frame() || _last_flush_frame < capture_start_frame) {
- _last_flush_frame = _session.transport_frame();
- }
+ _write_data_count = 0;
+
+ total = _session.transport_frame() - _write_source->last_write_end();
- if (total == 0 || _capture_buf->read_space() == 0
- || (!force_flush && (total < disk_io_chunk_frames && was_recording))) {
+ if (total == 0 ||
+ _capture_buf->read_space() == 0 ||
+ (!force_flush && (total < disk_io_chunk_frames) && was_recording)) {
goto out;
}
ret = 1;
}
- to_write = disk_io_chunk_frames;
-
- assert(!destructive());
+ if (force_flush) {
+ /* push out everything we have, right now */
+ to_write = max_framecnt;
+ } else {
+ to_write = disk_io_chunk_frames;
+ }
- if (record_enabled() &&
- ((_session.transport_frame() - _last_flush_frame > disk_io_chunk_frames) ||
- force_flush)) {
- if ((!_write_source) || _write_source->midi_write (*_capture_buf, get_capture_start_frame (0), to_write) != to_write) {
+ if (record_enabled() && ((total > disk_io_chunk_frames) || force_flush)) {
+ if (_write_source->midi_write (*_capture_buf, get_capture_start_frame (0), to_write) != to_write) {
error << string_compose(_("MidiDiskstream %1: cannot write to disk"), _id) << endmsg;
return -1;
- } else {
- _last_flush_frame = _session.transport_frame();
- }
+ }
}
out:
MidiRegion::SourceList srcs;
MidiRegion::SourceList::iterator src;
vector<CaptureInfo*>::iterator ci;
- bool mark_write_completed = false;
- finish_capture (true);
+ finish_capture ();
/* butler is already stopped, but there may be work to do
to flush remaining data to disk.
_write_source->set_timeline_position (capture_info.front()->start);
_write_source->set_captured_for (_name);
+ /* set length in beats to entire capture length */
+
+ BeatsFramesConverter converter (_session.tempo_map(), capture_info.front()->start);
+ const double total_capture_beats = converter.from (total_capture);
+ _write_source->set_length_beats (total_capture_beats);
+
/* flush to disk: this step differs from the audio path,
where all the data is already on disk.
*/
- _write_source->mark_streaming_write_completed ();
-
- /* set length in beats to entire capture length */
-
- BeatsFramesConverter converter (_session.tempo_map(), capture_info.front()->start);
- const double total_capture_beats = converter.from(total_capture);
- _write_source->set_length_beats(total_capture_beats);
+ _write_source->mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::ResolveStuckNotes, total_capture_beats);
/* we will want to be able to keep (over)writing the source
but we don't want it to be removable. this also differs
_write_source.reset();
}
}
-
- mark_write_completed = true;
}
use_new_write_source (0);
}
}
- finish_capture (true);
+ finish_capture ();
// the next region will start recording via the normal mechanism
// we'll set the start position to the current transport pos
}
void
-MidiDiskstream::finish_capture (bool /*rec_monitors_input*/)
+MidiDiskstream::finish_capture ()
{
was_recording = false;
XMLNode&
MidiDiskstream::get_state ()
{
- XMLNode* node = new XMLNode ("Diskstream");
+ XMLNode& node (Diskstream::get_state());
char buf[64];
LocaleGuard lg (X_("POSIX"));
- snprintf (buf, sizeof(buf), "0x%x", _flags);
- node->add_property ("flags", buf);
-
- node->add_property("channel-mode", enum_2_string(get_channel_mode()));
-
+ node.add_property("channel-mode", enum_2_string(get_channel_mode()));
snprintf (buf, sizeof(buf), "0x%x", get_channel_mask());
- node->add_property("channel-mask", buf);
-
- node->add_property ("playlist", _playlist->name());
-
- snprintf (buf, sizeof(buf), "%f", _visible_speed);
- node->add_property ("speed", buf);
-
- node->add_property("name", _name);
- id().print(buf, sizeof(buf));
- node->add_property("id", buf);
+ node.add_property("channel-mask", buf);
if (_write_source && _session.get_record_enabled()) {
}
cs_child->add_property (X_("at"), buf);
- node->add_child_nocopy (*cs_child);
- }
-
- if (_extra_xml) {
- node->add_child_copy (*_extra_xml);
+ node.add_child_nocopy (*cs_child);
}
- return* node;
+ return node;
}
int
-MidiDiskstream::set_state (const XMLNode& node, int /*version*/)
+MidiDiskstream::set_state (const XMLNode& node, int version)
{
const XMLProperty* prop;
XMLNodeList nlist = node.children();
XMLNode* capture_pending_node = 0;
LocaleGuard lg (X_("POSIX"));
+ /* prevent write sources from being created */
+
in_set_state = true;
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
- /*if ((*niter)->name() == IO::state_node_name) {
- deprecated_io_node = new XMLNode (**niter);
- }*/
assert ((*niter)->name() != IO::state_node_name);
if ((*niter)->name() == X_("CapturingSources")) {
}
}
- /* prevent write sources from being created */
-
- in_set_state = true;
-
- if ((prop = node.property ("name")) != 0) {
- _name = prop->value();
- }
-
- if ((prop = node.property ("id")) != 0) {
- _id = prop->value ();
- }
-
- if ((prop = node.property ("flags")) != 0) {
- _flags = Flag (string_2_enum (prop->value(), _flags));
+ if (Diskstream::set_state (node, version)) {
+ return -1;
}
ChannelMode channel_mode = AllChannels;
}
}
- set_channel_mode(channel_mode, channel_mask);
-
- if ((prop = node.property ("playlist")) == 0) {
- return -1;
- }
-
- {
- bool had_playlist = (_playlist != 0);
-
- if (find_and_use_playlist (prop->value())) {
- return -1;
- }
-
- if (!had_playlist) {
- _playlist->set_orig_diskstream_id (id());
- }
-
- if (capture_pending_node) {
- use_pending_capture_data (*capture_pending_node);
- }
+ if (capture_pending_node) {
+ use_pending_capture_data (*capture_pending_node);
}
- if ((prop = node.property ("speed")) != 0) {
- double sp = atof (prop->value().c_str());
-
- if (realtime_set_speed (sp, false)) {
- non_realtime_set_speed ();
- }
- }
+ set_channel_mode (channel_mode, channel_mask);
in_set_state = false;
{
list<boost::shared_ptr<Source> > ret;
- /* put some data on the disk, even if its just a header for an empty file.
- XXX should we not have a more direct method for doing this? Maybe not
- since we don't want to mess around with the model/disk relationship
- that the Source has to pay attention to.
- */
-
- boost::dynamic_pointer_cast<MidiSource>(_write_source)->session_saved ();
+ /* put some data on the disk, even if its just a header for an empty file */
+ boost::dynamic_pointer_cast<SMFSource> (_write_source)->ensure_disk_file ();
/* never let it go away */
_write_source->mark_nonremovable ();
use_new_write_source (0);
}
-int
-MidiDiskstream::rename_write_sources ()
-{
- if (_write_source != 0) {
- _write_source->set_source_name (_name.val(), destructive());
- /* XXX what to do if this fails ? */
- }
- return 0;
-}
-
void
MidiDiskstream::set_block_size (pframes_t /*nframes*/)
{
void
MidiDiskstream::set_align_style_from_io ()
{
- bool have_physical = false;
-
- if (_io == 0) {
+ if (_alignment_choice != Automatic) {
return;
}
- get_input_sources ();
-
- if (_source_port && _source_port->flags() & JackPortIsPhysical) {
- have_physical = true;
- }
+ /* XXX Not sure what, if anything we can do with MIDI
+ as far as capture alignment etc.
+ */
- if (have_physical) {
- set_align_style (ExistingMaterial);
- } else {
- set_align_style (CaptureTime);
- }
+ set_align_style (ExistingMaterial);
}
return;
}
- // Translates stamps to be relative to start
+ // Translate stamps to be relative to start
#ifndef NDEBUG
+ DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
+ "%1 MDS pre-read read %4..%5 from %2 write to %3\n", _name,
+ _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr(), start, end));
+// cerr << "================\n";
+// _playback_buf->dump (cerr);
+// cerr << "----------------\n";
+
const size_t events_read = _playback_buf->read(dst, start, end);
- 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()));
+ DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
+ "%1 MDS events read %2 range %3 .. %4 rspace %5 wspace %6 r@%7 w@%8\n",
+ _name, events_read, start, end,
+ _playback_buf->read_space(), _playback_buf->write_space(),
+ _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr()));
#else
_playback_buf->read(dst, start, end);
#endif
g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read);
}
+bool
+MidiDiskstream::set_name (string const & name)
+{
+ Diskstream::set_name (name);
+
+ /* get a new write source so that its name reflects the new diskstream name */
+ use_new_write_source (0);
+
+ return true;
+}
+