X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_source.cc;h=655222413aa0a5f5d836c6121c5511a99d8569c0;hb=cd8aa4e3044bfa2f6956e02ccc5458b3c9fbadc4;hp=48d9cdf877b68142710c6bf02c9eb94aa5eeaa83;hpb=6fa6514cfdb0ce38d93b51197f599dfd091bad1d;p=ardour.git diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 48d9cdf877..655222413a 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -29,6 +28,7 @@ #include #include +#include #include "pbd/xml++.h" #include "pbd/pthread_utils.h" @@ -38,6 +38,7 @@ #include "ardour/midi_model.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" @@ -58,7 +59,8 @@ MidiSource::MidiSource (Session& s, string name, Source::Flag flags) , _model_iter_valid(false) , _length_beats(0.0) , _last_read_end(0) - , _last_write_end(0) + , _capture_length(0) + , _capture_loop_length(0) { } @@ -68,7 +70,8 @@ MidiSource::MidiSource (Session& s, const XMLNode& node) , _model_iter_valid(false) , _length_beats(0.0) , _last_read_end(0) - , _last_write_end(0) + , _capture_length(0) + , _capture_loop_length(0) { if (set_state (node, Stateful::loading_state_version)) { throw failed_constructor(); @@ -194,7 +197,7 @@ 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); @@ -231,7 +234,8 @@ MidiSource::midi_read (Evoral::EventSink& dst, framepos_t source_sta _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 track note on %2 @ %3 velocity %4\n", _name, (int) ev.note(), time_frames, (int) ev.velocity())); tracker->add (ev.note(), ev.channel()); @@ -252,21 +256,19 @@ 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); + Glib::Threads::Mutex::Lock lm (_lock); - const framecnt_t ret = write_unlocked (source, source_start, duration); + const framecnt_t ret = write_unlocked (source, source_start, cnt); - if (duration == max_framecnt) { + if (cnt == max_framecnt) { _last_read_end = 0; } else { - _last_write_end += duration; + _capture_length += cnt; } return ret; @@ -284,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. @@ -297,10 +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 (); - cerr << name() << " last write set to " << _last_write_end << endl; + 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 @@ -326,32 +332,9 @@ MidiSource::mark_streaming_write_completed () mark_midi_streaming_write_completed (Evoral::Sequence::DeleteStuckNotes); } -boost::shared_ptr -MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::MusicalTime end) +int +MidiSource::write_to (boost::shared_ptr newsrc, Evoral::MusicalTime begin, Evoral::MusicalTime end) { - string newname = PBD::basename_nosuffix(_name.val()); - string newpath; - - if (path.empty()) { - - /* 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)); - } else { - /* caller must check for pre-existing file */ - newpath = path; - } - - boost::shared_ptr newsrc = boost::dynamic_pointer_cast( - SourceFactory::createWritable(DataType::MIDI, _session, - newpath, string(), false, _session.frame_rate())); - newsrc->set_timeline_position(_timeline_position); newsrc->copy_interpolation_from (this); newsrc->copy_automation_state_from (this); @@ -364,7 +347,7 @@ MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::Musica } } else { error << string_compose (_("programming error: %1"), X_("no model for MidiSource during ::clone()")); - return boost::shared_ptr(); + return -1; } newsrc->flush_midi(); @@ -376,8 +359,12 @@ MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::Musica } else { newsrc->set_model (_model); } + + /* this file is not removable (but since it is MIDI, it is mutable) */ + + boost::dynamic_pointer_cast (newsrc)->prevent_deletion (); - return newsrc; + return 0; } void @@ -388,7 +375,7 @@ MidiSource::session_saved() */ if (_model && _model->edited()) { - + // if the model is edited, write its contents into // the current source file (overwiting previous contents.