more MIDI I/O debugging output
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 19 Jul 2011 11:57:09 +0000 (11:57 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 19 Jul 2011 11:57:09 +0000 (11:57 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@9901 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/butler.cc
libs/ardour/midi_source.cc
libs/ardour/smf_source.cc

index ad31c71e1527f85864bd8e6b4c93a26c926df0e1..46bb830cbe19717070dc9e5a7f99754c0a1921e9 100644 (file)
@@ -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;
                        }
index 56d31ddee7673dd5dd2d484810da45321aac9852..404ac3a73d3cdbda4f8df5388654b53bae18c02c 100644 (file)
@@ -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
index 9078a17608aaad0c2a7eebb002a2dd66cdf37e0a..7d90b5885992543fdd8c7017e2122335ab8e7345 100644 (file)
@@ -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));