summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/ardour/butler.cc5
-rw-r--r--libs/ardour/midi_source.cc3
-rw-r--r--libs/ardour/smf_source.cc2
3 files changed, 7 insertions, 3 deletions
diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index ad31c71e15..46bb830cbe 100644
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -241,15 +241,15 @@ restart:
for (i = rl_with_auditioner.begin(); !transport_work_requested() && should_run && i != rl_with_auditioner.end(); ++i) {
boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+
if (!tr) {
continue;
}
- /* don't read inactive tracks */
-
boost::shared_ptr<IO> io = tr->input ();
if (io && !io->active()) {
+ /* don't read inactive tracks */
continue;
}
@@ -296,6 +296,7 @@ restart:
// cerr << "write behind for " << (*i)->name () << endl;
boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+
if (!tr) {
continue;
}
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 56d31ddee7..404ac3a73d 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -268,6 +268,7 @@ MidiSource::midi_write (MidiRingBuffer<framepos_t>& source, framepos_t source_st
cerr << "MidiSource calling write unlocked\n";
const framecnt_t ret = write_unlocked (source, source_start, duration);
_last_write_end += duration;
+ cerr << name() << " last write end now @ " << _last_write_end << endl;
return ret;
}
@@ -298,6 +299,8 @@ MidiSource::mark_write_starting_now ()
set_timeline_position (_session.transport_frame ());
_last_write_end = _session.transport_frame ();
+ cerr << name() << " last write set to " << _last_write_end << endl;
+
}
void
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 9078a17608..7d90b58859 100644
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -240,7 +240,7 @@ 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));