X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_diskstream.cc;h=9c8c9e8620101683593ec0583b14fc899c7a46be;hb=bf0a99f0c0a8f76725fba89d076010009c4cdcb0;hp=921824c615927b16246af54c0b0c660254c28586;hpb=fbfb26b45c075da880861cf2303b851fe1acc0e8;p=ardour.git diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 921824c615..9c8c9e8620 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -29,26 +29,30 @@ #include #include -#include -#include +#include "pbd/error.h" +#include "pbd/basename.h" #include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "pbd/xml++.h" +#include "pbd/memento_command.h" +#include "pbd/enumwriter.h" + +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/configuration.h" +#include "ardour/cycle_timer.h" +#include "ardour/io.h" +#include "ardour/midi_diskstream.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/send.h" +#include "ardour/session.h" +#include "ardour/smf_source.h" +#include "ardour/utils.h" + +#include "midi++/types.h" #include "i18n.h" #include @@ -57,18 +61,17 @@ using namespace std; using namespace ARDOUR; using namespace PBD; +nframes_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) - //, _current_playback_buffer(0) - //, _current_capture_buffer(0) - //, _playback_wrap_buffer(0) - //, _capture_wrap_buffer(0) , _source_port(0) - , _capture_transition_buf(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 */ @@ -86,14 +89,11 @@ MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node) : Diskstream(sess, node) , _playback_buf(0) , _capture_buf(0) - //, _current_playback_buffer(0) - //, _current_capture_buffer(0) - //, _playback_wrap_buffer(0) - //, _capture_wrap_buffer(0) , _source_port(0) - , _capture_transition_buf(0) , _last_flush_frame(0) , _note_mode(Sustained) + , _frames_written_to_ringbuffer(0) + , _frames_read_from_ringbuffer(0) { in_set_state = true; init (Recordable); @@ -123,9 +123,9 @@ MidiDiskstream::init (Diskstream::Flag f) set_block_size (_session.get_block_size()); allocate_temporary_buffers (); - _playback_buf = new MidiRingBuffer (_session.diskstream_buffer_size()); - _capture_buf = new MidiRingBuffer (_session.diskstream_buffer_size()); - _capture_transition_buf = new RingBufferNPT (128); + const size_t size = _session.midi_diskstream_buffer_size(); + _playback_buf = new MidiRingBuffer(size); + _capture_buf = new MidiRingBuffer(size); _n_channels = ChanCount(DataType::MIDI, 1); @@ -141,10 +141,10 @@ MidiDiskstream::~MidiDiskstream () void MidiDiskstream::non_realtime_locate (nframes_t position) { - //cerr << "MDS: non_realtime_locate: " << position << endl; - assert(_write_source); - _write_source->set_timeline_position (position); - seek(position, true); // correct? + if (_write_source) { + _write_source->set_timeline_position (position); + } + seek(position, false); } @@ -159,7 +159,10 @@ MidiDiskstream::non_realtime_input_change () } if (input_change_pending & ConfigurationChanged) { - assert(_io->n_inputs() == _n_channels); + if (_io->n_ports().n_midi() != _n_channels.n_midi()) { + error << "Can not feed IO " << _io->n_ports() + << " with diskstream " << _n_channels << endl; + } } get_input_sources (); @@ -196,7 +199,7 @@ MidiDiskstream::non_realtime_input_change () void MidiDiskstream::get_input_sources () { - uint32_t ni = _io->n_inputs().n_midi(); + uint32_t ni = _io->n_ports().n_midi(); if (ni == 0) { return; @@ -205,7 +208,7 @@ MidiDiskstream::get_input_sources () // This is all we do for now at least assert(ni == 1); - _source_port = _io->midi_input(0); + _source_port = _io->midi(0); // do... stuff? } @@ -311,7 +314,7 @@ MidiDiskstream::set_note_mode (NoteMode m) } void -MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record) +MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t /*nframes*/, bool can_record) { // FIXME: waaay too much code to duplicate (AudioDiskstream) @@ -338,7 +341,7 @@ MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframe /* if per-track or global rec-enable turned on while the other was already on, we've started recording */ - if ((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record) || + if (((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record)) || ((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) { /* starting to record: compute first+last frames */ @@ -364,7 +367,7 @@ MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframe if (_alignment_style == ExistingMaterial) { - if (!Config->get_punch_in()) { + if (!_session.config.get_punch_in()) { /* manual punch in happens at the correct transport frame because the user hit a button. but to get alignment correct @@ -393,7 +396,7 @@ MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframe } else { - if (Config->get_punch_in()) { + if (_session.config.get_punch_in()) { first_recordable_frame += _roll_delay; } else { capture_start_frame -= _roll_delay; @@ -402,21 +405,6 @@ MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframe } - if (_flags & Recordable) { - RingBufferNPT::rw_vector transvec; - _capture_transition_buf->get_write_vector(&transvec); - - if (transvec.len[0] > 0) { - transvec.buf[0]->type = CaptureStart; - transvec.buf[0]->capture_val = capture_start_frame; - _capture_transition_buf->increment_write_ptr(1); - } else { - // bad! - fatal << X_("programming error: capture_transition_buf is full on rec start! inconceivable!") - << endmsg; - } - } - } else if (!record_enabled() || !can_record) { /* stop recording */ @@ -433,8 +421,177 @@ MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframe last_possibly_recording = possibly_recording; } +#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, nframes_t offset, bool can_record, bool rec_monitors_input) +MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input) { // FIXME: waay too much code to duplicate (AudioDiskstream::process) int ret = -1; @@ -442,7 +599,7 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t nframes_t rec_nframes = 0; bool nominally_recording; bool re = record_enabled (); - bool collect_playback = false; + bool collect_playback = true; /* if we've already processed the frames corresponding to this call, just return. this allows multiple routes that are taking input @@ -467,7 +624,7 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t return 0; } - /* This lock is held until the end of AudioDiskstream::commit, so these two functions + /* 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. */ @@ -479,7 +636,7 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t commit_should_unlock = true; adjust_capture_position = 0; - if (nominally_recording || (_session.get_record_enabled() && Config->get_punch_in())) { + if (nominally_recording || (_session.get_record_enabled() && _session.config.get_punch_in())) { OverlapType ot; ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes); @@ -537,19 +694,12 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t if (nominally_recording || rec_nframes) { - assert(_source_port); - // Pump entire port buffer into the ring buffer (FIXME: split cycles?) - //_capture_buf->write(_source_port->get_midi_buffer(), transport_frame); - size_t num_events = _source_port->get_midi_buffer().size(); - size_t to_write = std::min(_capture_buf->write_space(), num_events); - - MidiBuffer::iterator port_iter = _source_port->get_midi_buffer().begin(); - - for (size_t i=0; i < to_write; ++i) { - const MidiEvent& ev = *port_iter; - _capture_buf->write(ev.time() + transport_frame, ev.size(), ev.buffer()); - ++port_iter; + MidiBuffer& buf = _source_port->get_midi_buffer(nframes); + for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) { + const Evoral::MIDIEvent ev(*i, false); + assert(ev.buffer()); + _capture_buf->write(ev.time() + transport_frame, ev.type(), ev.size(), ev.buffer()); } } else { @@ -562,16 +712,10 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t if (rec_nframes) { - /* XXX XXX XXX XXX XXX XXX XXX XXX */ - /* data will be written to disk */ if (rec_nframes == nframes && rec_offset == 0) { - playback_distance = nframes; - } else { - - collect_playback = true; } adjust_capture_position = rec_nframes; @@ -581,10 +725,8 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t /* can't do actual capture yet - waiting for latency effects to finish before we start*/ playback_distance = nframes; + collect_playback = false; - } else { - - collect_playback = true; } if (collect_playback) { @@ -601,10 +743,13 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t necessary_samples = nframes; } - // XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX - // Write into playback buffer here, and whatnot? - //cerr << "MDS FIXME: collect playback" << endl; - + // Pump entire port buffer into playback buffer (FIXME: split cycles?) + MidiBuffer& buf = _source_port->get_midi_buffer(nframes); + for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) { + const Evoral::MIDIEvent ev(*i, false); + assert(ev.buffer()); + _playback_buf->write(ev.time() + transport_frame, ev.type(), ev.size(), ev.buffer()); + } } ret = 0; @@ -640,12 +785,15 @@ MidiDiskstream::commit (nframes_t nframes) adjust_capture_position = 0; } - if (_slaved) { - need_butler = _playback_buf->write_space() >= _playback_buf->capacity() / 2; - } else { - need_butler = _playback_buf->write_space() >= disk_io_chunk_frames - || _capture_buf->read_space() >= disk_io_chunk_frames; + 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;*/ if (commit_should_unlock) { state_lock.unlock(); @@ -662,15 +810,17 @@ 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; - + overwrite_frame = playback_sample; - //overwrite_offset = channels.front().playback_buf->get_read_ptr(); } int MidiDiskstream::overwrite_existing_buffers () { - //cerr << "MDS: overwrite_existing_buffers() (does nothing)" << endl; + //read(overwrite_frame, disk_io_chunk_frames, false); + overwrite_queued = false; + pending_overwrite = false; + return 0; } @@ -680,10 +830,10 @@ MidiDiskstream::seek (nframes_t frame, bool complete_refill) Glib::Mutex::Lock lm (state_lock); int ret = -1; - //cerr << "MDS: seek: " << frame << endl; - _playback_buf->reset(); _capture_buf->reset(); + g_atomic_int_set(&_frames_read_from_ringbuffer, 0); + g_atomic_int_set(&_frames_written_to_ringbuffer, 0); playback_sample = frame; file_frame = frame; @@ -700,11 +850,9 @@ MidiDiskstream::seek (nframes_t frame, bool complete_refill) int MidiDiskstream::can_internal_playback_seek (nframes_t distance) { - if (_playback_buf->read_space() < distance) { - return false; - } else { - return true; - } + uint32_t frames_read = g_atomic_int_get(&_frames_read_from_ringbuffer); + uint32_t frames_written = g_atomic_int_get(&_frames_written_to_ringbuffer); + return ((frames_written - frames_read) < distance); } int @@ -748,7 +896,7 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) position within the loop. */ - if (loc && start >= loop_end) { + if (loc && (start >= loop_end)) { //cerr << "start adjusted from " << start; start = loop_start + ((start - loop_start) % loop_length); //cerr << "to " << start << endl; @@ -776,17 +924,21 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) this_read = min(dur,this_read); 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; + error << string_compose( + _("MidiDiskstream %1: cannot read %2 from playlist at frame %3"), + _id, this_read, start) << endmsg; return -1; } + + //cout << "MDS this read " << this_read << " start = " << start << endl; + g_atomic_int_add(&_frames_written_to_ringbuffer, this_read); _read_data_count = _playlist->read_data_count(); if (reversed) { // Swap note ons with note offs here. etc? - // Fully reversing MIDI required look-ahead (well, behind) to find previous + // Fully reversing MIDI requires look-ahead (well, behind) to find previous // CC values etc. hard. } else { @@ -794,6 +946,12 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) /* if we read to the end of the loop, go back to the beginning */ 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; + start = loop_start; } else { start += this_read; @@ -816,47 +974,20 @@ MidiDiskstream::do_refill_with_alloc () int MidiDiskstream::do_refill () { - int32_t ret = 0; - size_t write_space = _playback_buf->write_space(); - - bool reversed = (_visible_speed * _session.transport_speed()) < 0.0f; + int ret = 0; + size_t write_space = _playback_buf->write_space(); + bool reversed = (_visible_speed * _session.transport_speed()) < 0.0f; if (write_space == 0) { return 0; } - - /* if we're running close to normal speed and there isn't enough - space to do disk_io_chunk_frames of I/O, then don't bother. - - at higher speeds, just do it because the sync between butler - and audio thread may not be good enough. - */ - - if ((write_space < disk_io_chunk_frames) && fabs (_actual_speed) < 2.0f) { - //cerr << "No refill 1\n"; - return 0; - } - - /* when slaved, don't try to get too close to the read pointer. this - leaves space for the buffer reversal to have something useful to - work with. - */ - - if (_slaved && write_space < (_playback_buf->capacity() / 2)) { - //cerr << "No refill 2\n"; - return 0; - } - + if (reversed) { - //cerr << "No refill 3 (reverse)\n"; return 0; } + /* at end: nothing to do */ if (file_frame == max_frames) { - //cerr << "No refill 4 (EOF)\n"; - - /* at end: nothing to do */ - return 0; } @@ -864,19 +995,26 @@ MidiDiskstream::do_refill () assert(_playback_buf->write_space() > 0); // ... have something to write to, and assert(file_frame <= max_frames); // ... something to write - nframes_t file_frame_tmp = file_frame; - nframes_t to_read = min(disk_io_chunk_frames, (max_frames - file_frame)); - - // FIXME: read count? - if (read (file_frame_tmp, to_read, reversed)) { - ret = -1; - goto out; + // 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; } - file_frame = file_frame_tmp; + nframes_t to_read = midi_readahead - (frames_written - frames_read); -out: + //cout << "MDS read for midi_readahead " << to_read << " rb_contains: " + // << frames_written - frames_read << endl; + to_read = min(to_read, (max_frames - file_frame)); + + if (read (file_frame, to_read, reversed)) { + ret = -1; + } + return ret; } @@ -891,24 +1029,23 @@ out: * written at all unless @a force_flush is true. */ int -MidiDiskstream::do_flush (Session::RunContext context, bool force_flush) +MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush) { uint32_t to_write; int32_t ret = 0; - // FIXME: I'd be lying if I said I knew what this thing was - //RingBufferNPT::rw_vector transvec; nframes_t total; _write_data_count = 0; + total = _session.transport_frame() - _last_flush_frame; + if (_last_flush_frame > _session.transport_frame() || _last_flush_frame < capture_start_frame) { _last_flush_frame = _session.transport_frame(); } - total = _session.transport_frame() - _last_flush_frame; - - if (total == 0 || _capture_buf->read_space() == 0 && _session.transport_speed() == 0 || (total < disk_io_chunk_frames && !force_flush && was_recording)) { + if (total == 0 || _capture_buf->read_space() == 0 + || (!force_flush && (total < disk_io_chunk_frames && was_recording))) { goto out; } @@ -927,13 +1064,14 @@ MidiDiskstream::do_flush (Session::RunContext context, bool force_flush) ret = 1; } - //to_write = min (disk_io_chunk_frames, (nframes_t) vector.len[0]); to_write = disk_io_chunk_frames; assert(!destructive()); - if (record_enabled() && _session.transport_frame() - _last_flush_frame > disk_io_chunk_frames) { - if ((!_write_source) || _write_source->midi_write (*_capture_buf, to_write) != to_write) { + 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; return -1; } else { @@ -942,12 +1080,11 @@ MidiDiskstream::do_flush (Session::RunContext context, bool force_flush) } out: - //return ret; - return 0; // FIXME: everything's fine! always! honest! + return ret; } void -MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_capture) +MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool abort_capture) { uint32_t buffer_position; bool more_work = true; @@ -966,7 +1103,7 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap */ while (more_work && !err) { - switch (do_flush (Session::TransportContext, true)) { + switch (do_flush (TransportContext, true)) { case 0: more_work = false; break; @@ -1020,9 +1157,9 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap */ try { - boost::shared_ptr rx (RegionFactory::create (srcs, _write_source->last_capture_start_frame(), total_capture, - whole_file_region_name, - 0, Region::Flag (Region::DefaultFlags|Region::Automatic|Region::WholeFile))); + boost::shared_ptr rx (RegionFactory::create (srcs, 0, + total_capture, whole_file_region_name, 0, + Region::Flag (Region::DefaultFlags|Region::Automatic|Region::WholeFile))); region = boost::dynamic_pointer_cast (rx); region->special_set_position (capture_info.front()->start); @@ -1041,7 +1178,7 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap XMLNode &before = _playlist->get_state(); _playlist->freeze (); - for (buffer_position = _write_source->last_capture_start_frame(), ci = capture_info.begin(); ci != capture_info.end(); ++ci) { + for (buffer_position = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) { string region_name; @@ -1120,7 +1257,7 @@ MidiDiskstream::transport_looped (nframes_t transport_frame) } void -MidiDiskstream::finish_capture (bool rec_monitors_input) +MidiDiskstream::finish_capture (bool /*rec_monitors_input*/) { was_recording = false; @@ -1190,7 +1327,7 @@ MidiDiskstream::engage_record_enable () g_atomic_int_set (&_record_enabled, 1); if (_source_port && Config->get_monitoring_model() == HardwareMonitoring) { - _source_port->request_monitor_input (!(Config->get_auto_input() && rolling)); + _source_port->request_monitor_input (!(_session.config.get_auto_input() && rolling)); } // FIXME: Why is this necessary? Isn't needed for AudioDiskstream... @@ -1225,6 +1362,11 @@ MidiDiskstream::get_state () snprintf (buf, sizeof(buf), "0x%x", _flags); node->add_property ("flags", buf); + 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); @@ -1247,8 +1389,8 @@ MidiDiskstream::get_state () Location* pi; - if (Config->get_punch_in() && ((pi = _session.locations()->auto_punch_location()) != 0)) { - snprintf (buf, sizeof (buf), "%" PRIu32, pi->start()); + 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()); } @@ -1303,6 +1445,21 @@ MidiDiskstream::set_state (const XMLNode& node) _flags = Flag (string_2_enum (prop->value(), _flags)); } + ChannelMode channel_mode = AllChannels; + if ((prop = node.property ("channel-mode")) != 0) { + channel_mode = ChannelMode (string_2_enum(prop->value(), channel_mode)); + } + + unsigned int channel_mask = 0xFFFF; + if ((prop = node.property ("channel-mask")) != 0) { + sscanf (prop->value().c_str(), "0x%x", &channel_mask); + if (channel_mask & (~0xFFFF)) { + warning << _("MidiDiskstream: XML property channel-mask out of range") << endmsg; + } + } + + set_channel_mode(channel_mode, channel_mask); + if ((prop = node.property ("channels")) != 0) { nchans = atoi (prop->value().c_str()); } @@ -1390,7 +1547,7 @@ MidiDiskstream::use_new_write_source (uint32_t n) } void -MidiDiskstream::reset_write_sources (bool mark_write_complete, bool force) +MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/) { if (!recordable()) { return; @@ -1418,7 +1575,7 @@ MidiDiskstream::rename_write_sources () } void -MidiDiskstream::set_block_size (nframes_t nframes) +MidiDiskstream::set_block_size (nframes_t /*nframes*/) { } @@ -1431,9 +1588,7 @@ void MidiDiskstream::monitor_input (bool yn) { if (_source_port) - _source_port->request_monitor_input (yn); - else - cerr << "MidiDiskstream NO SOURCE PORT TO MONITOR\n"; + _source_port->ensure_monitor_input (yn); } void @@ -1473,9 +1628,8 @@ MidiDiskstream::capture_buffer_load () const (double) _capture_buf->capacity()); } - int -MidiDiskstream::use_pending_capture_data (XMLNode& node) +MidiDiskstream::use_pending_capture_data (XMLNode& /*node*/) { return 0; } @@ -1484,7 +1638,7 @@ MidiDiskstream::use_pending_capture_data (XMLNode& node) * so that an event at \a start has time = 0 */ void -MidiDiskstream::get_playback(MidiBuffer& dst, nframes_t start, nframes_t end) +MidiDiskstream::get_playback (MidiBuffer& dst, nframes_t start, nframes_t end) { dst.clear(); assert(dst.size() == 0); @@ -1495,5 +1649,17 @@ MidiDiskstream::get_playback(MidiBuffer& dst, nframes_t start, nframes_t end) } // Translates stamps to be relative to start + _playback_buf->read(dst, start, end); +#if 0 + 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; +#endif + + gint32 frames_read = end - start; + g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read); } +