X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_track.cc;h=5cafe9c81deb789cf26c22e99108eaf6f67630ca;hb=acdc88f279760443dc7397290e9c4752af5b23c9;hp=d3f3638b6b6705810fd58db6fd2160128af4b4d7;hpb=bc56eb8bd73c7b456b646ba0cc627d449baa37f2;p=ardour.git diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index d3f3638b6b..5cafe9c81d 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -124,14 +124,11 @@ MidiTrack::use_diskstream (string name) { boost::shared_ptr dstream; - cerr << "\n\n\nMIDI use diskstream\n"; - if ((dstream = boost::dynamic_pointer_cast(_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); } @@ -214,8 +211,6 @@ MidiTrack::_set_state (const XMLNode& node, int version, 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)) { @@ -527,7 +522,7 @@ MidiTrack::write_out_of_band_data (BufferSet& bufs, sframes_t /*start*/, sframes _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()) { + if (_midi_thru && _session.transport_speed() != 0.0f && _input->n_ports().n_midi()) { buf.merge_in_place (_input->midi(0)->get_midi_buffer(nframes)); } }