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
95699d00
Commit
95699d00
authored
Feb 26, 2017
by
Don Gagne
Committed by
GitHub
Feb 26, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4631 from DonLakeFlyer/VideoSourceSignal
Handle videoSource changes correctly
parents
418631ac
141b4285
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
VideoManager.cc
src/FlightDisplay/VideoManager.cc
+7
-0
VideoManager.h
src/FlightDisplay/VideoManager.h
+3
-1
No files found.
src/FlightDisplay/VideoManager.cc
View file @
95699d00
...
...
@@ -56,6 +56,7 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
_videoSettings
=
toolbox
->
settingsManager
()
->
videoSettings
();
QString
videoSource
=
_videoSettings
->
videoSource
()
->
rawValue
().
toString
();
connect
(
_videoSettings
->
videoSource
(),
&
Fact
::
rawValueChanged
,
this
,
&
VideoManager
::
_videoSourceChanged
);
#if defined(QGC_GST_STREAMING)
#ifndef QGC_DISABLE_UVC
...
...
@@ -91,6 +92,12 @@ VideoManager::setToolbox(QGCToolbox *toolbox)
#endif
}
void
VideoManager
::
_videoSourceChanged
(
void
)
{
emit
hasVideoChanged
();
emit
isGStreamerChanged
();
}
//-----------------------------------------------------------------------------
bool
VideoManager
::
hasVideo
()
...
...
src/FlightDisplay/VideoManager.h
View file @
95699d00
...
...
@@ -67,11 +67,13 @@ signals:
void
isGStreamerChanged
();
void
videoSourceIDChanged
();
private
slots
:
void
_videoSourceChanged
(
void
);
private:
void
_updateTimer
();
void
_updateVideo
();
private:
VideoSurface
*
_videoSurface
;
VideoReceiver
*
_videoReceiver
;
bool
_videoRunning
;
...
...
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