attempt to remove confusion and errors caused by unclear semantics of _is_embedded...

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

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index c399cc94dd62c60b92c50ba63792f52a3426c012..5cafe9c81deb789cf26c22e99108eaf6f67630ca 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -66,8 +66,8 @@ MidiTrack::MidiTrack (Session& sess, string name, Route::Flag flag, TrackMode mo
        _mode = mode;
 }
 
-MidiTrack::MidiTrack (Session& sess, const XMLNode& node)
-       : Track (sess, node, DataType::MIDI )
+MidiTrack::MidiTrack (Session& sess, const XMLNode& node, int /*version*/)
+       : Track (sess, node, DataType::MIDI)
        , _immediate_events(1024) // FIXME: size?
        , _step_edit_ring_buffer(64) // FIXME: size?
        , _note_mode(Sustained)
@@ -75,7 +75,7 @@ MidiTrack::MidiTrack (Session& sess, const XMLNode& node)
        , _default_channel (0)
        , _midi_thru (true)
 {
-       _set_state(node, false);
+       _set_state (node, Stateful::loading_state_version, false);
 }
 
 MidiTrack::~MidiTrack ()
@@ -124,14 +124,11 @@ MidiTrack::use_diskstream (string name)
 {
        boost::shared_ptr<MidiDiskstream> dstream;
 
-       cerr << "\n\n\nMIDI use diskstream\n";
-
        if ((dstream = boost::dynamic_pointer_cast<MidiDiskstream>(_session.diskstream_by_name (name))) == 0) {
                error << string_compose(_("MidiTrack: midi diskstream \"%1\" not known by session"), name) << endmsg;
                return -1;
        }
 
-       cerr << "\n\n\nMIDI found DS\n";
        return set_diskstream (dstream);
 }
 
@@ -155,18 +152,18 @@ MidiTrack::midi_diskstream() const
 }
 
 int
-MidiTrack::set_state (const XMLNode& node)
+MidiTrack::set_state (const XMLNode& node, int version)
 {
-       return _set_state (node, true);
+       return _set_state (node, version, true);
 }
 
 int
-MidiTrack::_set_state (const XMLNode& node, bool call_base)
+MidiTrack::_set_state (const XMLNode& node, int version, bool call_base)
 {
        const XMLProperty *prop;
        XMLNodeConstIterator iter;
 
-       if (Route::_set_state (node, call_base)) {
+       if (Route::_set_state (node, version, call_base)) {
                return -1;
        }
 
@@ -214,8 +211,6 @@ MidiTrack::_set_state (const XMLNode& node, bool call_base)
                   an old one.
                */
 
-               cerr << "\n\n\n\n MIDI track " << name() << " found DS id " << id << endl;
-
                if (id == zero) {
                        use_new_diskstream ();
                } else if (use_diskstream (id)) {
@@ -232,7 +227,7 @@ MidiTrack::_set_state (const XMLNode& node, bool call_base)
                child = *niter;
 
                if (child->name() == X_("recenable")) {
-                       _rec_enable_control->set_state (*child);
+                       _rec_enable_control->set_state (*child, version);
                        _session.add_controllable (_rec_enable_control);
                }
        }
@@ -465,23 +460,12 @@ MidiTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
 
                write_out_of_band_data (bufs, start_frame, end_frame, nframes);
 
-               // Feed the data through the MidiStateTracker
-               bool did_loop;
-
-               _midi_state_tracker.track (mbuf.begin(), mbuf.end(), did_loop);
-
-               if (did_loop) {
-                       /* add necessary note offs */
-                       cerr << "DID LOOP, RESOLVE NOTES\n";
-                       _midi_state_tracker.resolve_notes (mbuf, end_frame-start_frame - 1);
-               }
-
                process_output_buffers (bufs, start_frame, end_frame, nframes,
-                               (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick);
+                                       (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick);
 
        }
 
-       _main_outs->flush (nframes);
+       _main_outs->flush (nframes, end_frame - start_frame - 1);
 
        return 0;
 }
@@ -502,16 +486,8 @@ MidiTrack::no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_fram
 void
 MidiTrack::handle_transport_stopped (bool abort, bool did_locate, bool flush_processors)
 {
-       /* turn off any notes that are on */
-
-       MidiBuffer buf (1024); // XXX is this a reasonable size ?
-
-       _midi_state_tracker.resolve_notes (buf, 0); // time is zero because notes are immediate
-
-       for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
-               write_immediate_event ((*i).size(), (*i).buffer());
-       }
 
+       _main_outs->transport_stopped ();
        Route::handle_transport_stopped (abort, did_locate, flush_processors);
 }
 
@@ -542,17 +518,15 @@ void
 MidiTrack::write_out_of_band_data (BufferSet& bufs, sframes_t /*start*/, sframes_t /*end*/, nframes_t nframes)
 {
        // Append immediate events
-
        MidiBuffer& buf (bufs.get_midi (0));
        _immediate_events.read (buf, 0, 0, nframes - 1); // all stamps = 0
 
-       /* MIDI thru: send incoming data "through" output */
-       if (_midi_thru && _input->n_ports().n_midi()) {
+       // MIDI thru: send incoming data "through" output
+       if (_midi_thru && _session.transport_speed() != 0.0f && _input->n_ports().n_midi()) {
                buf.merge_in_place (_input->midi(0)->get_midi_buffer(nframes));
        }
 }
 
-
 int
 MidiTrack::export_stuff (BufferSet& /*bufs*/, nframes_t /*nframes*/, sframes_t /*end_frame*/)
 {