ardour/livetrax
13
0
Fork 0
Code

only use HUI heartbeat with HUI devices

Browse Source
This commit is contained in:
Paul Davis 2015-10-05 12:23:51 -04:00
parent 9037e719d0
commit 33d614359a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -428,13 +428,6 @@ MackieControlProtocol::set_active (bool yn)
redisplay_connection = redisplay_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::redisplay));
redisplay_timeout->attach (main_loop()->get_context());
if (_device_info.device_type() == DeviceInfo::HUI) {
Glib::RefPtr<Glib::TimeoutSource> hui_timeout = Glib::TimeoutSource::create (1000); // milliseconds
hui_connection = hui_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::hui_heartbeat));
hui_timeout->attach (main_loop()->get_context());
}
} else {
BaseUI::quit ();
@ -711,6 +704,13 @@ MackieControlProtocol::set_device (const string& device_name)
}
clear_surfaces ();
hui_connection.disconnect ();
if (_device_info.device_type() == DeviceInfo::HUI) {
Glib::RefPtr<Glib::TimeoutSource> hui_timeout = Glib::TimeoutSource::create (1000); // milliseconds
hui_connection = hui_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::hui_heartbeat));
hui_timeout->attach (main_loop()->get_context());
}
if (create_surfaces ()) {
return -1;