X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_diskstream.cc;h=e62ec6837e6dc8e3c57e2371a42b43624edfbf3f;hb=204baa31d842d4c2f833d319b6fa55e402a1bfb8;hp=3712e74676c7af82b06316e2e43c7e3e9e1f0a40;hpb=ee9455af40adaaf48010784330f457f471b2546e;p=ardour.git diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 3712e74676..e62ec6837e 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -35,6 +35,8 @@ #include "pbd/xml++.h" #include "pbd/memento_command.h" #include "pbd/enumwriter.h" +#include "pbd/stateful_diff_command.h" +#include "pbd/stacktrace.h" #include "ardour/ardour.h" #include "ardour/audioengine.h" @@ -44,13 +46,16 @@ #include "ardour/debug.h" #include "ardour/io.h" #include "ardour/midi_diskstream.h" +#include "ardour/midi_model.h" #include "ardour/midi_playlist.h" #include "ardour/midi_port.h" #include "ardour/midi_region.h" #include "ardour/playlist_factory.h" #include "ardour/region_factory.h" +#include "ardour/route.h" #include "ardour/send.h" #include "ardour/session.h" +#include "ardour/session_playlists.h" #include "ardour/smf_source.h" #include "ardour/utils.h" @@ -63,24 +68,22 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -nframes_t MidiDiskstream::midi_readahead = 4096; +framecnt_t MidiDiskstream::midi_readahead = 4096; MidiDiskstream::MidiDiskstream (Session &sess, const string &name, Diskstream::Flag flag) : Diskstream(sess, name, flag) , _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) + , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI)) { - /* prevent any write sources from being created */ - in_set_state = true; - init(flag); + init (); use_new_playlist (); + use_new_write_source (0); in_set_state = false; @@ -91,32 +94,28 @@ MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node) : Diskstream(sess, node) , _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) + , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI)) { in_set_state = true; - init (Recordable); + + init (); if (set_state (node, Stateful::loading_state_version)) { in_set_state = false; throw failed_constructor(); } - in_set_state = false; + use_new_write_source (0); - if (destructive()) { - use_destructive_playlist (); - } + in_set_state = false; } void -MidiDiskstream::init (Diskstream::Flag f) +MidiDiskstream::init () { - Diskstream::init(f); - /* there are no channels at this point, so these two calls just get speed_buffer_size and wrap_buffer size setup without duplicating their code. @@ -126,8 +125,8 @@ MidiDiskstream::init (Diskstream::Flag f) allocate_temporary_buffers (); const size_t size = _session.butler()->midi_diskstream_buffer_size(); - _playback_buf = new MidiRingBuffer(size); - _capture_buf = new MidiRingBuffer(size); + _playback_buf = new MidiRingBuffer(size); + _capture_buf = new MidiRingBuffer(size); _n_channels = ChanCount(DataType::MIDI, 1); @@ -141,12 +140,12 @@ MidiDiskstream::~MidiDiskstream () void -MidiDiskstream::non_realtime_locate (nframes_t position) +MidiDiskstream::non_realtime_locate (framepos_t position) { if (_write_source) { _write_source->set_timeline_position (position); } - seek(position, false); + seek (position, false); } @@ -156,63 +155,55 @@ MidiDiskstream::non_realtime_input_change () { Glib::Mutex::Lock lm (state_lock); - if (input_change_pending == NoChange) { + if (input_change_pending.type == IOChange::NoChange) { return; } - if (input_change_pending & ConfigurationChanged) { - if (_io->n_ports().n_midi() != _n_channels.n_midi()) { - error << "Can not feed IO " << _io->n_ports() - << " with diskstream " << _n_channels << endl; + if (input_change_pending.type & IOChange::ConfigurationChanged) { + 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.reset (); + } 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 (); } - input_change_pending = NoChange; + input_change_pending.type = IOChange::NoChange; /* implicit unlock */ } - /* reset capture files */ - - reset_write_sources (false); + /* unlike with audio, there is never any need to reset write sources + based on input configuration changes because ... a MIDI track + has just 1 MIDI port as input, always. + */ /* now refill channel buffers */ if (speed() != 1.0f || speed() != -1.0f) { - seek ((nframes_t) (_session.transport_frame() * (double) speed())); + seek ((framepos_t) (_session.transport_frame() * (double) speed())); } else { 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 @@ -220,7 +211,7 @@ MidiDiskstream::find_and_use_playlist (const string& name) { boost::shared_ptr playlist; - if ((playlist = boost::dynamic_pointer_cast (_session.playlists.by_name (name))) == 0) { + if ((playlist = boost::dynamic_pointer_cast (_session.playlists->by_name (name))) == 0) { playlist = boost::dynamic_pointer_cast (PlaylistFactory::create (DataType::MIDI, _session, name)); } @@ -261,7 +252,6 @@ MidiDiskstream::use_new_playlist () if ((playlist = boost::dynamic_pointer_cast (PlaylistFactory::create ( DataType::MIDI, _session, newname, hidden()))) != 0) { - playlist->set_orig_diskstream_id (id()); return use_playlist (playlist); } else { @@ -289,7 +279,6 @@ MidiDiskstream::use_copy_playlist () newname = Playlist::bump_name (_playlist->name(), _session); if ((playlist = boost::dynamic_pointer_cast(PlaylistFactory::create (midi_playlist(), newname))) != 0) { - playlist->set_orig_diskstream_id (id()); return use_playlist (playlist); } else { return -1; @@ -301,6 +290,7 @@ MidiDiskstream::use_copy_playlist () int MidiDiskstream::set_destructive (bool yn) { + yn = 0; // stop pedantic gcc complaints about unused parameter assert( ! destructive()); assert( ! yn); return -1; @@ -315,249 +305,104 @@ MidiDiskstream::set_note_mode (NoteMode m) _write_source->model()->set_note_mode(m); } -#if 0 -static void -trace_midi (ostream& o, MIDI::byte *msg, size_t len) -{ - using namespace MIDI; - eventType type; - const char trace_prefix = ':'; - - type = (eventType) (msg[0]&0xF0); - - switch (type) { - case off: - o << trace_prefix - << "Channel " - << (msg[0]&0xF)+1 - << " NoteOff NoteNum " - << (int) msg[1] - << " Vel " - << (int) msg[2] - << endl; - break; - - case on: - o << trace_prefix - << "Channel " - << (msg[0]&0xF)+1 - << " NoteOn NoteNum " - << (int) msg[1] - << " Vel " - << (int) msg[2] - << endl; - break; - - case polypress: - o << trace_prefix - << "Channel " - << (msg[0]&0xF)+1 - << " PolyPressure" - << (int) msg[1] - << endl; - break; - - case MIDI::controller: - o << trace_prefix - << "Channel " - << (msg[0]&0xF)+1 - << " Controller " - << (int) msg[1] - << " Value " - << (int) msg[2] - << endl; - break; - - case program: - o << trace_prefix - << "Channel " - << (msg[0]&0xF)+1 - << " Program Change ProgNum " - << (int) msg[1] - << endl; - break; - - case chanpress: - o << trace_prefix - << "Channel " - << (msg[0]&0xF)+1 - << " Channel Pressure " - << (int) msg[1] - << endl; - break; - - case MIDI::pitchbend: - o << trace_prefix - << "Channel " - << (msg[0]&0xF)+1 - << " Pitch Bend " - << ((msg[2]<<7)|msg[1]) - << endl; - break; - - case MIDI::sysex: - if (len == 1) { - switch (msg[0]) { - case 0xf8: - o << trace_prefix - << "Clock" - << endl; - break; - case 0xfa: - o << trace_prefix - << "Start" - << endl; - break; - case 0xfb: - o << trace_prefix - << "Continue" - << endl; - break; - case 0xfc: - o << trace_prefix - << "Stop" - << endl; - break; - case 0xfe: - o << trace_prefix - << "Active Sense" - << endl; - break; - case 0xff: - o << trace_prefix - << "System Reset" - << endl; - break; - default: - o << trace_prefix - << "System Exclusive (1 byte : " << hex << (int) *msg << dec << ')' - << endl; - break; - } - } else { - o << trace_prefix - << "System Exclusive (" << len << ") = [ " << hex; - for (unsigned int i = 0; i < len; ++i) { - o << (int) msg[i] << ' '; - } - o << dec << ']' << endl; - - } - break; - - case MIDI::song: - o << trace_prefix << "Song" << endl; - break; - - case MIDI::tune: - o << trace_prefix << "Tune" << endl; - break; - - case MIDI::eox: - o << trace_prefix << "End-of-System Exclusive" << endl; - break; - - case MIDI::timing: - o << trace_prefix << "Timing" << endl; - break; - - case MIDI::start: - o << trace_prefix << "Start" << endl; - break; - - case MIDI::stop: - o << trace_prefix << "Stop" << endl; - break; - - case MIDI::contineu: - o << trace_prefix << "Continue" << endl; - break; - - case active: - o << trace_prefix << "Active Sense" << endl; - break; - - default: - o << trace_prefix << "Unrecognized MIDI message" << endl; - break; - } -} -#endif - int -MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input) +MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, framecnt_t& playback_distance) { - int ret = -1; - nframes_t rec_offset = 0; - nframes_t rec_nframes = 0; + framecnt_t rec_offset = 0; + framecnt_t rec_nframes = 0; bool nominally_recording; bool re = record_enabled (); + bool can_record = _session.actively_recording (); - /* if we've already processed the frames corresponding to this call, - just return. this allows multiple routes that are taking input - from this diskstream to call our ::process() method, but have - this stuff only happen once. more commonly, it allows both - the AudioTrack that is using this AudioDiskstream *and* the Session - to call process() without problems. - */ + playback_distance = 0; - if (_processed) { - return 0; - } - - commit_should_unlock = false; - - check_record_status (transport_frame, nframes, can_record); + check_record_status (transport_frame, can_record); nominally_recording = (can_record && re); if (nframes == 0) { - _processed = true; return 0; } - /* This lock is held until the end of ::commit, so these two functions - must always be called as a pair. The only exception is if this function - returns a non-zero value, in which case, ::commit should not be called. - */ + boost::shared_ptr sp = _source_port.lock (); - // If we can't take the state lock return. - if (!state_lock.trylock()) { + if (sp == 0) { return 1; } - commit_should_unlock = true; + + Glib::Mutex::Lock sm (state_lock, Glib::TRY_LOCK); + + if (!sm.locked()) { + return 1; + } + adjust_capture_position = 0; - if (nominally_recording || (_session.get_record_enabled() && _session.config.get_punch_in())) { + if (nominally_recording || (re && was_recording && _session.get_record_enabled() && _session.config.get_punch_in())) { OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes); calculate_record_range(ot, transport_frame, nframes, rec_nframes, rec_offset); if (rec_nframes && !was_recording) { + _write_source->mark_write_starting_now (); capture_captured = 0; was_recording = true; } } - - if (can_record && !_last_capture_regions.empty()) { - _last_capture_regions.clear (); + if (can_record && !_last_capture_sources.empty()) { + _last_capture_sources.clear (); } if (nominally_recording || rec_nframes) { // Pump entire port buffer into the ring buffer (FIXME: split cycles?) - MidiBuffer& buf = _source_port->get_midi_buffer(nframes); + MidiBuffer& buf = sp->get_midi_buffer(nframes); for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) { const Evoral::MIDIEvent 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) { + Glib::Mutex::Lock lm (_gui_feed_buffer_mutex, Glib::TRY_LOCK); + + if (lm.locked ()) { + /* Copy this data into our GUI feed buffer and tell the GUI + that it can read it if it likes. + */ + _gui_feed_buffer.clear (); + + for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) { + /* This may fail if buf is larger than _gui_feed_buffer, but it's not really + the end of the world if it does. + */ + _gui_feed_buffer.push_back ((*i).time() + transport_frame, (*i).size(), (*i).buffer()); + } + } + + DataRecorded (_write_source); /* EMIT SIGNAL */ + } + } else { if (was_recording) { - finish_capture (rec_monitors_input); + finish_capture (); } } @@ -580,27 +425,19 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_ playback_distance = nframes; - } - - ret = 0; - - _processed = true; + } else { - if (ret) { + /* XXX: should be doing varispeed stuff here, similar to the code in AudioDiskstream::process */ - /* we're exiting with failure, so ::commit will not - be called. unlock the state lock. - */ + playback_distance = nframes; - commit_should_unlock = false; - state_lock.unlock(); } - return ret; + return 0; } bool -MidiDiskstream::commit (nframes_t nframes) +MidiDiskstream::commit (framecnt_t playback_distance) { bool need_butler = false; @@ -617,19 +454,26 @@ MidiDiskstream::commit (nframes_t nframes) uint32_t frames_read = g_atomic_int_get(&_frames_read_from_ringbuffer); uint32_t frames_written = g_atomic_int_get(&_frames_written_to_ringbuffer); - if ((frames_written - frames_read) + nframes < midi_readahead) { - need_butler = true; - } - /*cerr << "MDS written: " << frames_written << " - read: " << frames_read << - " = " << frames_written - frames_read - << " + " << nframes << " < " << midi_readahead << " = " << need_butler << ")" << endl;*/ + /* + cerr << name() << " MDS written: " << frames_written << " - read: " << frames_read << + " = " << frames_written - frames_read + << " + " << playback_distance << " < " << midi_readahead << " = " << need_butler << ")" << endl; + */ - if (commit_should_unlock) { - state_lock.unlock(); + /* frames_read will generally be less than frames_written, but + * immediately after an overwrite, we can end up having read some data + * before we've written any. we don't need to trip an assert() on this, + * but we do need to check so that the decision on whether or not we + * need the butler is done correctly. + */ + + if (frames_read <= frames_written) { + if ((frames_written - frames_read) + playback_distance < midi_readahead) { + need_butler = true; + } } - _processed = false; return need_butler; } @@ -639,23 +483,29 @@ MidiDiskstream::set_pending_overwrite (bool yn) { /* called from audio thread, so we can use the read ptr and playback sample as we wish */ - pending_overwrite = yn; - + _pending_overwrite = yn; overwrite_frame = playback_sample; } int MidiDiskstream::overwrite_existing_buffers () { - //read(overwrite_frame, disk_io_chunk_frames, false); + /* This is safe as long as the butler thread is suspended, which it should be */ + _playback_buf->reset (); + + g_atomic_int_set (&_frames_read_from_ringbuffer, 0); + 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; + _pending_overwrite = false; return 0; } int -MidiDiskstream::seek (nframes_t frame, bool complete_refill) +MidiDiskstream::seek (framepos_t frame, bool complete_refill) { Glib::Mutex::Lock lm (state_lock); int ret = -1; @@ -678,7 +528,7 @@ MidiDiskstream::seek (nframes_t frame, bool complete_refill) } int -MidiDiskstream::can_internal_playback_seek (nframes_t distance) +MidiDiskstream::can_internal_playback_seek (framecnt_t distance) { uint32_t frames_read = g_atomic_int_get(&_frames_read_from_ringbuffer); uint32_t frames_written = g_atomic_int_get(&_frames_written_to_ringbuffer); @@ -686,7 +536,7 @@ MidiDiskstream::can_internal_playback_seek (nframes_t distance) } int -MidiDiskstream::internal_playback_seek (nframes_t distance) +MidiDiskstream::internal_playback_seek (framecnt_t distance) { first_recordable_frame += distance; playback_sample += distance; @@ -696,16 +546,18 @@ MidiDiskstream::internal_playback_seek (nframes_t distance) /** @a start is set to the new frame position (TIME) read up to */ int -MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) +MidiDiskstream::read (framepos_t& start, framecnt_t dur, bool reversed) { - nframes_t this_read = 0; + framecnt_t this_read = 0; bool reloop = false; - nframes_t loop_end = 0; - nframes_t loop_start = 0; - nframes_t loop_length = 0; + framepos_t loop_end = 0; + framepos_t loop_start = 0; Location *loc = 0; if (!reversed) { + + framecnt_t loop_length = 0; + /* Make the use of a Location atomic for this read operation. Note: Locations don't get deleted, so all we care about @@ -729,16 +581,16 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) start = loop_start + ((start - loop_start) % loop_length); //cerr << "to " << start << endl; } - //cerr << "start is " << start << " loopstart: " << loop_start << " loopend: " << loop_end << endl; + // cerr << "start is " << start << " end " << start+dur << " loopstart: " << loop_start << " loopend: " << loop_end << endl; } while (dur) { /* take any loop into account. we can't read past the end of the loop. */ - if (loc && (loop_end - start < dur)) { + if (loc && (loop_end - start <= dur)) { this_read = loop_end - start; - //cerr << "reloop true: thisread: " << this_read << " dur: " << dur << endl; + // cerr << "reloop true: thisread: " << this_read << " dur: " << dur << endl; reloop = true; } else { reloop = false; @@ -754,13 +606,11 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) if (midi_playlist()->read (*_playback_buf, start, this_read) != this_read) { error << string_compose( _("MidiDiskstream %1: cannot read %2 from playlist at frame %3"), - _id, this_read, start) << endmsg; + id(), this_read, start) << endmsg; return -1; } - g_atomic_int_add(&_frames_written_to_ringbuffer, this_read); - - _read_data_count = _playlist->read_data_count(); + g_atomic_int_add (&_frames_written_to_ringbuffer, this_read); if (reversed) { @@ -775,10 +625,7 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) if (reloop) { // Synthesize LoopEvent here, because the next events // written will have non-monotonic timestamps. - _playback_buf->write(loop_end - 1, LoopEventType, 0, 0); - cout << "Pushing LoopEvent ts=" << loop_end-1 - << " start+this_read " << start+this_read << endl; - + _playback_buf->write(loop_end - 1, LoopEventType, sizeof (framepos_t), (uint8_t *) &loop_start); start = loop_start; } else { start += this_read; @@ -814,29 +661,28 @@ MidiDiskstream::do_refill () } /* at end: nothing to do */ - if (file_frame == max_frames) { + if (file_frame == max_framepos) { return 0; } // At this point we... assert(_playback_buf->write_space() > 0); // ... have something to write to, and - assert(file_frame <= max_frames); // ... something to write + assert(file_frame <= max_framepos); // ... something to write // now calculate how much time is in the ringbuffer. // and lets write as much as we need to get this to be midi_readahead; uint32_t frames_read = g_atomic_int_get(&_frames_read_from_ringbuffer); uint32_t frames_written = g_atomic_int_get(&_frames_written_to_ringbuffer); if ((frames_written - frames_read) >= midi_readahead) { - //cout << "MDS Nothing to do. all fine" << endl; return 0; } - nframes_t to_read = midi_readahead - (frames_written - frames_read); + framecnt_t to_read = midi_readahead - (frames_written - frames_read); //cout << "MDS read for midi_readahead " << to_read << " rb_contains: " // << frames_written - frames_read << endl; - to_read = min(to_read, (max_frames - file_frame)); + to_read = (framecnt_t) min ((framecnt_t) to_read, (framecnt_t) (max_framepos - file_frame)); if (read (file_frame, to_read, reversed)) { ret = -1; @@ -858,21 +704,21 @@ MidiDiskstream::do_refill () int MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush) { - uint32_t to_write; + framecnt_t to_write; + framecnt_t total; int32_t ret = 0; - nframes_t total; - _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(); - } + 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; } @@ -891,19 +737,18 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush) 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, capture_start_frame, to_write) != to_write) { - error << string_compose(_("MidiDiskstream %1: cannot write to disk"), _id) << endmsg; + 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: @@ -911,19 +756,16 @@ out: } void -MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool abort_capture) +MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen*/, bool abort_capture) { - uint32_t buffer_position; bool more_work = true; int err = 0; boost::shared_ptr region; - nframes_t total_capture; MidiRegion::SourceList srcs; MidiRegion::SourceList::iterator src; vector::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. @@ -931,14 +773,14 @@ MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool a while (more_work && !err) { switch (do_flush (TransportContext, true)) { - case 0: - more_work = false; - break; - case 1: - break; - case -1: - error << string_compose(_("MidiDiskstream \"%1\": cannot flush captured data to disk!"), _name) << endmsg; - err++; + case 0: + more_work = false; + break; + case 1: + break; + case -1: + error << string_compose(_("MidiDiskstream \"%1\": cannot flush captured data to disk!"), _name) << endmsg; + err++; } } @@ -946,13 +788,12 @@ MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool a Glib::Mutex::Lock lm (capture_info_lock); if (capture_info.empty()) { - return; + goto no_capture_stuff_to_do; } if (abort_capture) { if (_write_source) { - _write_source->mark_for_remove (); _write_source->drop_references (); _write_source.reset(); @@ -964,102 +805,152 @@ MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool a assert(_write_source); - for (total_capture = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) { + framecnt_t total_capture = 0; + for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) { total_capture += (*ci)->frames; } - /* figure out the name for this take */ + if (_write_source->length (capture_info.front()->start) != 0) { - srcs.push_back (_write_source); - _write_source->set_timeline_position (capture_info.front()->start); - _write_source->set_captured_for (_name); + /* phew, we have data */ - string whole_file_region_name; - whole_file_region_name = region_name_from_path (_write_source->name(), true); + /* figure out the name for this take */ - /* Register a new region with the Session that - describes the entire source. Do this first - so that any sub-regions will obviously be - children of this one (later!) - */ + srcs.push_back (_write_source); - try { - boost::shared_ptr rx (RegionFactory::create (srcs, 0, - total_capture, whole_file_region_name, 0, - Region::Flag (Region::DefaultFlags|Region::Automatic|Region::WholeFile))); + _write_source->set_timeline_position (capture_info.front()->start); + _write_source->set_captured_for (_name); - region = boost::dynamic_pointer_cast (rx); - region->special_set_position (capture_info.front()->start); - } + /* 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); - catch (failed_constructor& err) { - error << string_compose(_("%1: could not create region for complete midi file"), _name) << endmsg; - /* XXX what now? */ - } + /* flush to disk: this step differs from the audio path, + where all the data is already on disk. + */ - _last_capture_regions.push_back (region); + _write_source->mark_midi_streaming_write_completed (Evoral::Sequence::ResolveStuckNotes, total_capture_beats); - // cerr << _name << ": there are " << capture_info.size() << " capture_info records\n"; + /* we will want to be able to keep (over)writing the source + but we don't want it to be removable. this also differs + from the audio situation, where the source at this point + must be considered immutable. luckily, we can rely on + MidiSource::mark_streaming_write_completed() to have + already done the necessary work for that. + */ - XMLNode &before = _playlist->get_state(); - _playlist->freeze (); + string whole_file_region_name; + whole_file_region_name = region_name_from_path (_write_source->name(), true); - for (buffer_position = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) { + /* Register a new region with the Session that + describes the entire source. Do this first + so that any sub-regions will obviously be + children of this one (later!) + */ - string region_name; + try { + PropertyList plist; - _session.region_name (region_name, _write_source->name(), false); + plist.add (Properties::name, whole_file_region_name); + plist.add (Properties::whole_file, true); + plist.add (Properties::automatic, true); + plist.add (Properties::start, 0); + plist.add (Properties::length, total_capture); + plist.add (Properties::layer, 0); - // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n"; + boost::shared_ptr rx (RegionFactory::create (srcs, plist)); - try { - boost::shared_ptr rx (RegionFactory::create (srcs, buffer_position, (*ci)->frames, region_name)); region = boost::dynamic_pointer_cast (rx); + region->special_set_position (capture_info.front()->start); } + catch (failed_constructor& err) { - error << _("MidiDiskstream: could not create region for captured midi!") << endmsg; - continue; /* XXX is this OK? */ + error << string_compose(_("%1: could not create region for complete midi file"), _name) << endmsg; + /* XXX what now? */ } - region->GoingAway.connect (bind (mem_fun (*this, &Diskstream::remove_region_from_last_capture), boost::weak_ptr(region))); + _last_capture_sources.insert (_last_capture_sources.end(), srcs.begin(), srcs.end()); - _last_capture_regions.push_back (region); + _playlist->clear_changes (); + _playlist->freeze (); - // cerr << "add new region, buffer position = " << buffer_position << " @ " << (*ci)->start << endl; + /* Session frame time of the initial capture in this pass, which is where the source starts */ + framepos_t initial_capture = 0; + if (!capture_info.empty()) { + initial_capture = capture_info.front()->start; + } - i_am_the_modifier++; - _playlist->add_region (region, (*ci)->start); - i_am_the_modifier--; + for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) { - buffer_position += (*ci)->frames; - } + string region_name; - _playlist->thaw (); - XMLNode &after = _playlist->get_state(); - _session.add_command (new MementoCommand(*_playlist, &before, &after)); + RegionFactory::region_name (region_name, _write_source->name(), false); - } + // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n"; - mark_write_completed = true; + try { + PropertyList plist; - reset_write_sources (mark_write_completed); + /* start of this region is the offset between the start of its capture and the start of the whole pass */ + plist.add (Properties::start, (*ci)->start - initial_capture); + plist.add (Properties::length, (*ci)->frames); + plist.add (Properties::length_beats, converter.from((*ci)->frames)); + plist.add (Properties::name, region_name); + + boost::shared_ptr rx (RegionFactory::create (srcs, plist)); + region = boost::dynamic_pointer_cast (rx); + } + + catch (failed_constructor& err) { + error << _("MidiDiskstream: could not create region for captured midi!") << endmsg; + continue; /* XXX is this OK? */ + } + + // cerr << "add new region, buffer position = " << buffer_position << " @ " << (*ci)->start << endl; + + i_am_the_modifier++; + _playlist->add_region (region, (*ci)->start); + i_am_the_modifier--; + } + + _playlist->thaw (); + _session.add_command (new StatefulDiffCommand(_playlist)); + + } else { + + /* No data was recorded, so this capture will + effectively be aborted; do the same as we + do for an explicit abort. + */ + + if (_write_source) { + _write_source->mark_for_remove (); + _write_source->drop_references (); + _write_source.reset(); + } + } - for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) { - delete *ci; } - if (_playlist) { - midi_playlist()->clear_note_trackers (); + use_new_write_source (0); + + for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) { + delete *ci; } capture_info.clear (); capture_start_frame = 0; + + no_capture_stuff_to_do: + + reset_tracker (); } void -MidiDiskstream::transport_looped (nframes_t transport_frame) +MidiDiskstream::transport_looped (framepos_t transport_frame) { if (was_recording) { @@ -1075,20 +966,24 @@ MidiDiskstream::transport_looped (nframes_t transport_frame) } } - 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 // no latency adjustment or capture offset needs to be made, as that already happened the first time capture_start_frame = transport_frame; first_recordable_frame = transport_frame; // mild lie - last_recordable_frame = max_frames; + last_recordable_frame = max_framepos; was_recording = true; } + + if (!Config->get_seamless_loop()) { + reset_tracker (); + } } void -MidiDiskstream::finish_capture (bool /*rec_monitors_input*/) +MidiDiskstream::finish_capture () { was_recording = false; @@ -1128,15 +1023,6 @@ MidiDiskstream::set_record_enabled (bool yn) assert(!destructive()); - if (yn && _source_port == 0) { - - /* pick up connections not initiated *from* the IO object - we're associated with. - */ - - get_input_sources (); - } - /* yes, i know that this not proof against race conditions, but its good enough. i think. */ @@ -1153,20 +1039,16 @@ MidiDiskstream::set_record_enabled (bool yn) void MidiDiskstream::engage_record_enable () { - bool rolling = _session.transport_speed() != 0.0f; + bool const rolling = _session.transport_speed() != 0.0f; g_atomic_int_set (&_record_enabled, 1); - if (_source_port && Config->get_monitoring_model() == HardwareMonitoring) { - _source_port->request_monitor_input (!(_session.config.get_auto_input() && rolling)); + boost::shared_ptr sp = _source_port.lock (); + + if (sp && Config->get_monitoring_model() == HardwareMonitoring) { + sp->request_jack_monitors_input (!(_session.config.get_auto_input() && rolling)); } - // FIXME: Why is this necessary? Isn't needed for AudioDiskstream... - if (!_write_source) - use_new_write_source(); - - _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame()); - RecordEnableChanged (); /* EMIT SIGNAL */ } @@ -1174,38 +1056,19 @@ void MidiDiskstream::disengage_record_enable () { g_atomic_int_set (&_record_enabled, 0); - if (_source_port && Config->get_monitoring_model() == HardwareMonitoring) { - if (_source_port) { - _source_port->request_monitor_input (false); - } - } - RecordEnableChanged (); /* EMIT SIGNAL */ } XMLNode& MidiDiskstream::get_state () { - XMLNode* node = new XMLNode ("MidiDiskstream"); + 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()) { @@ -1227,32 +1090,26 @@ MidiDiskstream::get_state () } 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(); XMLNodeIterator niter; - uint32_t nchans = 1; 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")) { @@ -1260,20 +1117,8 @@ MidiDiskstream::set_state (const XMLNode& node, int /*version*/) } } - /* 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; @@ -1289,51 +1134,12 @@ MidiDiskstream::set_state (const XMLNode& node, int /*version*/) } } - set_channel_mode(channel_mode, channel_mask); - if ((prop = node.property ("channels")) != 0) { - nchans = atoi (prop->value().c_str()); + if (capture_pending_node) { + use_pending_capture_data (*capture_pending_node); } - 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 ((prop = node.property ("speed")) != 0) { - double sp = atof (prop->value().c_str()); - - if (realtime_set_speed (sp, false)) { - non_realtime_set_speed (); - } - } - - in_set_state = false; - - /* make sure this is clear before we do anything else */ - - // FIXME? - //_capturing_source = 0; - - /* write sources are handled when we handle the input set - up of the IO that owns this DS (::non_realtime_input_change()) - */ + set_channel_mode (channel_mode, channel_mask); in_set_state = false; @@ -1343,24 +1149,18 @@ MidiDiskstream::set_state (const XMLNode& node, int /*version*/) int MidiDiskstream::use_new_write_source (uint32_t n) { - if (!recordable()) { + if (!_session.writable() || !recordable()) { return 1; } assert(n == 0); - if (_write_source) { - - if (_write_source->is_empty ()) { - _write_source->mark_for_remove (); - _write_source.reset(); - } else { - _write_source.reset(); - } - } + _write_source.reset(); try { - _write_source = boost::dynamic_pointer_cast(_session.create_midi_source_for_session (*this)); + _write_source = boost::dynamic_pointer_cast( + _session.create_midi_source_for_session (0, name ())); + if (!_write_source) { throw failed_constructor(); } @@ -1372,12 +1172,29 @@ MidiDiskstream::use_new_write_source (uint32_t n) return -1; } - _write_source->set_allow_remove_if_empty (true); - _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame()); - return 0; } +list > +MidiDiskstream::steal_write_sources() +{ + list > ret; + + /* put some data on the disk, even if its just a header for an empty file */ + boost::dynamic_pointer_cast (_write_source)->ensure_disk_file (); + + /* never let it go away */ + _write_source->mark_nonremovable (); + + ret.push_back (_write_source); + + /* get a new one */ + + use_new_write_source (0); + + return ret; +} + void MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/) { @@ -1388,22 +1205,11 @@ MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/) if (_write_source && mark_write_complete) { _write_source->mark_streaming_write_completed (); } - use_new_write_source (0); } -int -MidiDiskstream::rename_write_sources () -{ - if (_write_source != 0) { - _write_source->set_source_name (_name, destructive()); - /* XXX what to do if this fails ? */ - } - return 0; -} - void -MidiDiskstream::set_block_size (nframes_t /*nframes*/) +MidiDiskstream::set_block_size (pframes_t /*nframes*/) { } @@ -1413,47 +1219,52 @@ MidiDiskstream::allocate_temporary_buffers () } void -MidiDiskstream::monitor_input (bool yn) +MidiDiskstream::ensure_jack_monitors_input (bool yn) { - if (_source_port) - _source_port->ensure_monitor_input (yn); + boost::shared_ptr sp = _source_port.lock (); + + if (sp) { + sp->ensure_jack_monitors_input (yn); + } } 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); } float MidiDiskstream::playback_buffer_load () const { - return (float) ((double) _playback_buf->read_space()/ - (double) _playback_buf->capacity()); + /* For MIDI it's not trivial to differentiate the following two cases: + + 1. The playback buffer is empty because the system has run out of time to fill it. + 2. The playback buffer is empty because there is no more data on the playlist. + + If we use a simple buffer load computation, we will report that the MIDI diskstream + cannot keep up when #2 happens, when in fact it can. Since MIDI data rates + are so low compared to audio, just give a pretend answer here. + */ + + return 1; } float MidiDiskstream::capture_buffer_load () const { - return (float) ((double) _capture_buf->write_space()/ - (double) _capture_buf->capacity()); + /* We don't report playback buffer load, so don't report capture load either */ + + return 1; } int @@ -1462,32 +1273,65 @@ MidiDiskstream::use_pending_capture_data (XMLNode& /*node*/) return 0; } -/** Writes playback events in the given range to \a dst, translating time stamps - * so that an event at \a start has time = 0 +/** Writes playback events from playback_sample for nframes to dst, translating time stamps + * so that an event at playback_sample has time = 0 */ void -MidiDiskstream::get_playback (MidiBuffer& dst, nframes_t start, nframes_t end) +MidiDiskstream::get_playback (MidiBuffer& dst, framecnt_t nframes) { dst.clear(); assert(dst.size() == 0); - // Reverse. ... We just don't do reverse, ok? Back off. - if (end <= start) { - return; - } - - // Translates stamps to be relative to start - - #ifndef NDEBUG - 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 pre-read read %4..%5 from %2 write to %3\n", _name, + _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr(), playback_sample, playback_sample + nframes)); +// cerr << "================\n"; +// _playback_buf->dump (cerr); +// cerr << "----------------\n"; + + const size_t events_read = _playback_buf->read (dst, playback_sample, playback_sample + nframes); + 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, playback_sample, playback_sample + nframes, + _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); + _playback_buf->read (dst, playback_sample, playback_sample + nframes); #endif - gint32 frames_read = end - start; - g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read); + g_atomic_int_add (&_frames_read_from_ringbuffer, nframes); } +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; +} + +boost::shared_ptr +MidiDiskstream::get_gui_feed_buffer () const +{ + boost::shared_ptr b (new MidiBuffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI))); + + Glib::Mutex::Lock lm (_gui_feed_buffer_mutex); + b->copy (_gui_feed_buffer); + return b; +} + +void +MidiDiskstream::reset_tracker () +{ + _playback_buf->reset_tracker (); + + boost::shared_ptr mp (midi_playlist()); + + if (mp) { + mp->clear_note_trackers (); + } +}