X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fmidi_diskstream.cc;h=8db5a277db7dfcd78fb4bffd006425e7d27e554e;hb=56469c195640b561119852fd6d27a4b56e5af7e2;hp=74acae522ac0e5fa65c312c37faef5e68c8d2883;hpb=633d9131af0a04bed812ce75e9f1da07fe7dfcd4;p=ardour.git diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 74acae522a..8db5a277db 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 @@ -29,26 +29,35 @@ #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 "pbd/stateful_diff_command.h" + +#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" +#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 "ardour/session_playlists.h" +#include "ardour/route.h" + +#include "midi++/types.h" #include "i18n.h" #include @@ -57,48 +66,44 @@ 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 */ in_set_state = true; - init(flag); + init (); use_new_playlist (); in_set_state = false; assert(!destructive()); } - + 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); + init (); - if (set_state (node)) { + if (set_state (node, Stateful::loading_state_version)) { in_set_state = false; throw failed_constructor(); } @@ -111,10 +116,8 @@ MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node) } 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. @@ -123,10 +126,10 @@ 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.butler()->midi_diskstream_buffer_size(); + _playback_buf = new MidiRingBuffer(size); + _capture_buf = new MidiRingBuffer(size); + _n_channels = ChanCount(DataType::MIDI, 1); assert(recordable()); @@ -137,10 +140,21 @@ MidiDiskstream::~MidiDiskstream () Glib::Mutex::Lock lm (state_lock); } + +void +MidiDiskstream::non_realtime_locate (nframes_t position) +{ + if (_write_source) { + _write_source->set_timeline_position (position); + } + seek(position, false); +} + + void MidiDiskstream::non_realtime_input_change () { - { + { Glib::Mutex::Lock lm (state_lock); if (input_change_pending == NoChange) { @@ -148,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 (); @@ -162,7 +179,7 @@ MidiDiskstream::non_realtime_input_change () } input_change_pending = NoChange; - + /* implicit unlock */ } @@ -185,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; @@ -194,35 +211,17 @@ MidiDiskstream::get_input_sources () // This is all we do for now at least assert(ni == 1); - _source_port = _io->midi_input(0); - - /* I don't get it.... - const char **connections = _io->input(0)->get_connections (); - - if (connections == 0 || connections[0] == 0) { - - if (_source_port) { - // _source_port->disable_metering (); - } - - _source_port = 0; + _source_port = _io->midi(0); - } else { - _source_port = dynamic_cast( - _session.engine().get_port_by_name (connections[0]) ); - } - - if (connections) { - free (connections); - }*/ -} + // 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)); } @@ -236,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); @@ -246,7 +245,7 @@ MidiDiskstream::use_playlist (boost::shared_ptr playlist) int MidiDiskstream::use_new_playlist () -{ +{ string newname; boost::shared_ptr playlist; @@ -262,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; } } @@ -289,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; } } @@ -307,7 +306,7 @@ MidiDiskstream::set_destructive (bool yn) assert( ! yn); return -1; } - + void MidiDiskstream::set_note_mode (NoteMode m) { @@ -317,219 +316,206 @@ 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 PropertyChange 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()) { - - /* 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. - */ + } + break; - capture_start_frame -= _roll_delay; + case MIDI::song: + o << trace_prefix << "Song" << endl; + break; - /* XXX paul notes (august 2005): i don't know why - this is needed. - */ + case MIDI::tune: + o << trace_prefix << "Tune" << endl; + break; - first_recordable_frame += _capture_offset; + case MIDI::eox: + o << trace_prefix << "End-of-System Exclusive" << endl; + break; - } else { + case MIDI::timing: + o << trace_prefix << "Timing" << 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::start: + o << trace_prefix << "Start" << endl; + break; - first_recordable_frame += _session.worst_output_latency(); - } + case MIDI::stop: + o << trace_prefix << "Stop" << endl; + break; - } else { + case MIDI::contineu: + o << trace_prefix << "Continue" << endl; + break; - if (Config->get_punch_in()) { - first_recordable_frame += _roll_delay; - } else { - capture_start_frame -= _roll_delay; - } - } - - } - - if (_flags & Recordable) { - RingBufferNPT::rw_vector transvec; - _capture_transition_buf->get_write_vector(&transvec); + case active: + o << trace_prefix << "Active Sense" << endl; + break; - 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 */ - - 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, bool& need_butler) { - // 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 - 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. - */ - if (_processed) { - return 0; - } - - commit_should_unlock = false; + playback_distance = 0; check_record_status (transport_frame, nframes, can_record); nominally_recording = (can_record && re); if (nframes == 0) { - _processed = true; return 0; } - /* This lock is held until the end of AudioDiskstream::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. - */ + Glib::Mutex::Lock sm (state_lock, Glib::TRY_LOCK); - // If we can't take the state lock return. - if (!state_lock.trylock()) { + if (!sm.locked()) { return 1; } - 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; - - case OverlapStart: - /* |--------| recrange - -----| transrange - */ - rec_nframes = transport_frame + nframes - first_recordable_frame; - if (rec_nframes) { - rec_offset = first_recordable_frame - transport_frame; - } - break; + adjust_capture_position = 0; - case OverlapEnd: - /* |--------| recrange - |-------- transrange - */ - rec_nframes = last_recordable_frame - transport_frame; - 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 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; @@ -544,21 +530,14 @@ 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 { if (was_recording) { @@ -569,64 +548,29 @@ 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; - _processed = true; - - if (ret) { - - /* we're exiting with failure, so ::commit will not - be called. unlock the state lock. - */ - - commit_should_unlock = false; - state_lock.unlock(); - } + if (commit (nframes)) { + need_butler = true; + } return ret; } @@ -647,18 +591,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; - } - - if (commit_should_unlock) { - state_lock.unlock(); + 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; } - _processed = false; + /*cerr << "MDS written: " << frames_written << " - read: " << frames_read << + " = " << frames_written - frames_read + << " + " << nframes << " < " << midi_readahead << " = " << need_butler << ")" << endl;*/ return need_butler; } @@ -667,16 +608,19 @@ 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; + + _pending_overwrite = yn; overwrite_frame = playback_sample; - //overwrite_offset = channels.front().playback_buf->get_read_ptr(); } int MidiDiskstream::overwrite_existing_buffers () { + //read(overwrite_frame, disk_io_chunk_frames, false); + overwrite_queued = false; + _pending_overwrite = false; + return 0; } @@ -688,6 +632,8 @@ MidiDiskstream::seek (nframes_t frame, bool complete_refill) _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; @@ -704,11 +650,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 @@ -723,34 +667,36 @@ 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; nframes_t loop_start = 0; - nframes_t loop_length = 0; Location *loc = 0; if (!reversed) { + + nframes_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 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) { + + if (loc && (start >= loop_end)) { //cerr << "start adjusted from " << start; start = loop_start + ((start - loop_start) % loop_length); //cerr << "to " << start << endl; @@ -778,29 +724,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; } + 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; + start = loop_start; } else { start += this_read; } - } + } dur -= this_read; //offset += this_read; @@ -818,95 +773,47 @@ 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 there are 2+ chunks of disk i/o possible for - this track, let the caller know so that it can arrange - for us to be called again, ASAP. - */ - - // FIXME: using disk_io_chunk_frames as an event count, not good - // count vs duration semantic differences are nonexistant for audio, - // which makes translating for MIDI code confusing... - if (_playback_buf->write_space() >= (_slaved?3:2) * disk_io_chunk_frames) { - ret = 1; - } - - /* 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; } -#if 0 - // or this - if (file_frame > max_frames - total_space) { + // At this point we... + assert(_playback_buf->write_space() > 0); // ... have something to write to, and + assert(file_frame <= max_frames); // ... something to write - /* to close to the end: read what we can, and zero fill the rest */ + // 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; + } - zero_fill = total_space - (max_frames - file_frame); - total_space = max_frames - file_frame; + nframes_t to_read = midi_readahead - (frames_written - frames_read); - } else { - zero_fill = 0; - } -#endif + //cout << "MDS read for midi_readahead " << to_read << " rb_contains: " + // << frames_written - frames_read << endl; - // At this point we: - assert(_playback_buf->write_space() > 0); // ... have something to write to, and - assert(file_frame <= max_frames); // ... something to write + to_read = min(to_read, (max_frames - file_frame)); - // So (read it, then) write it: - - 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)) { + if (read (file_frame, to_read, reversed)) { ret = -1; - goto out; } - file_frame = file_frame_tmp; - -out: - return ret; } @@ -916,29 +823,28 @@ out: * 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 (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; } @@ -955,15 +861,16 @@ MidiDiskstream::do_flush (Session::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 = 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->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 { @@ -972,18 +879,15 @@ 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_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; @@ -991,12 +895,12 @@ 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. */ while (more_work && !err) { - switch (do_flush (Session::TransportContext, true)) { + switch (do_flush (TransportContext, true)) { case 0: more_work = false; break; @@ -1020,7 +924,6 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap if (_write_source) { _write_source->mark_for_remove (); - _write_source->drop_references (); _write_source.reset(); } @@ -1030,14 +933,15 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap assert(_write_source); - for (total_capture = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) { + nframes_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 */ - + srcs.push_back (_write_source); - _write_source->update_header (capture_info.front()->start, when, twhen); + _write_source->set_timeline_position (capture_info.front()->start); _write_source->set_captured_for (_name); string whole_file_region_name; @@ -1050,9 +954,16 @@ 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))); + PropertyList plist; + + 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); + + boost::shared_ptr rx (RegionFactory::create (srcs, plist)); region = boost::dynamic_pointer_cast (rx); region->special_set_position (capture_info.front()->start); @@ -1068,19 +979,26 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap // cerr << _name << ": there are " << capture_info.size() << " capture_info records\n"; - XMLNode &before = _playlist->get_state(); + _playlist->clear_history (); _playlist->freeze (); - for (buffer_position = _write_source->last_capture_start_frame(), ci = capture_info.begin(); ci != capture_info.end(); ++ci) { + uint32_t buffer_position = 0; + for (buffer_position = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) { string region_name; - _session.region_name (region_name, _write_source->name(), false); + RegionFactory::region_name (region_name, _write_source->name(), false); // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n"; try { - boost::shared_ptr rx (RegionFactory::create (srcs, buffer_position, (*ci)->frames, region_name)); + PropertyList plist; + + plist.add (Properties::start, buffer_position); + plist.add (Properties::length, (*ci)->frames); + plist.add (Properties::name, region_name); + + boost::shared_ptr rx (RegionFactory::create (srcs, plist)); region = boost::dynamic_pointer_cast (rx); } @@ -1088,8 +1006,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); @@ -1103,8 +1021,7 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap } _playlist->thaw (); - XMLNode &after = _playlist->get_state(); - _session.add_command (new MementoCommand(*_playlist, &before, &after)); + _session.add_command (new StatefulDiffCommand(_playlist)); } @@ -1116,6 +1033,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; } @@ -1150,10 +1071,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; } @@ -1162,12 +1083,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 @@ -1189,15 +1110,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. @@ -1218,12 +1130,16 @@ 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)); } - _write_source->mark_streaming_midi_write_started (_note_mode); + // 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 */ } @@ -1244,15 +1160,20 @@ MidiDiskstream::disengage_record_enable () XMLNode& MidiDiskstream::get_state () { - XMLNode* node = new XMLNode ("MidiDiskstream"); + XMLNode* node = new XMLNode ("Diskstream"); 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())); + + 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); @@ -1273,10 +1194,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); @@ -1291,35 +1212,34 @@ 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(); XMLNodeIterator niter; - uint32_t nchans = 1; XMLNode* capture_pending_node = 0; LocaleGuard lg (X_("POSIX")); 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 (); @@ -1329,25 +1249,36 @@ MidiDiskstream::set_state (const XMLNode& node) _flags = Flag (string_2_enum (prop->value(), _flags)); } - if ((prop = node.property ("channels")) != 0) { - nchans = atoi (prop->value().c_str()); + 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 ("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); + _playlist->set_orig_diskstream_id (id()); } - + if (capture_pending_node) { use_pending_capture_data (*capture_pending_node); } @@ -1369,10 +1300,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; @@ -1389,8 +1320,9 @@ MidiDiskstream::use_new_write_source (uint32_t n) if (_write_source) { - if (SMFSource::is_empty (_write_source->path())) { + if (_write_source->is_empty ()) { _write_source->mark_for_remove (); + _write_source->drop_references (); _write_source.reset(); } else { _write_source.reset(); @@ -1398,11 +1330,11 @@ MidiDiskstream::use_new_write_source (uint32_t n) } 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 (name ())); if (!_write_source) { throw failed_constructor(); } - } + } catch (failed_constructor &err) { error << string_compose (_("%1:%2 new capture file not initialized correctly"), _name, n) << endmsg; @@ -1411,39 +1343,37 @@ 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; } if (_write_source && mark_write_complete) { _write_source->mark_streaming_write_completed (); } + use_new_write_source (0); - - if (record_enabled()) { - //_capturing_sources.push_back (_write_source); - } } int MidiDiskstream::rename_write_sources () { if (_write_source != 0) { - _write_source->set_source_name (_name, destructive()); + _write_source->set_source_name (_name.val(), destructive()); /* XXX what to do if this fails ? */ } return 0; } void -MidiDiskstream::set_block_size (nframes_t nframes) +MidiDiskstream::set_block_size (nframes_t /*nframes*/) { } @@ -1456,9 +1386,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 @@ -1471,7 +1399,7 @@ MidiDiskstream::set_align_style_from_io () } get_input_sources (); - + if (_source_port && _source_port->flags() & JackPortIsPhysical) { have_physical = true; } @@ -1498,9 +1426,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; } @@ -1509,16 +1436,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) +MidiDiskstream::get_playback (MidiBuffer& dst, nframes_t start, nframes_t end) { 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())); +#else _playback_buf->read(dst, start, end); +#endif + + gint32 frames_read = end - start; + g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read); } +