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
ac4080a1
Commit
ac4080a1
authored
Jan 04, 2017
by
Jacob Walser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add vertical separator for video recording button
parent
ab086355
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
23 deletions
+32
-23
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+1
-1
MainToolBarIndicators.qml
src/ui/toolbar/MainToolBarIndicators.qml
+31
-22
No files found.
src/VideoStreaming/VideoReceiver.cc
View file @
ac4080a1
...
...
@@ -70,7 +70,7 @@ GstPadProbeReturn VideoReceiver::_unlinkCB(GstPad* pad, GstPadProbeInfo* info, g
return
GST_PAD_PROBE_OK
;
// 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
gst_element_release_request_pad
(
_tee
,
_sink
->
teepad
);
...
...
src/ui/toolbar/MainToolBarIndicators.qml
View file @
ac4080a1
...
...
@@ -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
QGCLabel
{
...
...
@@ -563,6 +541,37 @@ Item {
onClicked
:
flightModesMenu
.
popup
()
}
}
// 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
Image
{
...
...
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