Create Freesound working directory a little more lazily so

[ardour.git] / libs / ardour / smf_source.cc

diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 9078a17608aaad0c2a7eebb002a2dd66cdf37e0a..52377ee9154c74a5af959af2499ef4443b7201f4 100644 (file)
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -127,8 +127,6 @@ SMFSource::read_unlocked (Evoral::EventSink<framepos_t>& destination, framepos_t
 
        DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: start %1 duration %2\n", start, duration));
 
-       _read_data_count = 0;
-
        // Output parameters for read_event (which will allocate scratch in buffer as needed)
        uint32_t ev_delta_t = 0;
        uint32_t ev_type    = 0;
@@ -203,8 +201,6 @@ SMFSource::read_unlocked (Evoral::EventSink<framepos_t>& destination, framepos_t
                        break;
                }
 
-               _read_data_count += ev_size;
-
                if (ev_size > scratch_size) {
                        scratch_size = ev_size;
                }
@@ -225,8 +221,6 @@ SMFSource::write_unlocked (MidiRingBuffer<framepos_t>& source, framepos_t positi
                 mark_streaming_write_started ();
         }
 
-       _write_data_count = 0;
-
        framepos_t        time;
        Evoral::EventType type;
        uint32_t          size;
@@ -240,19 +234,24 @@ SMFSource::write_unlocked (MidiRingBuffer<framepos_t>& source, framepos_t positi
 
        Evoral::MIDIEvent<framepos_t> ev;
 
-       cerr << "SMFSource::write unlocked, begins writing from src buffer\n";
+       // cerr << "SMFSource::write unlocked, begins writing from src buffer with _last_write_end = " << _last_write_end << " dur = " << duration << endl;
 
        while (true) {
-               bool ret = source.peek ((uint8_t*)&time, sizeof (time));
-               if (!ret || time > _last_write_end + duration) {
-                       DEBUG_TRACE (DEBUG::MidiIO, string_compose ("SMFSource::write_unlocked: dropping event @ %1 because ret %4 or it is later than %2 + %3\n",
-                                                                   time, _last_write_end, duration, ret));
+               bool ret;
+
+               if (!(ret = source.peek ((uint8_t*)&time, sizeof (time)))) {
+                       /* no more events to consider */
                        break;
                }
 
-               ret = source.read_prefix(&time, &type, &size);
-               if (!ret) {
-                       cerr << "ERROR: Unable to read event prefix, corrupt MIDI ring buffer" << endl;
+               if ((duration != max_framecnt) && (time > (_last_write_end + duration))) {
+                       DEBUG_TRACE (DEBUG::MidiIO, string_compose ("SMFSource::write_unlocked: dropping event @ %1 because it is later than %2 + %3\n",
+                                                                   time, _last_write_end, duration));
+                       break;
+               }
+
+               if (!(ret = source.read_prefix (&time, &type, &size))) {
+                       error << _("Unable to read event prefix, corrupt MIDI ring buffer") << endmsg;
                        break;
                }
 
@@ -263,7 +262,7 @@ SMFSource::write_unlocked (MidiRingBuffer<framepos_t>& source, framepos_t positi
 
                ret = source.read_contents(size, buf);
                if (!ret) {
-                       cerr << "ERROR: Read time/size but not buffer, corrupt MIDI ring buffer" << endl;
+                       error << _("Read time/size but not buffer, corrupt MIDI ring buffer") << endmsg;
                        break;
                }
 
@@ -281,7 +280,6 @@ SMFSource::write_unlocked (MidiRingBuffer<framepos_t>& source, framepos_t positi
                        continue;
                }
 
-               cerr << "SMFSource:: calling append_event_unlocked_frames()\n";
                append_event_unlocked_frames(ev, position);
        }
 
@@ -330,9 +328,6 @@ SMFSource::append_event_unlocked_beats (const Evoral::Event<double>& ev)
 
        Evoral::SMF::append_event_delta(delta_time_ticks, ev.size(), ev.buffer(), event_id);
        _last_ev_time_beats = ev.time();
-
-       _write_data_count += ev.size();
-
 }
 
 /** Append an event with a timestamp in frames (framepos_t) */
@@ -374,15 +369,12 @@ SMFSource::append_event_unlocked_frames (const Evoral::Event<framepos_t>& ev, fr
 
        _length_beats = max(_length_beats, ev_time_beats);
 
-       const framepos_t delta_time_frames = ev.time() - _last_ev_time_frames;
-       const double     delta_time_beats  = converter.from(delta_time_frames);
-       const uint32_t   delta_time_ticks  = (uint32_t)(lrint(delta_time_beats * (double)ppqn()));
+       const Evoral::MusicalTime last_time_beats  = converter.from (_last_ev_time_frames);
+       const Evoral::MusicalTime delta_time_beats = ev_time_beats - last_time_beats;
+       const uint32_t            delta_time_ticks = (uint32_t)(lrint(delta_time_beats * (double)ppqn()));
 
        Evoral::SMF::append_event_delta(delta_time_ticks, ev.size(), ev.buffer(), event_id);
        _last_ev_time_frames = ev.time();
-
-       _write_data_count += ev.size();
-
 }
 
 XMLNode&
@@ -430,9 +422,15 @@ SMFSource::mark_streaming_midi_write_started (NoteMode mode)
 
 void
 SMFSource::mark_streaming_write_completed ()
+{
+       mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::DeleteStuckNotes);
+}
+
+void
+SMFSource::mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::StuckNoteOption stuck_notes_option, Evoral::MusicalTime when)
 {
        Glib::Mutex::Lock lm (_lock);
-       MidiSource::mark_streaming_write_completed();
+       MidiSource::mark_midi_streaming_write_completed (stuck_notes_option, when);
 
        if (!writable()) {
                return;
@@ -486,7 +484,7 @@ SMFSource::load_model (bool lock, bool force_reload)
        uint64_t time = 0; /* in SMF ticks */
        Evoral::Event<double> ev;
 
-       size_t scratch_size = 0; // keep track of scratch and minimize reallocs
+       uint32_t scratch_size = 0; // keep track of scratch and minimize reallocs
 
        uint32_t delta_t = 0;
        uint32_t size    = 0;
@@ -536,11 +534,9 @@ SMFSource::load_model (bool lock, bool force_reload)
 
                        _model->append (ev, event_id);
 
-                       if (ev.size() > scratch_size) {
-                               scratch_size = ev.size();
-                       }
-
-                       ev.size() = scratch_size; // ensure read_event only allocates if necessary
+                       // Set size to max capacity to minimize allocs in read_event
+                       scratch_size = std::max(size, scratch_size);
+                       size = scratch_size;
 
                        _length_beats = max(_length_beats, ev.time());
                }
@@ -551,8 +547,7 @@ SMFSource::load_model (bool lock, bool force_reload)
                have_event_id = false;
        }
 
-       _model->end_write (_length_beats, false, true);
-       //_model->end_write (false);
+       _model->end_write (Evoral::Sequence<Evoral::MusicalTime>::ResolveStuckNotes, _length_beats);
        _model->set_edited (false);
 
        _model_iter = _model->begin();