possible fix for MTC slaving

git-svn-id: svn://localhost/ardour2/trunk@1498 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index d7c56975cb0a1d7b457a919fdefefdc9ff34492a..40bf23d26204a4c8b61882dc4a27c73807e4ed32 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -146,6 +146,8 @@ static const char* authors[] = {
        N_("Robert Jordens"),
        N_("Brian Ahr"),
        N_("Nimal Ratnayake"),
+       N_("Mike Taht"),
+       N_("John Anderson"),
        0
 };
 

diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index d4a7e2f22a861a667fa1966b722351a2cf234ac4..0c05fe58dd9e41aa2bfbad35b01bbc3b3b514b22 100644 (file)
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -70,6 +70,7 @@ class MTC_Slave : public Slave, public sigc::trackable {
        Session&    session;
        MIDI::Port* port;
        std::vector<sigc::connection> connections;
+       bool        can_notify_on_unknown_rate;
 
        struct SafeTime {
 

diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index d241636785008bee2a830344aed0a6e5dda15fbb..a86a3e9014d2da79aca68ab43c4341f166cdc386 100644 (file)
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -41,6 +41,8 @@ using namespace PBD;
 MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p) 
        : session (s)
 {
+       can_notify_on_unknown_rate = true;
+
        rebind (p);
        reset ();
 }
@@ -93,8 +95,39 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full)
        smpte.minutes = msg[2];
        smpte.seconds = msg[1];
        smpte.frames = msg[0];
-       
-       session.smpte_to_sample( smpte, mtc_frame, true, false );
+
+       switch (msg[4]) {
+       case MTC_24_FPS:
+               smpte.rate = 24;
+               smpte.drop = false;
+               can_notify_on_unknown_rate = true;
+               break;
+       case MTC_25_FPS:
+               smpte.rate = 25;
+               smpte.drop = false;
+               can_notify_on_unknown_rate = true;
+               break;
+       case MTC_30_FPS_DROP:
+               smpte.rate = 30;
+               smpte.drop = true;
+               can_notify_on_unknown_rate = true;
+               break;
+       case MTC_30_FPS:
+               smpte.rate = 30;
+               smpte.drop = false;
+               can_notify_on_unknown_rate = true;
+               break;
+       default:
+               /* throttle error messages about unknown MTC rates */
+               if (can_notify_on_unknown_rate) {
+                       error << _("Unknown rate/drop value in incoming MTC stream, session values used instead") << endmsg;
+                       can_notify_on_unknown_rate = false;
+               }
+               smpte.rate = session.smpte_frames_per_second();
+               smpte.drop = session.smpte_drop_frames();
+       }
+
+       session.smpte_to_sample (smpte, mtc_frame, true, false);
        
        if (was_full) {
                

diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc
index 19fdb1fabd510b82ff164b0936c43faf884619eb..1da9ae6e36550d311e13b42957a9b26e7e09df2f 100644 (file)
--- a/libs/midi++2/mtc.cc
+++ b/libs/midi++2/mtc.cc
@@ -36,7 +36,7 @@ using namespace MIDI;
 bool
 Parser::possible_mtc (byte *sysex_buf, size_t msglen)
 {
-       byte fake_mtc_time[4];
+       byte fake_mtc_time[5];
 
        if (msglen != 10 || sysex_buf[0] != 0xf0 || sysex_buf[1] != 0x7f || sysex_buf[3] != 0x01 || sysex_buf[4] != 0x01) {
                return false;
@@ -50,7 +50,9 @@ Parser::possible_mtc (byte *sysex_buf, size_t msglen)
        fake_mtc_time[3] = (sysex_buf[5] & 0x1f); // hours
        
        _mtc_fps = MTC_FPS ((sysex_buf[5] & 0x60) >> 5); // fps
-       
+
+       fake_mtc_time[4] = (byte) _mtc_fps;
+
        /* wait for first quarter frame, which could indicate forwards
           or backwards ...
        */