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
234e5812
Commit
234e5812
authored
Apr 21, 2020
by
Patrick José Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QGCCameraControl: Remove deprecated function of QTime
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
8300cdc5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
QGCCameraControl.cc
src/Camera/QGCCameraControl.cc
+3
-3
No files found.
src/Camera/QGCCameraControl.cc
View file @
234e5812
...
...
@@ -770,7 +770,7 @@ QGCCameraControl::_setVideoStatus(VideoStatus status)
emit
videoStatusChanged
();
if
(
status
==
VIDEO_CAPTURE_STATUS_RUNNING
)
{
_recordTime
=
0
;
_recTime
.
start
();
_recTime
=
QTime
::
currentTime
();
_recTimer
.
start
();
}
else
{
_recTimer
.
stop
();
...
...
@@ -784,7 +784,7 @@ QGCCameraControl::_setVideoStatus(VideoStatus status)
void
QGCCameraControl
::
_recTimerHandler
()
{
_recordTime
=
static_cast
<
uint32_t
>
(
_recTime
.
elapsed
());
_recordTime
=
static_cast
<
uint32_t
>
(
_recTime
.
msec
());
emit
recordTimeChanged
();
}
...
...
@@ -1524,7 +1524,7 @@ QGCCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap
//-- Do we have recording time?
if
(
cap
.
recording_time_ms
)
{
_recordTime
=
cap
.
recording_time_ms
;
_recTime
=
_recTime
.
addMSecs
(
_recTime
.
elapsed
()
-
static_cast
<
int
>
(
cap
.
recording_time_ms
));
_recTime
=
_recTime
.
addMSecs
(
_recTime
.
msec
()
-
static_cast
<
int
>
(
cap
.
recording_time_ms
));
emit
recordTimeChanged
();
}
//-- Video/Image Capture Status
...
...
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