X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_source.cc;h=655222413aa0a5f5d836c6121c5511a99d8569c0;hb=cab09d87b8b660e6d2a6169346d30c1629d59bbb;hp=5e57651775b59ac3253204470cfdfb8ebbbde050;hpb=1bff54a23c53b93fd7f8ec6939312fe71fde55cc;p=ardour.git diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 5e57651775..655222413a 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2006 Paul Davis - Written by Dave Robillard, 2006 + Author: David Robillard 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 @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -29,24 +28,25 @@ #include #include +#include #include "pbd/xml++.h" #include "pbd/pthread_utils.h" #include "pbd/basename.h" -#include "ardour/audioengine.h" #include "ardour/debug.h" #include "ardour/midi_model.h" -#include "ardour/midi_ring_buffer.h" #include "ardour/midi_state_tracker.h" #include "ardour/midi_source.h" +#include "ardour/file_source.h" #include "ardour/session.h" #include "ardour/session_directory.h" #include "ardour/source_factory.h" -#include "ardour/tempo.h" #include "i18n.h" +namespace ARDOUR { template class MidiRingBuffer; } + using namespace std; using namespace ARDOUR; using namespace PBD; @@ -55,29 +55,24 @@ PBD::Signal1 MidiSource::MidiSourceCreated; MidiSource::MidiSource (Session& s, string name, Source::Flag flags) : Source(s, DataType::MIDI, name, flags) - , _read_data_count(0) - , _write_data_count(0) , _writing(false) , _model_iter_valid(false) , _length_beats(0.0) , _last_read_end(0) - , _last_write_end(0) + , _capture_length(0) + , _capture_loop_length(0) { } MidiSource::MidiSource (Session& s, const XMLNode& node) : Source(s, node) - , _read_data_count(0) - , _write_data_count(0) , _writing(false) , _model_iter_valid(false) , _length_beats(0.0) , _last_read_end(0) - , _last_write_end(0) + , _capture_length(0) + , _capture_loop_length(0) { - _read_data_count = 0; - _write_data_count = 0; - if (set_state (node, Stateful::loading_state_version)) { throw failed_constructor(); } @@ -130,7 +125,7 @@ MidiSource::set_state (const XMLNode& node, int /*version*/) error << _("Missing parameter property on InterpolationStyle") << endmsg; return -1; } - + Evoral::Parameter p = EventTypeMap::instance().new_parameter (prop->value()); if ((prop = (*i)->property (X_("style"))) == 0) { @@ -140,16 +135,16 @@ MidiSource::set_state (const XMLNode& node, int /*version*/) Evoral::ControlList::InterpolationStyle s = static_cast (string_2_enum (prop->value(), s)); set_interpolation_of (p, s); - + } else if ((*i)->name() == X_("AutomationState")) { - + XMLProperty* prop; if ((prop = (*i)->property (X_("parameter"))) == 0) { error << _("Missing parameter property on AutomationState") << endmsg; return -1; } - + Evoral::Parameter p = EventTypeMap::instance().new_parameter (prop->value()); if ((prop = (*i)->property (X_("state"))) == 0) { @@ -183,7 +178,7 @@ MidiSource::length (framepos_t pos) const } void -MidiSource::update_length (framepos_t /*pos*/, framecnt_t /*cnt*/) +MidiSource::update_length (framecnt_t) { // You're not the boss of me! } @@ -202,10 +197,13 @@ MidiSource::midi_read (Evoral::EventSink& dst, framepos_t source_sta MidiStateTracker* tracker, std::set const & filtered) const { - Glib::Mutex::Lock lm (_lock); + Glib::Threads::Mutex::Lock lm (_lock); BeatsFramesConverter converter(_session.tempo_map(), source_start); + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("MidiSource::midi-read() %5 sstart %1 start %2 cnt %3 tracker %4\n", + source_start, start, cnt, tracker, name())); + if (_model) { Evoral::Sequence::const_iterator& i = _model_iter; @@ -214,12 +212,13 @@ MidiSource::midi_read (Evoral::EventSink& dst, framepos_t source_sta DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 search for relevant iterator for %1 / %2\n", _name, source_start, start)); for (i = _model->begin(0, false, filtered); i != _model->end(); ++i) { if (converter.to(i->time()) >= start) { + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("***\tstop iterator search @ %1\n", i->time())); break; } } _model_iter_valid = true; } else { - DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 use cached iterator for %1 / %2\n", _name, source_start, start)); + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("*** %1 use cachediterator for %1 / %2\n", _name, source_start, start)); } _last_read_end = start + cnt; @@ -231,17 +230,23 @@ MidiSource::midi_read (Evoral::EventSink& dst, framepos_t source_sta /* convert event times to session frames by adding on the source start position in session frames */ dst.write (time_frames + source_start, i->event_type(), i->size(), i->buffer()); + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("%1: add event @ %2 type %3 size = %4\n", + _name, time_frames + source_start, i->event_type(), i->size())); + if (tracker) { - Evoral::MIDIEvent& ev (*(Evoral::MIDIEvent*) (&(*i))); + Evoral::MIDIEvent& ev (*(reinterpret_cast*> + (const_cast*> (&(*i))))); if (ev.is_note_on()) { - DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 add note on %2 @ %3 velocity %4\n", _name, (int) ev.note(), time_frames, (int) ev.velocity())); + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 track note on %2 @ %3 velocity %4\n", _name, (int) ev.note(), time_frames, (int) ev.velocity())); tracker->add (ev.note(), ev.channel()); } else if (ev.is_note_off()) { - DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 add note off %2 @ %3\n", _name, (int) ev.note(), time_frames)); + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 track note off %2 @ %3\n", _name, (int) ev.note(), time_frames)); tracker->remove (ev.note(), ev.channel()); } } } else { + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("%1: reached end with event @ %2 vs. %3\n", + _name, time_frames, start+cnt)); break; } } @@ -251,16 +256,21 @@ MidiSource::midi_read (Evoral::EventSink& dst, framepos_t source_sta } } -/** Write data from a MidiRingBuffer to this source. - * @param source Source to read from. - * @param source_start This source's start position in session frames. - */ framecnt_t -MidiSource::midi_write (MidiRingBuffer& source, framepos_t source_start, framecnt_t duration) +MidiSource::midi_write (MidiRingBuffer& source, + framepos_t source_start, + framecnt_t cnt) { - Glib::Mutex::Lock lm (_lock); - const framecnt_t ret = write_unlocked (source, source_start, duration); - _last_write_end += duration; + Glib::Threads::Mutex::Lock lm (_lock); + + const framecnt_t ret = write_unlocked (source, source_start, cnt); + + if (cnt == max_framecnt) { + _last_read_end = 0; + } else { + _capture_length += cnt; + } + return ret; } @@ -276,10 +286,12 @@ MidiSource::mark_streaming_midi_write_started (NoteMode mode) } void -MidiSource::mark_write_starting_now () +MidiSource::mark_write_starting_now (framecnt_t position, + framecnt_t capture_length, + framecnt_t loop_length) { /* I'm not sure if this is the best way to approach this, but - _last_write_end needs to be set up with the transport frame + _capture_length needs to be set up with the transport frame when a record actually starts, as it is used by SMFSource::write_unlocked to decide whether incoming notes are within the correct time range. @@ -289,8 +301,12 @@ MidiSource::mark_write_starting_now () because it is not RT-safe. */ - set_timeline_position (_session.transport_frame ()); - _last_write_end = _session.transport_frame (); + set_timeline_position(position); + _capture_length = capture_length; + _capture_loop_length = loop_length; + + BeatsFramesConverter converter(_session.tempo_map(), position); + _length_beats = converter.from(capture_length); } void @@ -301,36 +317,24 @@ MidiSource::mark_streaming_write_started () } void -MidiSource::mark_streaming_write_completed () +MidiSource::mark_midi_streaming_write_completed (Evoral::Sequence::StuckNoteOption option, Evoral::MusicalTime end) { if (_model) { - _model->end_write(false); + _model->end_write (option, end); } _writing = false; } -boost::shared_ptr -MidiSource::clone (Evoral::MusicalTime begin, Evoral::MusicalTime end) +void +MidiSource::mark_streaming_write_completed () { - string newname = PBD::basename_nosuffix(_name.val()); - string newpath; - - /* get a new name for the MIDI file we're going to write to - */ - - do { - - newname = bump_name_once (newname, '-'); - /* XXX build path safely */ - newpath = _session.session_directory().midi_path().to_string() +"/"+ newname + ".mid"; - - } while (Glib::file_test (newpath, Glib::FILE_TEST_EXISTS)); - - boost::shared_ptr newsrc = boost::dynamic_pointer_cast( - SourceFactory::createWritable(DataType::MIDI, _session, - newpath, string(), false, _session.frame_rate())); + mark_midi_streaming_write_completed (Evoral::Sequence::DeleteStuckNotes); +} +int +MidiSource::write_to (boost::shared_ptr newsrc, Evoral::MusicalTime begin, Evoral::MusicalTime end) +{ newsrc->set_timeline_position(_timeline_position); newsrc->copy_interpolation_from (this); newsrc->copy_automation_state_from (this); @@ -343,31 +347,35 @@ MidiSource::clone (Evoral::MusicalTime begin, Evoral::MusicalTime end) } } else { error << string_compose (_("programming error: %1"), X_("no model for MidiSource during ::clone()")); - return boost::shared_ptr(); + return -1; } newsrc->flush_midi(); /* force a reload of the model if the range is partial */ - + if (begin != Evoral::MinMusicalTime || end != Evoral::MaxMusicalTime) { newsrc->load_model (true, true); } else { newsrc->set_model (_model); } - - return newsrc; + + /* this file is not removable (but since it is MIDI, it is mutable) */ + + boost::dynamic_pointer_cast (newsrc)->prevent_deletion (); + + return 0; } void MidiSource::session_saved() { - /* this writes a copy of the data to disk. + /* this writes a copy of the data to disk. XXX do we need to do this every time? */ if (_model && _model->edited()) { - + // if the model is edited, write its contents into // the current source file (overwiting previous contents. @@ -376,8 +384,8 @@ MidiSource::session_saved() try to update it. */ - boost::shared_ptr mm = _model ; - _model.reset (); + boost::shared_ptr mm = _model; + _model.reset (); /* flush model contents to disk */ @@ -404,7 +412,7 @@ MidiSource::set_note_mode(NoteMode mode) void MidiSource::drop_model () { - _model.reset(); + _model.reset(); ModelChanged (); /* EMIT SIGNAL */ } @@ -451,7 +459,7 @@ MidiSource::set_interpolation_of (Evoral::Parameter p, Evoral::ControlList::Inte if (interpolation_of (p) == s) { return; } - + if (EventTypeMap::instance().interpolation_of (p) == s) { /* interpolation type is being set to the default, so we don't need a note in our map */ _interpolation_style.erase (p); @@ -468,7 +476,7 @@ MidiSource::set_automation_state_of (Evoral::Parameter p, AutoState s) if (automation_state_of (p) == s) { return; } - + if (s == Play) { /* automation state is being set to the default, so we don't need a note in our map */ _automation_state.erase (p);