LTC Slave, add support for variable framerates

[ardour.git] / libs / surfaces / mackie / mackie_control_protocol.cc

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index ed894c2e8a76508d804f6ff6096b69c62acba8af..3791252ade0bf651599db8e472e6e206ca26b168 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -124,18 +124,22 @@ MackieControlProtocol::MackieControlProtocol (Session& session)
 
 MackieControlProtocol::~MackieControlProtocol()
 {
-       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol\n");
+       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol init\n");
        
+       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol drop_connections ()\n");
        drop_connections ();
+
+       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol tear_down_gui ()\n");
        tear_down_gui ();
 
        _active = false;
 
        /* stop event loop */
-
+       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol BaseUI::quit ()\n");
        BaseUI::quit ();
 
        try {
+               DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol close()\n");
                close();
        }
        catch (exception & e) {
@@ -145,9 +149,9 @@ MackieControlProtocol::~MackieControlProtocol()
                cout << "~MackieControlProtocol caught unknown" << endl;
        }
 
-       DEBUG_TRACE (DEBUG::MackieControl, "finished ~MackieControlProtocol::MackieControlProtocol\n");
-
        _instance = 0;
+
+       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::~MackieControlProtocol done\n");
 }
 
 void
@@ -371,6 +375,8 @@ MackieControlProtocol::switch_banks (uint32_t initial, bool force)
 int 
 MackieControlProtocol::set_active (bool yn)
 {
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose("MackieControlProtocol::set_active init with yn: '%1'\n", yn));
+
        if (yn == _active) {
                return 0;
        }
@@ -401,6 +407,8 @@ MackieControlProtocol::set_active (bool yn)
 
        }
 
+       DEBUG_TRACE (DEBUG::MackieControl, string_compose("MackieControlProtocol::set_active done with yn: '%1'\n", yn));
+
        return 0;
 }
 
@@ -679,7 +687,7 @@ MackieControlProtocol::close()
 XMLNode& 
 MackieControlProtocol::get_state()
 {
-       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::get_state\n");
+       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::get_state init\n");
        char buf[16];
 
        // add name of protocol
@@ -697,6 +705,8 @@ MackieControlProtocol::get_state()
        node->add_property (X_("device-profile"), _device_profile.name());
        node->add_property (X_("device-name"), _device_info.name());
 
+       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::get_state done\n");
+
        return *node;
 }
 
@@ -707,7 +717,7 @@ MackieControlProtocol::set_state (const XMLNode & node, int /*version*/)
 
        int retval = 0;
        const XMLProperty* prop;
-       uint32_t bank;
+       uint32_t bank = 0;
        bool active = _active;
 
        if ((prop = node.property (X_("ipmidi-base"))) != 0) {
@@ -737,6 +747,8 @@ MackieControlProtocol::set_state (const XMLNode & node, int /*version*/)
                switch_banks (bank, true);
        }
 
+       DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::set_state done\n");
+
        return retval;
 }
 
@@ -777,12 +789,12 @@ MackieControlProtocol::format_timecode_timecode (framepos_t now_frame)
        // digits: 888/88/88/888
        // Timecode mode: Hours/Minutes/Seconds/Frames
        ostringstream os;
-       os << ' ';
        os << setw(2) << setfill('0') << timecode.hours;
+       os << ' ';
        os << setw(2) << setfill('0') << timecode.minutes;
        os << setw(2) << setfill('0') << timecode.seconds;
-       os << setw(2) << setfill('0') << timecode.frames;
        os << ' ';
+       os << setw(2) << setfill('0') << timecode.frames;
 
        return os.str();
 }