X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_diskstream.cc;h=18d3bc5ce30681fe5d7df762a970b7247f3d2601;hb=535d60237486e2227d22e5febbcfbf868abb11e3;hp=4acbb63f379869be93bf521b10aec67410c59ad3;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 4acbb63f37..18d3bc5ce3 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2003 Paul Davis + Copyright (C) 2000-2003 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,8 +38,10 @@ #include "ardour/ardour.h" #include "ardour/audioengine.h" +#include "ardour/butler.h" #include "ardour/configuration.h" #include "ardour/cycle_timer.h" +#include "ardour/debug.h" #include "ardour/io.h" #include "ardour/midi_diskstream.h" #include "ardour/midi_playlist.h" @@ -51,6 +53,9 @@ #include "ardour/session.h" #include "ardour/smf_source.h" #include "ardour/utils.h" +#include "ardour/session_playlists.h" + +#include "midi++/types.h" #include "i18n.h" #include @@ -82,7 +87,7 @@ MidiDiskstream::MidiDiskstream (Session &sess, const string &name, Diskstream::F assert(!destructive()); } - + MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node) : Diskstream(sess, node) , _playback_buf(0) @@ -96,7 +101,7 @@ MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node) in_set_state = true; init (Recordable); - if (set_state (node)) { + if (set_state (node, Stateful::loading_state_version)) { in_set_state = false; throw failed_constructor(); } @@ -121,10 +126,10 @@ MidiDiskstream::init (Diskstream::Flag f) set_block_size (_session.get_block_size()); allocate_temporary_buffers (); - const size_t size = _session.midi_diskstream_buffer_size(); + const size_t size = _session.butler()->midi_diskstream_buffer_size(); _playback_buf = new MidiRingBuffer(size); _capture_buf = new MidiRingBuffer(size); - + _n_channels = ChanCount(DataType::MIDI, 1); assert(recordable()); @@ -135,12 +140,13 @@ MidiDiskstream::~MidiDiskstream () Glib::Mutex::Lock lm (state_lock); } - + void MidiDiskstream::non_realtime_locate (nframes_t position) { - assert(_write_source); - _write_source->set_timeline_position (position); + if (_write_source) { + _write_source->set_timeline_position (position); + } seek(position, false); } @@ -148,7 +154,7 @@ MidiDiskstream::non_realtime_locate (nframes_t position) void MidiDiskstream::non_realtime_input_change () { - { + { Glib::Mutex::Lock lm (state_lock); if (input_change_pending == NoChange) { @@ -156,8 +162,11 @@ 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 (); set_capture_offset (); @@ -170,7 +179,7 @@ MidiDiskstream::non_realtime_input_change () } input_change_pending = NoChange; - + /* implicit unlock */ } @@ -193,7 +202,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; @@ -202,17 +211,17 @@ 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? -} +} int MidiDiskstream::find_and_use_playlist (const string& name) { boost::shared_ptr playlist; - - if ((playlist = boost::dynamic_pointer_cast (_session.playlist_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)); } @@ -226,7 +235,7 @@ MidiDiskstream::find_and_use_playlist (const string& name) int MidiDiskstream::use_playlist (boost::shared_ptr playlist) -{ +{ assert(boost::dynamic_pointer_cast(playlist)); Diskstream::use_playlist(playlist); @@ -236,7 +245,7 @@ MidiDiskstream::use_playlist (boost::shared_ptr playlist) int MidiDiskstream::use_new_playlist () -{ +{ string newname; boost::shared_ptr playlist; @@ -252,11 +261,11 @@ 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 { + } else { return -1; } } @@ -279,11 +288,11 @@ MidiDiskstream::use_copy_playlist () boost::shared_ptr 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 { + } else { return -1; } } @@ -297,7 +306,7 @@ MidiDiskstream::set_destructive (bool yn) assert( ! yn); return -1; } - + void MidiDiskstream::set_note_mode (NoteMode m) { @@ -307,124 +316,183 @@ MidiDiskstream::set_note_mode (NoteMode m) _write_source->model()->set_note_mode(m); } -void -MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record) +#if 0 +static void +trace_midi (ostream& o, MIDI::byte *msg, size_t len) { - // FIXME: waaay too much code to duplicate (AudioDiskstream) - - int possibly_recording; - int rolling; - int change; - const int transport_rolling = 0x4; - const int track_rec_enabled = 0x2; - const int global_rec_enabled = 0x1; - - /* merge together the 3 factors that affect record status, and compute - what has changed. - */ - - rolling = _session.transport_speed() != 0.0f; - possibly_recording = (rolling << 2) | (record_enabled() << 1) | can_record; - change = possibly_recording ^ last_possibly_recording; - - if (possibly_recording == last_possibly_recording) { - return; - } - - /* change state */ - - /* 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)) || - ((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) { - - /* starting to record: compute first+last frames */ - - first_recordable_frame = transport_frame + _capture_offset; - last_recordable_frame = max_frames; - capture_start_frame = transport_frame; - - if (!(last_possibly_recording & transport_rolling) && (possibly_recording & transport_rolling)) { - - /* was stopped, now rolling (and recording) */ - - if (_alignment_style == ExistingMaterial) { - first_recordable_frame += _session.worst_output_latency(); - } else { - first_recordable_frame += _roll_delay; - } - + 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; - /* was rolling, but record state changed */ - - if (_alignment_style == ExistingMaterial) { - - - if (!Config->get_punch_in()) { + } + break; - /* manual punch in happens at the correct transport frame - because the user hit a button. but to get alignment correct - we have to back up the position of the new region to the - appropriate spot given the roll delay. - */ + case MIDI::song: + o << trace_prefix << "Song" << endl; + break; - capture_start_frame -= _roll_delay; + case MIDI::tune: + o << trace_prefix << "Tune" << endl; + break; - /* XXX paul notes (august 2005): i don't know why - this is needed. - */ + case MIDI::eox: + o << trace_prefix << "End-of-System Exclusive" << endl; + break; - first_recordable_frame += _capture_offset; + case MIDI::timing: + o << trace_prefix << "Timing" << endl; + break; - } else { + case MIDI::start: + o << trace_prefix << "Start" << endl; + break; - /* autopunch toggles recording at the precise - transport frame, and then the DS waits - to start recording for a time that depends - on the output latency. - */ + case MIDI::stop: + o << trace_prefix << "Stop" << endl; + break; - first_recordable_frame += _session.worst_output_latency(); - } + case MIDI::contineu: + o << trace_prefix << "Continue" << endl; + break; - } else { + case active: + o << trace_prefix << "Active Sense" << endl; + break; - if (Config->get_punch_in()) { - first_recordable_frame += _roll_delay; - } else { - capture_start_frame -= _roll_delay; - } - } - - } - - } else if (!record_enabled() || !can_record) { - - /* stop recording */ - - last_recordable_frame = transport_frame + _capture_offset; - - if (_alignment_style == ExistingMaterial) { - last_recordable_frame += _session.worst_output_latency(); - } else { - last_recordable_frame += _roll_delay; - } + default: + o << trace_prefix << "Unrecognized MIDI message" << endl; + break; } - - last_possibly_recording = possibly_recording; } +#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; nframes_t rec_offset = 0; nframes_t rec_nframes = 0; bool nominally_recording; bool re = record_enabled (); - bool collect_playback = false; /* if we've already processed the frames corresponding to this call, just return. this allows multiple routes that are taking input @@ -437,7 +505,7 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t if (_processed) { return 0; } - + commit_should_unlock = false; check_record_status (transport_frame, nframes, can_record); @@ -461,50 +529,10 @@ 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())) { - OverlapType ot; - - ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes); - - switch (ot) { - case OverlapNone: - rec_nframes = 0; - break; - - case OverlapInternal: - /* ---------- recrange - |---| transrange - */ - rec_nframes = nframes; - rec_offset = 0; - break; + if (nominally_recording || (_session.get_record_enabled() && _session.config.get_punch_in())) { + OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes); - case OverlapStart: - /* |--------| recrange - -----| transrange - */ - rec_nframes = transport_frame + nframes - first_recordable_frame; - if (rec_nframes) { - rec_offset = first_recordable_frame - transport_frame; - } - break; - - case OverlapEnd: - /* |--------| recrange - |-------- transrange - */ - rec_nframes = last_recordable_frame - transport_frame; - rec_offset = 0; - break; - - case OverlapExternal: - /* |--------| recrange - -------------- transrange - */ - rec_nframes = last_recordable_frame - last_recordable_frame; - rec_offset = first_recordable_frame - transport_frame; - break; - } + calculate_record_range(ot, transport_frame, nframes, rec_nframes, rec_offset); if (rec_nframes && !was_recording) { capture_captured = 0; @@ -520,13 +548,13 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t if (nominally_recording || rec_nframes) { // Pump entire port buffer into the ring buffer (FIXME: split cycles?) - MidiBuffer& buf = _source_port->get_midi_buffer(nframes, offset); + 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 { if (was_recording) { @@ -537,49 +565,22 @@ 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; } else if (nominally_recording) { - /* can't do actual capture yet - waiting for latency effects to finish before we start*/ + /* XXXX do this for MIDI !!! + can't do actual capture yet - waiting for latency effects to finish before we start + */ playback_distance = nframes; - } else { - - collect_playback = true; - } - - if (collect_playback) { - - /* we're doing playback */ - - nframes_t necessary_samples; - - /* no varispeed playback if we're recording, because the output .... TBD */ - - if (rec_nframes == 0 && _actual_speed != 1.0f) { - necessary_samples = (nframes_t) floor ((nframes * fabs (_actual_speed))) + 1; - } else { - 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; - } ret = 0; @@ -594,7 +595,7 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t commit_should_unlock = false; state_lock.unlock(); - } + } return ret; } @@ -615,21 +616,16 @@ MidiDiskstream::commit (nframes_t nframes) adjust_capture_position = 0; } - /* what audio does: - * can't do this with midi: write space is in bytes, chunk_frames is in frames - 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; - }*/ - - // Use The Counters To calculate how much time the Ringbuffer holds. 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_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(); } @@ -643,9 +639,9 @@ void 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; } @@ -664,7 +660,7 @@ MidiDiskstream::seek (nframes_t frame, bool complete_refill) { Glib::Mutex::Lock lm (state_lock); int ret = -1; - + _playback_buf->reset(); _capture_buf->reset(); g_atomic_int_set(&_frames_read_from_ringbuffer, 0); @@ -685,20 +681,14 @@ MidiDiskstream::seek (nframes_t frame, bool complete_refill) int MidiDiskstream::can_internal_playback_seek (nframes_t distance) { - uint32_t frames_read = g_atomic_int_get(&_frames_read_from_ringbuffer); + 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) < distance) { - return false; - } else { - return true; - } + return ((frames_written - frames_read) < distance); } int MidiDiskstream::internal_playback_seek (nframes_t distance) { - cerr << "MDS: internal_playback_seek " << distance << endl; - first_recordable_frame += distance; playback_sample += distance; @@ -708,7 +698,7 @@ 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) -{ +{ nframes_t this_read = 0; bool reloop = false; nframes_t loop_end = 0; @@ -718,23 +708,23 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) if (!reversed) { /* Make the use of a Location atomic for this read operation. - + Note: Locations don't get deleted, so all we care about when I say "atomic" is that we are always pointing to the same one and using a start/length values obtained just once. */ - + if ((loc = loop_location) != 0) { loop_start = loc->start(); loop_end = loc->end(); loop_length = loop_end - loop_start; } - + /* if we are looping, ensure that the first frame we read is at the correct position within the loop. */ - + if (loc && (start >= loop_end)) { //cerr << "start adjusted from " << start; start = loop_start + ((start - loop_start) % loop_length); @@ -763,37 +753,38 @@ 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 << "this write " << 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 { - + /* 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; + cout << "Pushing LoopEvent ts=" << loop_end-1 + << " start+this_read " << start+this_read << endl; start = loop_start; } else { start += this_read; } - } + } dur -= this_read; //offset += this_read; @@ -818,7 +809,7 @@ MidiDiskstream::do_refill () if (write_space == 0) { return 0; } - + if (reversed) { return 0; } @@ -836,21 +827,22 @@ MidiDiskstream::do_refill () // 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 << "Nothing to do. all fine" << endl; + 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); - //cout << "read for midi_readahead " << to_read << " rb_contains: " << frames_written-frames_read << endl; + //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; } @@ -860,12 +852,12 @@ MidiDiskstream::do_refill () * of data to disk. it will never write more than that. If it writes that * much and there is more than that waiting to be written, it will return 1, * otherwise 0 on success or -1 on failure. - * + * * If there is less than disk_io_chunk_frames to be written, no data will be * written at all unless @a force_flush is true. */ int -MidiDiskstream::do_flush (RunContext context, bool force_flush) +MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush) { uint32_t to_write; int32_t ret = 0; @@ -874,7 +866,7 @@ MidiDiskstream::do_flush (RunContext context, bool force_flush) _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(); @@ -898,7 +890,7 @@ MidiDiskstream::do_flush (RunContext context, bool force_flush) if (total >= 2 * disk_io_chunk_frames || ((force_flush || !was_recording) && total > disk_io_chunk_frames)) { ret = 1; - } + } to_write = disk_io_chunk_frames; @@ -920,7 +912,7 @@ out: } 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; @@ -934,7 +926,7 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap finish_capture (true); - /* butler is already stopped, but there may be work to do + /* butler is already stopped, but there may be work to do to flush remaining data to disk. */ @@ -978,7 +970,7 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap } /* figure out the name for this take */ - + srcs.push_back (_write_source); _write_source->set_timeline_position (capture_info.front()->start); _write_source->set_captured_for (_name); @@ -1031,8 +1023,8 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap error << _("MidiDiskstream: could not create region for captured midi!") << endmsg; continue; /* XXX is this OK? */ } - - region->GoingAway.connect (bind (mem_fun (*this, &Diskstream::remove_region_from_last_capture), boost::weak_ptr(region))); + + region->DropReferences.connect_same_thread (*this, boost::bind (&Diskstream::remove_region_from_last_capture, this, boost::weak_ptr(region))); _last_capture_regions.push_back (region); @@ -1059,6 +1051,10 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap delete *ci; } + if (_playlist) { + midi_playlist()->clear_note_trackers (); + } + capture_info.clear (); capture_start_frame = 0; } @@ -1093,10 +1089,10 @@ 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; - + if (capture_captured == 0) { return; } @@ -1105,12 +1101,12 @@ MidiDiskstream::finish_capture (bool rec_monitors_input) assert(!destructive()); CaptureInfo* ci = new CaptureInfo; - + ci->start = capture_start_frame; ci->frames = capture_captured; - - /* XXX theoretical race condition here. Need atomic exchange ? - However, the circumstances when this is called right + + /* XXX theoretical race condition here. Need atomic exchange ? + However, the circumstances when this is called right now (either on record-disable or transport_stopped) mean that no actual race exists. I think ... We now have a capture_info_lock, but it is only to be used @@ -1132,15 +1128,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. @@ -1161,9 +1148,9 @@ MidiDiskstream::engage_record_enable () bool 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 (!(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... @@ -1199,12 +1186,12 @@ MidiDiskstream::get_state () 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); node->add_property ("speed", buf); @@ -1225,10 +1212,10 @@ 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()); + snprintf (buf, sizeof (buf), "%" PRId64, _session.transport_frame()); } cs_child->add_property (X_("at"), buf); @@ -1243,7 +1230,7 @@ MidiDiskstream::get_state () } int -MidiDiskstream::set_state (const XMLNode& node) +MidiDiskstream::set_state (const XMLNode& node, int /*version*/) { const XMLProperty* prop; XMLNodeList nlist = node.children(); @@ -1254,24 +1241,24 @@ MidiDiskstream::set_state (const XMLNode& node) in_set_state = true; - for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - /*if ((*niter)->name() == IO::state_node_name) { + 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); + }*/ + assert ((*niter)->name() != IO::state_node_name); if ((*niter)->name() == X_("CapturingSources")) { capture_pending_node = *niter; } - } + } /* 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 (); @@ -1285,7 +1272,7 @@ MidiDiskstream::set_state (const XMLNode& node) 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); @@ -1295,18 +1282,18 @@ MidiDiskstream::set_state (const XMLNode& node) } set_channel_mode(channel_mode, channel_mask); - + if ((prop = node.property ("channels")) != 0) { nchans = atoi (prop->value().c_str()); } - + if ((prop = node.property ("playlist")) == 0) { return -1; } { bool had_playlist = (_playlist != 0); - + if (find_and_use_playlist (prop->value())) { return -1; } @@ -1314,7 +1301,7 @@ MidiDiskstream::set_state (const XMLNode& node) if (!had_playlist) { _playlist->set_orig_diskstream_id (_id); } - + if (capture_pending_node) { use_pending_capture_data (*capture_pending_node); } @@ -1336,10 +1323,10 @@ MidiDiskstream::set_state (const XMLNode& node) // FIXME? //_capturing_source = 0; - /* write sources are handled when we handle the input set + /* write sources are handled when we handle the input set up of the IO that owns this DS (::non_realtime_input_change()) */ - + in_set_state = false; return 0; @@ -1369,7 +1356,7 @@ MidiDiskstream::use_new_write_source (uint32_t n) if (!_write_source) { throw failed_constructor(); } - } + } catch (failed_constructor &err) { error << string_compose (_("%1:%2 new capture file not initialized correctly"), _name, n) << endmsg; @@ -1378,14 +1365,15 @@ MidiDiskstream::use_new_write_source (uint32_t n) } _write_source->set_allow_remove_if_empty (true); + _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame()); return 0; } void -MidiDiskstream::reset_write_sources (bool mark_write_complete, bool force) +MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/) { - if (!recordable()) { + if (!_session.writable() || !recordable()) { return; } @@ -1394,10 +1382,6 @@ MidiDiskstream::reset_write_sources (bool mark_write_complete, bool force) } use_new_write_source (0); - - if (record_enabled()) { - //_capturing_sources.push_back (_write_source); - } } int @@ -1411,7 +1395,7 @@ MidiDiskstream::rename_write_sources () } void -MidiDiskstream::set_block_size (nframes_t nframes) +MidiDiskstream::set_block_size (nframes_t /*nframes*/) { } @@ -1424,9 +1408,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 @@ -1439,7 +1421,7 @@ MidiDiskstream::set_align_style_from_io () } get_input_sources (); - + if (_source_port && _source_port->flags() & JackPortIsPhysical) { have_physical = true; } @@ -1467,7 +1449,7 @@ MidiDiskstream::capture_buffer_load () const } int -MidiDiskstream::use_pending_capture_data (XMLNode& node) +MidiDiskstream::use_pending_capture_data (XMLNode& /*node*/) { return 0; } @@ -1476,39 +1458,28 @@ 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, nframes_t offset) +MidiDiskstream::get_playback (MidiBuffer& dst, nframes_t start, nframes_t end) { - if (offset == 0) { - dst.clear(); - assert(dst.size() == 0); - } - + dst.clear(); + assert(dst.size() == 0); + // Reverse. ... We just don't do reverse, ok? Back off. if (end <= start) { return; } - // Check only events added this offset cycle - MidiBuffer::iterator this_cycle_start = dst.end(); - - // Translates stamps to be relative to start, but add offset. - #if 1 - _playback_buf->read(dst, start, end, offset); - #else - const size_t events_read = _playback_buf->read(dst, start, end, offset); - cout << "frames read = " << frames_read << " events read = " << events_read - << " end = " << end << " start = " << start << " offset = " << offset - << " readspace " << _playback_buf->read_space() - << " writespace " << _playback_buf->write_space() << endl; - #endif - + // 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())); +#else + _playback_buf->read(dst, start, end); +#endif + gint32 frames_read = end - start; g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read); - - // Feed the data through the MidiStateTracker - // If it detects a LoopEvent it will add necessary note offs - if (_midi_state_tracker.track(this_cycle_start, dst.end())) { - _midi_state_tracker.resolve_notes(dst, end-start - 1 + offset); - } }