Merge pull request #3986 from dogmaphobic/cameraOff

Turn camera off when not in use.
9 years ago · 5fc24cfa81
2 changed files with 7 additions and 1 deletions
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@ -206,6 +206,12 @@ QGCView {
				@@ -206,6 +206,12 @@ QGCView {
                    anchors.fill:   parent
                    visible:        !QGroundControl.videoManager.isGStreamer
                }
+                onVisibleChanged: {
+                    if(visible)
+                        camera.start()
+                    else
+                        camera.stop()
+                }
            }
        }

--- a/src/FlightDisplay/VideoManager.h
+++ b/src/FlightDisplay/VideoManager.h
@ -31,7 +31,7 @@ public:
				@@ -31,7 +31,7 @@ public:

    Q_PROPERTY(bool             hasVideo        READ    hasVideo                                NOTIFY hasVideoChanged)
    Q_PROPERTY(bool             isGStreamer     READ    isGStreamer                             NOTIFY isGStreamerChanged)
-    Q_PROPERTY(QString          videoSourceID   READ    videoSource                             NOTIFY videoSourceIDChanged)
+    Q_PROPERTY(QString          videoSourceID   READ    videoSourceID                           NOTIFY videoSourceIDChanged)
    Q_PROPERTY(QString          videoSource     READ    videoSource     WRITE setVideoSource    NOTIFY videoSourceChanged)
    Q_PROPERTY(QStringList      videoSourceList READ    videoSourceList                         NOTIFY videoSourceListChanged)
    Q_PROPERTY(bool             videoRunning    READ    videoRunning                            NOTIFY videoRunningChanged)