Browse Source

Handle video support along with overall Taisync support.

QGC4.4
Gus Grubba 6 years ago
parent
commit
03df3df4b2
  1. 7
      src/Taisync/TaisyncManager.cc

7
src/Taisync/TaisyncManager.cc

@ -98,9 +98,6 @@ TaisyncManager::_reset()
connect(_appSettings->enableTaisyncVideo(), &Fact::rawValueChanged, this, &TaisyncManager::_setVideoEnabled); connect(_appSettings->enableTaisyncVideo(), &Fact::rawValueChanged, this, &TaisyncManager::_setVideoEnabled);
} }
_setEnabled(); _setEnabled();
if(_enabled) {
_setVideoEnabled();
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -309,13 +306,15 @@ TaisyncManager::_setEnabled()
_close(); _close();
} }
_enabled = enable; _enabled = enable;
//-- Now handle video support
_setVideoEnabled();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void void
TaisyncManager::_setVideoEnabled() TaisyncManager::_setVideoEnabled()
{ {
bool enable = _appSettings->enableTaisyncVideo()->rawValue().toBool(); bool enable = _appSettings->enableTaisyncVideo()->rawValue().toBool() && _appSettings->enableTaisync()->rawValue().toBool();
if(enable) { if(enable) {
if(!_savedVideoSource.isValid()) { if(!_savedVideoSource.isValid()) {
//-- Hide video selection as we will be fixed to Taisync video and set the way we need it. //-- Hide video selection as we will be fixed to Taisync video and set the way we need it.

Loading…
Cancel
Save