Unverified Commit cf881a96 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #8251 from patrickelectric/video_enable

VideoPageWidget: Enable camera control if using gstreamer
parents b8000343 2c773fcc
...@@ -99,12 +99,12 @@ Item { ...@@ -99,12 +99,12 @@ Item {
//-- Video Fit //-- Video Fit
QGCLabel { QGCLabel {
text: qsTr("Video Screen Fit") text: qsTr("Video Screen Fit")
visible: !_camera || !_camera.autoStream visible: QGroundControl.videoManager.isGStreamer
font.pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
} }
FactComboBox { FactComboBox {
fact: QGroundControl.settingsManager.videoSettings.videoFit fact: QGroundControl.settingsManager.videoSettings.videoFit
visible: !_camera || !_camera.autoStream visible: QGroundControl.videoManager.isGStreamer
indexModel: false indexModel: false
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
} }
...@@ -112,7 +112,7 @@ Item { ...@@ -112,7 +112,7 @@ Item {
QGCLabel { QGCLabel {
text: _recordingVideo ? qsTr("Stop Recording") : qsTr("Record Stream") text: _recordingVideo ? qsTr("Stop Recording") : qsTr("Record Stream")
font.pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
visible: (!_camera || !_camera.autoStream) && QGroundControl.settingsManager.videoSettings.showRecControl.rawValue visible: QGroundControl.videoManager.isGStreamer
} }
// Button to start/stop video recording // Button to start/stop video recording
Item { Item {
...@@ -120,7 +120,7 @@ Item { ...@@ -120,7 +120,7 @@ Item {
height: ScreenTools.defaultFontPixelHeight * 2 height: ScreenTools.defaultFontPixelHeight * 2
width: height width: height
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
visible: (!_camera || !_camera.autoStream) && QGroundControl.settingsManager.videoSettings.showRecControl.rawValue visible: QGroundControl.videoManager.isGStreamer
Rectangle { Rectangle {
id: recordBtnBackground id: recordBtnBackground
anchors.top: parent.top anchors.top: parent.top
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment