X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_diskstream.cc;h=229c0ad7688aea940eec7fd8042dcd5bb2e901df;hb=9458fce148c862f5504d88754d5418972dd4046b;hp=ae0828a3a495703899c5dd076ae1a00c23aafbd6;hpb=3139b7e9804496395beb787622d5de90266b8e4a;p=ardour.git diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index ae0828a3a4..229c0ad768 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -135,6 +135,7 @@ MidiDiskstream::init () _capture_buf = new MidiRingBuffer(size); _n_channels = ChanCount(DataType::MIDI, 1); + interpolation.add_channel_to (0,0); } MidiDiskstream::~MidiDiskstream () @@ -402,17 +403,10 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t } if (nominally_recording || rec_nframes) { - - // Pump entire port buffer into the ring buffer (FIXME: split cycles?) - MidiBuffer& buf = sp->get_midi_buffer(nframes); - ChannelMode mode = AllChannels; - uint32_t mask = 0xffff; - - MidiTrack * mt = dynamic_cast (_track); - if (mt) { - mode = mt->get_capture_channel_mode (); - mask = mt->get_capture_channel_mask (); - } + // Pump entire port buffer into the ring buffer (TODO: split cycles?) + MidiBuffer& buf = sp->get_midi_buffer(nframes); + MidiTrack* mt = dynamic_cast(_track); + MidiChannelFilter* filter = mt ? &mt->capture_filter() : NULL; for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) { Evoral::MIDIEvent ev(*i, false); @@ -420,7 +414,7 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t break; } #ifndef NDEBUG - if (DEBUG::MidiIO & PBD::debug_bits) { + if (DEBUG_ENABLED(DEBUG::MidiIO)) { 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())); @@ -446,31 +440,12 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t const framecnt_t loop_offset = _num_captured_loops * loop_length; const framepos_t event_time = transport_frame + loop_offset - _accumulated_capture_offset + ev.time(); if (event_time < 0 || event_time < first_recordable_frame) { + /* Event out of range, skip */ continue; } - switch (mode) { - case AllChannels: - _capture_buf->write(event_time, - ev.type(), ev.size(), ev.buffer()); - break; - case FilterChannels: - if (ev.is_channel_event()) { - if ((1<write(event_time, - ev.type(), ev.size(), ev.buffer()); - } - } else { - _capture_buf->write(event_time, - ev.type(), ev.size(), ev.buffer()); - } - break; - case ForceChannel: - if (ev.is_channel_event()) { - ev.set_channel (PBD::ffs(mask) - 1); - } - _capture_buf->write(event_time, - ev.type(), ev.size(), ev.buffer()); - break; + + if (!filter || !filter->filter(ev.buffer(), ev.size())) { + _capture_buf->write(event_time, ev.type(), ev.size(), ev.buffer()); } } g_atomic_int_add(const_cast(&_frames_pending_write), nframes); @@ -522,44 +497,35 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t playback_distance = nframes; - } else { + } else if (_actual_speed != 1.0f && _target_speed > 0) { - /* XXX: should be doing varispeed stuff here, similar to the code in AudioDiskstream::process */ + interpolation.set_speed (_target_speed); - playback_distance = nframes; - -#ifndef NO_SIMPLE_MIDI_VARISPEED - if (_target_speed > 0) { - playback_distance = nframes * _target_speed; - } -#endif + playback_distance = interpolation.distance (nframes); + } else { + playback_distance = nframes; } if (need_disk_signal) { /* copy the diskstream data to all output buffers */ MidiBuffer& mbuf (bufs.get_midi (0)); -#ifndef NO_SIMPLE_MIDI_VARISPEED - get_playback (mbuf, nframes * _target_speed); -#else - get_playback (mbuf, nframes); -#endif + get_playback (mbuf, playback_distance); /* leave the audio count alone */ ChanCount cnt (DataType::MIDI, 1); cnt.set (DataType::AUDIO, bufs.count().n_audio()); bufs.set_count (cnt); -#ifndef NO_SIMPLE_MIDI_VARISPEED - if (_target_speed > 0 && playback_distance != nframes) { + /* vari-speed */ + if (_target_speed > 0 && _actual_speed != 1.0f) { MidiBuffer& mbuf (bufs.get_midi (0)); for (MidiBuffer::iterator i = mbuf.begin(); i != mbuf.end(); ++i) { MidiBuffer::TimeType *tme = i.timeptr(); - *tme = (*tme) / _target_speed; + *tme = (*tme) * nframes / playback_distance; } } -#endif } return 0; @@ -568,14 +534,13 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t frameoffset_t MidiDiskstream::calculate_playback_distance (pframes_t nframes) { -#ifndef NO_SIMPLE_MIDI_VARISPEED - frameoffset_t playback_distance = nframes * _target_speed; -#else frameoffset_t playback_distance = nframes; - /* XXX: should be doing varispeed stuff once it's implemented in ::process() above */ + if (!record_enabled() && _actual_speed != 1.0f && _actual_speed > 0.f) { + interpolation.set_speed (_target_speed); + playback_distance = interpolation.distance (nframes, false); + } -#endif if (_actual_speed < 0.0) { return -playback_distance; } else { @@ -588,6 +553,10 @@ MidiDiskstream::commit (framecnt_t playback_distance) { bool need_butler = false; + if (!_io || !_io->active()) { + return false; + } + if (_actual_speed < 0.0) { playback_sample -= playback_distance; } else { @@ -615,10 +584,33 @@ MidiDiskstream::commit (framecnt_t playback_distance) * need the butler is done correctly. */ + /* furthermore.. + * + * Doing heavy GUI operations[1] can stall also the butler. + * The RT-thread meanwhile will happily continue and + * ‘frames_read’ (from buffer to output) will become larger + * than ‘frames_written’ (from disk to buffer). + * + * The disk-stream is now behind.. + * + * In those cases the butler needs to be summed to refill the buffer (done now) + * AND we need to skip (frames_read - frames_written). ie remove old events + * before playback_sample from the rinbuffer. + * + * [1] one way to do so is described at #6170. + * For me just popping up the context-menu on a MIDI-track header + * of a track with a large (think beethoven :) midi-region also did the + * trick. The playhead stalls for 2 or 3 sec, until the context-menu shows. + * + * In both cases the root cause is that redrawing MIDI regions on the GUI is still very slow + * and can stall + */ if (frames_read <= frames_written) { if ((frames_written - frames_read) + playback_distance < midi_readahead) { need_butler = true; } + } else { + need_butler = true; } @@ -718,6 +710,9 @@ MidiDiskstream::read (framepos_t& start, framecnt_t dur, bool reversed) framecnt_t loop_length = 0; Location* loc = 0; + MidiTrack* mt = dynamic_cast(_track); + MidiChannelFilter* filter = mt ? &mt->playback_filter() : NULL; + if (!reversed) { loc = loop_location; @@ -754,7 +749,7 @@ MidiDiskstream::read (framepos_t& start, framecnt_t dur, bool reversed) this_read = min(dur,this_read); - if (midi_playlist()->read (*_playback_buf, start, this_read) != this_read) { + if (midi_playlist()->read (*_playback_buf, start, this_read, 0, filter) != this_read) { error << string_compose( _("MidiDiskstream %1: cannot read %2 from playlist at frame %3"), id(), this_read, start) << endmsg; @@ -789,7 +784,7 @@ MidiDiskstream::read (framepos_t& start, framecnt_t dur, bool reversed) } int -MidiDiskstream::do_refill_with_alloc () +MidiDiskstream::_do_refill_with_alloc (bool /* partial_fill */) { return do_refill(); } @@ -821,16 +816,17 @@ MidiDiskstream::do_refill () 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) { + if ((frames_read < frames_written) && (frames_written - frames_read) >= midi_readahead) { return 0; } - framecnt_t to_read = midi_readahead - (frames_written - frames_read); + framecnt_t to_read = midi_readahead - ((framecnt_t)frames_written - (framecnt_t)frames_read); //cout << "MDS read for midi_readahead " << to_read << " rb_contains: " // << frames_written - frames_read << endl; - to_read = (framecnt_t) min ((framecnt_t) to_read, (framecnt_t) (max_framepos - file_frame)); + to_read = min (to_read, (framecnt_t) (max_framepos - file_frame)); + to_read = min (to_read, (framecnt_t) write_space); if (read (file_frame, to_read, reversed)) { ret = -1; @@ -1147,7 +1143,7 @@ MidiDiskstream::finish_capture () void MidiDiskstream::set_record_enabled (bool yn) { - if (!recordable() || !_session.record_enabling_legal() || _io->n_ports().n_midi() == 0) { + if (!recordable() || !_session.record_enabling_legal() || _io->n_ports().n_midi() == 0 || record_safe ()) { return; } @@ -1166,10 +1162,32 @@ MidiDiskstream::set_record_enabled (bool yn) } } +void +MidiDiskstream::set_record_safe (bool yn) +{ + if (!recordable() || !_session.record_enabling_legal() || _io->n_ports().n_midi() == 0) { // REQUIRES REVIEW + return; + } + + /* yes, i know that this not proof against race conditions, but its + good enough. i think. + */ + + if (record_safe () != yn) { + if (yn) { + engage_record_safe (); + } else { + disengage_record_safe (); + } + + RecordSafeChanged (); /* EMIT SIGNAL */ + } +} + bool MidiDiskstream::prep_record_enable () { - if (!recordable() || !_session.record_enabling_legal() || _io->n_ports().n_midi() == 0) { + if (!recordable() || !_session.record_enabling_legal() || _io->n_ports().n_midi() == 0 || record_safe ()) { // REQUIRES REVIEW "|| record_safe ()" return false; } @@ -1440,6 +1458,8 @@ MidiDiskstream::get_playback (MidiBuffer& dst, framecnt_t nframes) _playback_buf->resolve_tracker (dst, 0); } + _playback_buf->skip_to (effective_start); + if (loc->end() >= effective_start && loc->end() < effective_start + nframes) { /* end of loop is within the range we are reading, so split the read in two, and lie about the location @@ -1471,6 +1491,7 @@ MidiDiskstream::get_playback (MidiBuffer& dst, framecnt_t nframes) events_read = _playback_buf->read (dst, effective_start, effective_start + nframes); } } else { + _playback_buf->skip_to (playback_sample); events_read = _playback_buf->read (dst, playback_sample, playback_sample + nframes); } @@ -1532,6 +1553,19 @@ MidiDiskstream::reset_tracker () } } +void +MidiDiskstream::resolve_tracker (Evoral::EventSink& buffer, framepos_t time) +{ + _playback_buf->resolve_tracker(buffer, time); + + boost::shared_ptr mp (midi_playlist()); + + if (mp) { + mp->reset_note_trackers (); + } +} + + boost::shared_ptr MidiDiskstream::midi_playlist () {