monster commit: transport mgmt changes from 2.X (omnibus edition); make slave use...

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

diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 8172bd9d66415e650ecdd74e73409a298f8ed00f..f06b00ae007f7ef7b1843020aec2839042990474 100644 (file)
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -38,8 +38,10 @@
 
 #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"
@@ -123,7 +125,7 @@ MidiDiskstream::init (Diskstream::Flag f)
        set_block_size (_session.get_block_size());
        allocate_temporary_buffers ();
 
-       const size_t size = _session.midi_diskstream_buffer_size();
+       const size_t size = _session.butler()->midi_diskstream_buffer_size();
        _playback_buf = new MidiRingBuffer<nframes_t>(size);
        _capture_buf = new MidiRingBuffer<nframes_t>(size);
 
@@ -485,7 +487,6 @@ trace_midi (ostream& o, MIDI::byte *msg, size_t len)
 int
 MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input)
 {
-       // FIXME: waay too much code to duplicate (AudioDiskstream::process)
        int       ret = -1;
        nframes_t rec_offset = 0;
        nframes_t rec_nframes = 0;
@@ -528,49 +529,9 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_
        adjust_capture_position = 0;
 
        if (nominally_recording || (_session.get_record_enabled() && _session.config.get_punch_in())) {
-               OverlapType ot;
+               OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
 
-               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;
-
-                       case OverlapEnd:
-                               /*    |--------|    recrange
-                                         |--------  transrange
-                                         */
-                               rec_nframes = last_recordable_frame - transport_frame;
-                               rec_offset = 0;
-                               break;
-
-                       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;
@@ -615,7 +576,7 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_
 
                /* XXXX do this for MIDI !!!
                   can't do actual capture yet - waiting for latency effects to finish before we start
-               */
+                  */
 
                playback_distance = nframes;
 
@@ -1089,6 +1050,10 @@ MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool a
                delete *ci;
        }
 
+       if (_playlist) {
+               midi_playlist()->clear_note_trackers ();
+       }
+
        capture_info.clear ();
        capture_start_frame = 0;
 }
@@ -1258,7 +1223,7 @@ MidiDiskstream::get_state ()
                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);
@@ -1273,7 +1238,7 @@ MidiDiskstream::get_state ()
 }
 
 int
-MidiDiskstream::set_state (const XMLNode& node, int version)
+MidiDiskstream::set_state (const XMLNode& node, int /*version*/)
 {
        const XMLProperty* prop;
        XMLNodeList nlist = node.children();
@@ -1408,6 +1373,7 @@ 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;
 }
@@ -1415,7 +1381,7 @@ MidiDiskstream::use_new_write_source (uint32_t n)
 void
 MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/)
 {
-       if (!recordable()) {
+       if (!_session.writable() || !recordable()) {
                return;
        }
 
@@ -1424,10 +1390,6 @@ MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/)
        }
 
        use_new_write_source (0);
-
-       if (record_enabled()) {
-               //_capturing_sources.push_back (_write_source);
-       }
 }
 
 int
@@ -1516,14 +1478,13 @@ MidiDiskstream::get_playback (MidiBuffer& dst, nframes_t start, nframes_t end)
 
        // Translates stamps to be relative to start
 
-       _playback_buf->read(dst, start, end);
 
-#if 0
+#ifndef NDEBUG
        const size_t events_read = _playback_buf->read(dst, start, end);
-       cout << _name << ": MDS events read = " << events_read
-            << " start = " << start << " end = " << end
-            << " readspace " << _playback_buf->read_space()
-            << " writespace " << _playback_buf->write_space() << endl;
+       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;