Commit ac4080a1 authored by Jacob Walser's avatar Jacob Walser

Add vertical separator for video recording button

parent ab086355
...@@ -70,7 +70,7 @@ GstPadProbeReturn VideoReceiver::_unlinkCB(GstPad* pad, GstPadProbeInfo* info, g ...@@ -70,7 +70,7 @@ GstPadProbeReturn VideoReceiver::_unlinkCB(GstPad* pad, GstPadProbeInfo* info, g
return GST_PAD_PROBE_OK; return GST_PAD_PROBE_OK;
// Also unlinks and unrefs // Also unlinks and unrefs
gst_bin_remove_many(GST_BIN (_pipeline), _sink->queue, _sink->mux, _sink->filesink, NULL); gst_bin_remove_many(GST_BIN(_pipeline), _sink->queue, _sink->mux, _sink->filesink, NULL);
// Give tee its pad back // Give tee its pad back
gst_element_release_request_pad(_tee, _sink->teepad); gst_element_release_request_pad(_tee, _sink->teepad);
......
...@@ -489,28 +489,6 @@ Item { ...@@ -489,28 +489,6 @@ Item {
} }
} }
//-------------------------------------------------------------------------
//-- Video Recording
Item {
anchors.top: parent.top
anchors.bottom: parent.bottom
width: height
visible: QGroundControl.videoManager.videoRunning
Rectangle {
anchors.top: parent.top
anchors.bottom: parent.bottom
width: height
radius: QGroundControl.videoManager.videoReceiver.recording ? 0 : height
color: colorRed
}
MouseArea {
anchors.fill: parent
onClicked: QGroundControl.videoManager.videoReceiver.recording? QGroundControl.videoManager.videoReceiver.stopRecording() : QGroundControl.videoManager.videoReceiver.startRecording()
}
}
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
//-- Mode Selector //-- Mode Selector
QGCLabel { QGCLabel {
...@@ -563,6 +541,37 @@ Item { ...@@ -563,6 +541,37 @@ Item {
onClicked: flightModesMenu.popup() onClicked: flightModesMenu.popup()
} }
} // QGCLabel - Flight mode selector } // QGCLabel - Flight mode selector
Rectangle {
// anchors.margins: ScreenTools.defaultFontPixelHeight / 2
anchors.top: parent.top
anchors.bottom: parent.bottom
width: 1
color: qgcPal.text
visible: QGroundControl.videoManager.videoRunning
}
//-------------------------------------------------------------------------
//-- Video Recording
Item {
anchors.top: parent.top
anchors.bottom: parent.bottom
width: height
visible: QGroundControl.videoManager.videoRunning
Rectangle {
anchors.top: parent.top
anchors.bottom: parent.bottom
width: height
radius: QGroundControl.videoManager.videoReceiver.recording ? 0 : height
color: colorRed
}
MouseArea {
anchors.fill: parent
onClicked: QGroundControl.videoManager.videoReceiver.recording? QGroundControl.videoManager.videoReceiver.stopRecording() : QGroundControl.videoManager.videoReceiver.startRecording()
}
}
} // Row - Vehicle indicators } // Row - Vehicle indicators
Image { Image {
......
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