Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
03df3df4
Commit
03df3df4
authored
Dec 27, 2018
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle video support along with overall Taisync support.
parent
6f1cc0e2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
TaisyncManager.cc
src/Taisync/TaisyncManager.cc
+3
-4
No files found.
src/Taisync/TaisyncManager.cc
View file @
03df3df4
...
...
@@ -98,9 +98,6 @@ TaisyncManager::_reset()
connect
(
_appSettings
->
enableTaisyncVideo
(),
&
Fact
::
rawValueChanged
,
this
,
&
TaisyncManager
::
_setVideoEnabled
);
}
_setEnabled
();
if
(
_enabled
)
{
_setVideoEnabled
();
}
}
//-----------------------------------------------------------------------------
...
...
@@ -309,13 +306,15 @@ TaisyncManager::_setEnabled()
_close
();
}
_enabled
=
enable
;
//-- Now handle video support
_setVideoEnabled
();
}
//-----------------------------------------------------------------------------
void
TaisyncManager
::
_setVideoEnabled
()
{
bool
enable
=
_appSettings
->
enableTaisyncVideo
()
->
rawValue
().
toBool
();
bool
enable
=
_appSettings
->
enableTaisyncVideo
()
->
rawValue
().
toBool
()
&&
_appSettings
->
enableTaisync
()
->
rawValue
().
toBool
()
;
if
(
enable
)
{
if
(
!
_savedVideoSource
.
isValid
())
{
//-- Hide video selection as we will be fixed to Taisync video and set the way we need it.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment