diff options
author | Rodrigo Severo <rodrigo@fabricadeideias.com> | 2012-06-13 03:07:50 +0000 |
---|---|---|
committer | Rodrigo Severo <rodrigo@fabricadeideias.com> | 2012-06-13 03:07:50 +0000 |
commit | 335bf3d21e05a4ba9afc3be803d1cc71b39cc11c (patch) | |
tree | 9560952107d57a4ad89e7eaf73d2ddd1ee1c6043 /libs/surfaces/mackie/mackie_control_protocol.cc | |
parent | 5573b6a049646fd0fe10d4d79f98cf272ee1f107 (diff) |
Prevents a master fader being created without a control at Surface::setup_master_fader;
Several DEBUG_TRACE changes to help identify race conditions;
git-svn-id: svn://localhost/ardour2/branches/3.0@12693 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.cc')
-rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index ed894c2e8a..73d0f2c7fe 100644 --- 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; } @@ -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; } |