X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_diskstream.cc;h=0ec17bc3aad0a2ccb7970b588dc563f9b1e946a5;hb=0bee288b5d6c6ca1fb33b8bc3b584c6d2c3d3364;hp=f8d9f1eb580f903e8e626f7ff04127ca01939244;hpb=7183242b8c8d9296f94a035fb66b1eae06fd3496;p=ardour.git diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index f8d9f1eb58..0ec17bc3aa 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 @@ -35,11 +35,15 @@ #include "pbd/xml++.h" #include "pbd/memento_command.h" #include "pbd/enumwriter.h" +#include "pbd/stateful_diff_command.h" +#include "pbd/stacktrace.h" #include "ardour/ardour.h" #include "ardour/audioengine.h" +#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 +55,10 @@ #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 @@ -59,7 +67,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -nframes_t MidiDiskstream::midi_readahead = 4096; +framecnt_t MidiDiskstream::midi_readahead = 4096; MidiDiskstream::MidiDiskstream (Session &sess, const string &name, Diskstream::Flag flag) : Diskstream(sess, name, flag) @@ -75,14 +83,15 @@ MidiDiskstream::MidiDiskstream (Session &sess, const string &name, Diskstream::F in_set_state = true; - init(flag); + init (); use_new_playlist (); + use_new_write_source (0); in_set_state = false; assert(!destructive()); } - + MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node) : Diskstream(sess, node) , _playback_buf(0) @@ -94,25 +103,22 @@ MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node) , _frames_read_from_ringbuffer(0) { in_set_state = true; - init (Recordable); - if (set_state (node)) { + init (); + + if (set_state (node, Stateful::loading_state_version)) { in_set_state = false; throw failed_constructor(); } - in_set_state = false; + use_new_write_source (0); - if (destructive()) { - use_destructive_playlist (); - } + in_set_state = false; } void -MidiDiskstream::init (Diskstream::Flag f) +MidiDiskstream::init () { - Diskstream::init(f); - /* there are no channels at this point, so these two calls just get speed_buffer_size and wrap_buffer size setup without duplicating their code. @@ -121,10 +127,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(); - _playback_buf = new MidiRingBuffer(size); - _capture_buf = new MidiRingBuffer(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,9 +141,9 @@ MidiDiskstream::~MidiDiskstream () Glib::Mutex::Lock lm (state_lock); } - + void -MidiDiskstream::non_realtime_locate (nframes_t position) +MidiDiskstream::non_realtime_locate (framepos_t position) { if (_write_source) { _write_source->set_timeline_position (position); @@ -149,19 +155,19 @@ MidiDiskstream::non_realtime_locate (nframes_t position) void MidiDiskstream::non_realtime_input_change () { - { + { Glib::Mutex::Lock lm (state_lock); - if (input_change_pending == NoChange) { + if (input_change_pending.type == IOChange::NoChange) { return; } - if (input_change_pending & ConfigurationChanged) { - if (_io->n_inputs().n_midi() != _n_channels.n_midi()) { - error << "Can not feed IO " << _io->n_inputs() + if (input_change_pending.type & IOChange::ConfigurationChanged) { + 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 (); @@ -173,19 +179,20 @@ MidiDiskstream::non_realtime_input_change () set_align_style_from_io (); } - input_change_pending = NoChange; - + input_change_pending.type = IOChange::NoChange; + /* implicit unlock */ } - /* reset capture files */ - - reset_write_sources (false); + /* unlike with audio, there is never any need to reset write sources + based on input configuration changes because ... a MIDI track + has just 1 MIDI port as input, always. + */ /* now refill channel buffers */ if (speed() != 1.0f || speed() != -1.0f) { - seek ((nframes_t) (_session.transport_frame() * (double) speed())); + seek ((framepos_t) (_session.transport_frame() * (double) speed())); } else { seek (_session.transport_frame()); @@ -197,7 +204,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; @@ -206,17 +213,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)); } @@ -230,7 +237,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); @@ -240,7 +247,7 @@ MidiDiskstream::use_playlist (boost::shared_ptr playlist) int MidiDiskstream::use_new_playlist () -{ +{ string newname; boost::shared_ptr playlist; @@ -256,11 +263,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; } } @@ -283,11 +290,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; } } @@ -301,7 +308,7 @@ MidiDiskstream::set_destructive (bool yn) assert( ! yn); return -1; } - + void MidiDiskstream::set_note_mode (NoteMode m) { @@ -311,204 +318,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 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()) { - - /* 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. - */ - - capture_start_frame -= _roll_delay; + } + break; - /* XXX paul notes (august 2005): i don't know why - this is needed. - */ + case MIDI::song: + o << trace_prefix << "Song" << endl; + break; - first_recordable_frame += _capture_offset; + case MIDI::tune: + o << trace_prefix << "Tune" << endl; + break; - } else { + case MIDI::eox: + o << trace_prefix << "End-of-System Exclusive" << 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::timing: + o << trace_prefix << "Timing" << endl; + break; - first_recordable_frame += _session.worst_output_latency(); - } + case MIDI::start: + o << trace_prefix << "Start" << endl; + break; - } else { + case MIDI::stop: + o << trace_prefix << "Stop" << endl; + break; - if (Config->get_punch_in()) { - first_recordable_frame += _roll_delay; - } else { - capture_start_frame -= _roll_delay; - } - } - - } + case MIDI::contineu: + o << trace_prefix << "Continue" << endl; + break; - } else if (!record_enabled() || !can_record) { - - /* stop recording */ + case active: + o << trace_prefix << "Active Sense" << endl; + break; - 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, bool can_record, bool rec_monitors_input) +MidiDiskstream::process (framepos_t transport_frame, pframes_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; + framecnt_t rec_offset = 0; + framecnt_t rec_nframes = 0; bool nominally_recording; bool re = record_enabled (); - 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 - 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); + check_record_status (transport_frame, can_record); nominally_recording = (can_record && re); if (nframes == 0) { - _processed = true; return 0; } - /* This lock is held until the end of ::commit, so these two functions - must always be called as a pair. The only exception is if this function - returns a non-zero value, in which case, ::commit should not be called. - */ + 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 || (re && was_recording && _session.get_record_enabled() && _session.config.get_punch_in())) { + OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes); - 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; @@ -517,8 +526,8 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_ } - if (can_record && !_last_capture_regions.empty()) { - _last_capture_regions.clear (); + if (can_record && !_last_capture_sources.empty()) { + _last_capture_sources.clear (); } if (nominally_recording || rec_nframes) { @@ -530,7 +539,17 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_ assert(ev.buffer()); _capture_buf->write(ev.time() + transport_frame, ev.type(), ev.size(), ev.buffer()); } - + + if (buf.size() != 0) { + /* Make a copy of this data and emit it for the GUI to see */ + boost::shared_ptr copy (new MidiBuffer (buf.capacity ())); + for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) { + copy->push_back ((*i).time() + transport_frame, (*i).size(), (*i).buffer()); + } + + DataRecorded (copy, _write_source); /* EMIT SIGNAL */ + } + } else { if (was_recording) { @@ -551,55 +570,25 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_ } 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; - collect_playback = false; } - 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; - } - - // 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; - _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; } bool -MidiDiskstream::commit (nframes_t nframes) +MidiDiskstream::commit (framecnt_t nframes) { bool need_butler = false; @@ -623,12 +612,6 @@ MidiDiskstream::commit (nframes_t nframes) /*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(); - } - - _processed = false; return need_butler; } @@ -637,28 +620,34 @@ 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; } int MidiDiskstream::overwrite_existing_buffers () { - //read(overwrite_frame, disk_io_chunk_frames, false); + /* This is safe as long as the butler thread is suspended, which it should be */ + _playback_buf->reset (); + + g_atomic_int_set (&_frames_read_from_ringbuffer, 0); + g_atomic_int_set (&_frames_written_to_ringbuffer, 0); + + read (overwrite_frame, disk_io_chunk_frames, false); overwrite_queued = false; - pending_overwrite = false; + _pending_overwrite = false; return 0; } int -MidiDiskstream::seek (nframes_t frame, bool complete_refill) +MidiDiskstream::seek (framepos_t frame, bool complete_refill) { Glib::Mutex::Lock lm (state_lock); int ret = -1; - + _playback_buf->reset(); _capture_buf->reset(); g_atomic_int_set(&_frames_read_from_ringbuffer, 0); @@ -677,7 +666,7 @@ MidiDiskstream::seek (nframes_t frame, bool complete_refill) } int -MidiDiskstream::can_internal_playback_seek (nframes_t distance) +MidiDiskstream::can_internal_playback_seek (framecnt_t distance) { uint32_t frames_read = g_atomic_int_get(&_frames_read_from_ringbuffer); uint32_t frames_written = g_atomic_int_get(&_frames_written_to_ringbuffer); @@ -685,10 +674,8 @@ MidiDiskstream::can_internal_playback_seek (nframes_t distance) } int -MidiDiskstream::internal_playback_seek (nframes_t distance) +MidiDiskstream::internal_playback_seek (framecnt_t distance) { - cerr << "MDS: internal_playback_seek " << distance << endl; - first_recordable_frame += distance; playback_sample += distance; @@ -697,34 +684,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; +MidiDiskstream::read (framepos_t& start, framecnt_t dur, bool reversed) +{ + framecnt_t this_read = 0; bool reloop = false; - nframes_t loop_end = 0; - nframes_t loop_start = 0; - nframes_t loop_length = 0; + framepos_t loop_end = 0; + framepos_t loop_start = 0; Location *loc = 0; if (!reversed) { + + framecnt_t loop_length = 0; + /* Make the use of a Location atomic for this read operation. - + Note: Locations don't get deleted, so all we care about 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); @@ -758,12 +747,11 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) _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? @@ -771,21 +759,18 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed) // 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; - + _playback_buf->write(loop_end - 1, LoopEventType, sizeof (framepos_t), (uint8_t *) &loop_start); start = loop_start; } else { start += this_read; } - } + } dur -= this_read; //offset += this_read; @@ -810,19 +795,19 @@ MidiDiskstream::do_refill () if (write_space == 0) { return 0; } - + if (reversed) { return 0; } /* at end: nothing to do */ - if (file_frame == max_frames) { + if (file_frame == max_framepos) { return 0; } // At this point we... assert(_playback_buf->write_space() > 0); // ... have something to write to, and - assert(file_frame <= max_frames); // ... something to write + assert(file_frame <= max_framepos); // ... something to write // now calculate how much time is in the ringbuffer. // and lets write as much as we need to get this to be midi_readahead; @@ -833,17 +818,17 @@ MidiDiskstream::do_refill () return 0; } - nframes_t to_read = midi_readahead - (frames_written - frames_read); + framecnt_t to_read = midi_readahead - (frames_written - frames_read); //cout << "MDS read for midi_readahead " << to_read << " rb_contains: " // << frames_written - frames_read << endl; - to_read = min(to_read, (max_frames - file_frame)); - + to_read = (framecnt_t) min ((framecnt_t) to_read, (framecnt_t) (max_framepos - file_frame)); + if (read (file_frame, to_read, reversed)) { ret = -1; } - + return ret; } @@ -853,23 +838,22 @@ 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; - nframes_t total; + framecnt_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) { + + if (_last_flush_frame > _session.transport_frame() || _last_flush_frame < capture_start_frame) { _last_flush_frame = _session.transport_frame(); } @@ -891,16 +875,16 @@ 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; assert(!destructive()); - 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) { + if (record_enabled() && + ((_session.transport_frame() - _last_flush_frame > disk_io_chunk_frames) || + force_flush)) { + if ((!_write_source) || _write_source->midi_write (*_capture_buf, get_capture_start_frame (0), to_write) != to_write) { error << string_compose(_("MidiDiskstream %1: cannot write to disk"), _id) << endmsg; return -1; } else { @@ -913,13 +897,11 @@ out: } void -MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_capture) +MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen*/, bool abort_capture) { - uint32_t buffer_position; bool more_work = true; int err = 0; boost::shared_ptr region; - nframes_t total_capture; MidiRegion::SourceList srcs; MidiRegion::SourceList::iterator src; vector::iterator ci; @@ -927,20 +909,20 @@ 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 (TransportContext, true)) { - case 0: - more_work = false; - break; - case 1: - break; - case -1: - error << string_compose(_("MidiDiskstream \"%1\": cannot flush captured data to disk!"), _name) << endmsg; - err++; + case 0: + more_work = false; + break; + case 1: + break; + case -1: + error << string_compose(_("MidiDiskstream \"%1\": cannot flush captured data to disk!"), _name) << endmsg; + err++; } } @@ -954,9 +936,7 @@ MidiDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_cap if (abort_capture) { if (_write_source) { - _write_source->mark_for_remove (); - _write_source->drop_references (); _write_source.reset(); } @@ -966,98 +946,144 @@ 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) { + framecnt_t total_capture = 0; + for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) { total_capture += (*ci)->frames; } - /* figure out the name for this take */ - - srcs.push_back (_write_source); - _write_source->set_timeline_position (capture_info.front()->start); - _write_source->set_captured_for (_name); + if (_write_source->length (capture_info.front()->start) != 0) { - string whole_file_region_name; - whole_file_region_name = region_name_from_path (_write_source->name(), true); + /* phew, we have data */ - /* Register a new region with the Session that - describes the entire source. Do this first - so that any sub-regions will obviously be - children of this one (later!) - */ + /* figure out the name for this take */ - try { - boost::shared_ptr rx (RegionFactory::create (srcs, 0, - total_capture, whole_file_region_name, 0, - Region::Flag (Region::DefaultFlags|Region::Automatic|Region::WholeFile))); + srcs.push_back (_write_source); - region = boost::dynamic_pointer_cast (rx); - region->special_set_position (capture_info.front()->start); - } + _write_source->set_timeline_position (capture_info.front()->start); + _write_source->set_captured_for (_name); + /* flush to disk: this step differs from the audio path, + where all the data is already on disk. + */ - catch (failed_constructor& err) { - error << string_compose(_("%1: could not create region for complete midi file"), _name) << endmsg; - /* XXX what now? */ - } + _write_source->mark_streaming_write_completed (); - _last_capture_regions.push_back (region); + /* set length in beats to entire capture length */ - // cerr << _name << ": there are " << capture_info.size() << " capture_info records\n"; + BeatsFramesConverter converter (_session.tempo_map(), capture_info.front()->start); + const double total_capture_beats = converter.from(total_capture); + _write_source->set_length_beats(total_capture_beats); - XMLNode &before = _playlist->get_state(); - _playlist->freeze (); + /* make it not a stub anymore */ - for (buffer_position = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) { + _write_source->unstubify (); - string region_name; + /* we will want to be able to keep (over)writing the source + but we don't want it to be removable. this also differs + from the audio situation, where the source at this point + must be considered immutable. luckily, we can rely on + MidiSource::mark_streaming_write_completed() to have + already done the necessary work for that. + */ - _session.region_name (region_name, _write_source->name(), false); + string whole_file_region_name; + whole_file_region_name = region_name_from_path (_write_source->name(), true); - // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n"; + /* Register a new region with the Session that + describes the entire source. Do this first + so that any sub-regions will obviously be + children of this one (later!) + */ try { - boost::shared_ptr rx (RegionFactory::create (srcs, buffer_position, (*ci)->frames, region_name)); + 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); } + catch (failed_constructor& err) { - error << _("MidiDiskstream: could not create region for captured midi!") << endmsg; - continue; /* XXX is this OK? */ + error << string_compose(_("%1: could not create region for complete midi file"), _name) << endmsg; + /* XXX what now? */ } - - region->GoingAway.connect (bind (mem_fun (*this, &Diskstream::remove_region_from_last_capture), boost::weak_ptr(region))); - _last_capture_regions.push_back (region); + _last_capture_sources.insert (_last_capture_sources.end(), srcs.begin(), srcs.end()); + + _playlist->clear_changes (); + _playlist->freeze (); - // cerr << "add new region, buffer position = " << buffer_position << " @ " << (*ci)->start << endl; + /* Session frame time of the initial capture in this pass, which is where the source starts */ + framepos_t initial_capture = 0; + if (!capture_info.empty()) { + initial_capture = capture_info.front()->start; + } - i_am_the_modifier++; - _playlist->add_region (region, (*ci)->start); - i_am_the_modifier--; + for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) { - buffer_position += (*ci)->frames; - } + string region_name; - _playlist->thaw (); - XMLNode &after = _playlist->get_state(); - _session.add_command (new MementoCommand(*_playlist, &before, &after)); + RegionFactory::region_name (region_name, _write_source->name(), false); - } + // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n"; - mark_write_completed = true; + try { + PropertyList plist; - reset_write_sources (mark_write_completed); + /* start of this region is the offset between the start of its capture and the start of the whole pass */ + plist.add (Properties::start, (*ci)->start - initial_capture); + plist.add (Properties::length, (*ci)->frames); + plist.add (Properties::length_beats, converter.from((*ci)->frames)); + plist.add (Properties::name, region_name); + + boost::shared_ptr rx (RegionFactory::create (srcs, plist)); + region = boost::dynamic_pointer_cast (rx); + } + + catch (failed_constructor& err) { + error << _("MidiDiskstream: could not create region for captured midi!") << endmsg; + continue; /* XXX is this OK? */ + } + + // cerr << "add new region, buffer position = " << buffer_position << " @ " << (*ci)->start << endl; + + i_am_the_modifier++; + _playlist->add_region (region, (*ci)->start); + i_am_the_modifier--; + } + + _playlist->thaw (); + _session.add_command (new StatefulDiffCommand(_playlist)); + } + + mark_write_completed = true; + } + + use_new_write_source (0); for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) { delete *ci; } + if (_playlist) { + midi_playlist()->clear_note_trackers (); + } + capture_info.clear (); capture_start_frame = 0; } void -MidiDiskstream::transport_looped (nframes_t transport_frame) +MidiDiskstream::transport_looped (framepos_t transport_frame) { if (was_recording) { @@ -1080,16 +1106,16 @@ MidiDiskstream::transport_looped (nframes_t transport_frame) // no latency adjustment or capture offset needs to be made, as that already happened the first time capture_start_frame = transport_frame; first_recordable_frame = transport_frame; // mild lie - last_recordable_frame = max_frames; + last_recordable_frame = max_framepos; was_recording = true; } } void -MidiDiskstream::finish_capture (bool rec_monitors_input) +MidiDiskstream::finish_capture (bool /*rec_monitors_input*/) { was_recording = false; - + if (capture_captured == 0) { return; } @@ -1098,12 +1124,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 @@ -1125,15 +1151,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. @@ -1151,20 +1168,14 @@ MidiDiskstream::set_record_enabled (bool yn) void MidiDiskstream::engage_record_enable () { - bool rolling = _session.transport_speed() != 0.0f; + bool const rolling = _session.transport_speed() != 0.0f; g_atomic_int_set (&_record_enabled, 1); - + if (_source_port && Config->get_monitoring_model() == HardwareMonitoring) { - _source_port->request_monitor_input (!(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... - if (!_write_source) - use_new_write_source(); - - _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame()); - RecordEnableChanged (); /* EMIT SIGNAL */ } @@ -1184,7 +1195,7 @@ 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")); @@ -1192,12 +1203,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); @@ -1218,10 +1229,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); @@ -1236,35 +1247,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 (); @@ -1278,7 +1288,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); @@ -1288,26 +1298,22 @@ 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; } 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); } @@ -1324,45 +1330,33 @@ MidiDiskstream::set_state (const XMLNode& node) in_set_state = false; - /* make sure this is clear before we do anything else */ - - // FIXME? - //_capturing_source = 0; - - /* write sources are handled when we handle the input set - up of the IO that owns this DS (::non_realtime_input_change()) - */ - - in_set_state = false; - return 0; } int MidiDiskstream::use_new_write_source (uint32_t n) { - if (!recordable()) { + if (!_session.writable() || !recordable()) { return 1; } assert(n == 0); - if (_write_source) { - - if (_write_source->is_empty ()) { - _write_source->mark_for_remove (); - _write_source.reset(); - } else { - _write_source.reset(); - } - } + _write_source.reset(); try { - _write_source = boost::dynamic_pointer_cast(_session.create_midi_source_for_session (*this)); + /* file starts off as a stub file, it will be converted + when we're done with a capture pass, or when "stolen" + by the GUI. + */ + + _write_source = boost::dynamic_pointer_cast( + _session.create_midi_source_for_session (0, name (), true)); + if (!_write_source) { throw failed_constructor(); } - } + } catch (failed_constructor &err) { error << string_compose (_("%1:%2 new capture file not initialized correctly"), _name, n) << endmsg; @@ -1370,41 +1364,63 @@ MidiDiskstream::use_new_write_source (uint32_t n) return -1; } - _write_source->set_allow_remove_if_empty (true); + _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame()); return 0; } +list > +MidiDiskstream::steal_write_sources() +{ + list > ret; + + /* put some data on the disk, even if its just a header for an empty file. + XXX should we not have a more direct method for doing this? Maybe not + since we don't want to mess around with the model/disk relationship + that the Source has to pay attention to. + */ + + boost::dynamic_pointer_cast(_write_source)->session_saved (); + + /* make it visible/present */ + _write_source->unstubify (); + /* never let it go away */ + _write_source->mark_nonremovable (); + + ret.push_back (_write_source); + + /* get a new one */ + + use_new_write_source (0); + + return ret; +} + void -MidiDiskstream::reset_write_sources (bool mark_write_complete, bool force) +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 (pframes_t /*nframes*/) { } @@ -1430,7 +1446,7 @@ MidiDiskstream::set_align_style_from_io () } get_input_sources (); - + if (_source_port && _source_port->flags() & JackPortIsPhysical) { have_physical = true; } @@ -1458,7 +1474,7 @@ MidiDiskstream::capture_buffer_load () const } int -MidiDiskstream::use_pending_capture_data (XMLNode& node) +MidiDiskstream::use_pending_capture_data (XMLNode& /*node*/) { return 0; } @@ -1467,37 +1483,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, framepos_t start, framepos_t end) { 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 - #if 1 - _playback_buf->read(dst, start, end); - #else - const size_t events_read = _playback_buf->read(dst, start, end); - cout << "MDS events read = " << events_read - << " start = " << start << " end = " << end - << " readspace " << _playback_buf->read_space() - << " writespace " << _playback_buf->write_space() << endl; - #endif - + + +#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); - } }