Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qgroundcontrol
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

246f2d4b

Commit 246f2d4b authored 7 years ago by Gus Grubba Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #5318 from dogmaphobic/videoReceiver

Decouple VideoReceiver from VideoManager.

parents bbc7bfae 5fb20787

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/FlightDisplay/FlightDisplayView.qml 1 addition, 1 deletion

src/FlightDisplay/FlightDisplayView.qml
src/FlightDisplay/FlightDisplayViewVideo.qml 6 additions, 6 deletions

src/FlightDisplay/FlightDisplayViewVideo.qml
src/FlightDisplay/VideoManager.cc 27 additions, 95 deletions

src/FlightDisplay/VideoManager.cc
src/FlightDisplay/VideoManager.h 9 additions, 35 deletions

src/FlightDisplay/VideoManager.h
src/QGCApplication.cc 0 additions, 2 deletions

src/QGCApplication.cc
src/VideoStreaming/VideoReceiver.cc 128 additions, 28 deletions

src/VideoStreaming/VideoReceiver.cc
src/VideoStreaming/VideoReceiver.h 59 additions, 41 deletions

src/VideoStreaming/VideoReceiver.h
src/ui/MainWindowInner.qml 7 additions, 0 deletions

src/ui/MainWindowInner.qml

with 237 additions and 208 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment