more MTC debugging

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

diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index 0dbad54dc50fc898264cd873a3cf9883f39d159b..8cc54d577d6d3dec533f041314ccfff35279d1c9 100644 (file)
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -21,7 +21,9 @@
 #include <poll.h>
 #include <sys/types.h>
 #include <unistd.h>
+
 #include "pbd/error.h"
+#include "pbd/stacktrace.h"
 #include "pbd/enumwriter.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/pthread_utils.h"
@@ -100,6 +102,7 @@ MTC_Slave::rebind (MIDI::Port& p)
 void
 MTC_Slave::update_mtc_qtr (Parser& /*p*/, int which_qtr, nframes_t now)
 {
+       DEBUG_TRACE (DEBUG::MTC, string_compose ("update MTC qtr does a reset, qtr = %1 now = %2\n", which_qtr, now));
        maybe_reset ();
 
        DEBUG_TRACE (DEBUG::MTC, string_compose ("qtr frame %1 at %2\n", which_qtr, now));
@@ -191,8 +194,8 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
                                                         window_begin, window_end, mtc_frame));
                update_mtc_status (MIDI::MTC_Stopped);
                DEBUG_TRACE (DEBUG::MTC, string_compose ("outside, so window root reset to %1\n", mtc_frame));
-               reset_window (mtc_frame);
                reset ();
+               reset_window (mtc_frame);
 
        } else {
                        
@@ -479,6 +482,8 @@ MTC_Slave::resolution() const
 void
 MTC_Slave::queue_reset ()
 {
+       DEBUG_TRACE (DEBUG::MTC, "queue reset of MTC slave state\n");
+       PBD::stacktrace (cerr, 35);
        Glib::Mutex::Lock lm (reset_lock);
        reset_pending++;
 }
@@ -500,6 +505,8 @@ MTC_Slave::maybe_reset ()
 void
 MTC_Slave::reset ()
 {
+       DEBUG_TRACE (DEBUG::MTC, "*****************\n\n\n MTC SLAVE reset ********************\n\n\n");
+       PBD::stacktrace (cerr, 35);
        port->input()->reset_mtc_state ();
 
        last_inbound_frame = 0;
@@ -534,16 +541,17 @@ MTC_Slave::reset_window (nframes64_t root)
 
        switch (port->input()->mtc_running()) {
        case MTC_Forward:
+               DEBUG_TRACE (DEBUG::MTC, "set MTC window while running forward\n");
                window_begin = root;
                if (session.slave_state() == Session::Running) {
                        window_end = root + (session.frames_per_timecode_frame() * frame_tolerance);
                } else {
                        window_end = root + seekahead_distance ();
                }
-               DEBUG_TRACE (DEBUG::MTC, string_compose ("legal MTC window now %1 .. %2\n", window_begin, window_end));
                break;
 
        case MTC_Backward:
+               DEBUG_TRACE (DEBUG::MTC, "set MTC window while running backward\n");
                if (session.slave_state() == Session::Running) {
                        nframes_t d = session.frames_per_timecode_frame() * frame_tolerance;
                        if (root > d) {
@@ -561,13 +569,15 @@ MTC_Slave::reset_window (nframes64_t root)
                        }
                }
                window_end = root;
-               DEBUG_TRACE (DEBUG::MTC, string_compose ("legal MTC window now %1 .. %2\n", window_begin, window_end));
                break;
                
        default:
+               DEBUG_TRACE (DEBUG::MTC, "not touching MTC window - MTC_Stopped\n");
                /* do nothing */
                break;
        }
+
+       DEBUG_TRACE (DEBUG::MTC, string_compose ("legal MTC window now %1 .. %2\n", window_begin, window_end));
 }
 
 nframes64_t