Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
76b6b9de
Unverified
Commit
76b6b9de
authored
Feb 04, 2020
by
Gus Grubba
Committed by
GitHub
Feb 04, 2020
Browse files
Merge pull request #8269 from tcanabrava/remove_unused_gstreamer_code
Remove unused function
parents
036e7a96
09b86a77
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/QGCApplication.cc
View file @
76b6b9de
...
@@ -455,7 +455,6 @@ void QGCApplication::_shutdown()
...
@@ -455,7 +455,6 @@ void QGCApplication::_shutdown()
// Close out all Qml before we delete toolbox. This way we don't get all sorts of null reference complaints from Qml.
// Close out all Qml before we delete toolbox. This way we don't get all sorts of null reference complaints from Qml.
delete
_qmlAppEngine
;
delete
_qmlAppEngine
;
shutdownVideoStreaming
();
delete
_toolbox
;
delete
_toolbox
;
}
}
...
...
src/VideoStreaming/VideoStreaming.cc
View file @
76b6b9de
...
@@ -173,19 +173,3 @@ void initializeVideoStreaming(int &argc, char* argv[], char* logpath, char* debu
...
@@ -173,19 +173,3 @@ void initializeVideoStreaming(int &argc, char* argv[], char* logpath, char* debu
qmlRegisterType
<
VideoItem
>
(
"QGroundControl.QgcQtGStreamer"
,
1
,
0
,
"VideoItem"
);
qmlRegisterType
<
VideoItem
>
(
"QGroundControl.QgcQtGStreamer"
,
1
,
0
,
"VideoItem"
);
qmlRegisterUncreatableType
<
VideoSurface
>
(
"QGroundControl.QgcQtGStreamer"
,
1
,
0
,
"VideoSurface"
,
QStringLiteral
(
"VideoSurface from QML is not supported"
));
qmlRegisterUncreatableType
<
VideoSurface
>
(
"QGroundControl.QgcQtGStreamer"
,
1
,
0
,
"VideoSurface"
,
QStringLiteral
(
"VideoSurface from QML is not supported"
));
}
}
void
shutdownVideoStreaming
()
{
/* From: http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-Gst.html#gst-deinit
*
* "It is normally not needed to call this function in a normal application as the resources will automatically
* be freed when the program terminates. This function is therefore mostly used by testsuites and other memory
* profiling tools."
*
* It's causing a hang on exit. It hangs while deleting some thread.
*
#if defined(QGC_GST_STREAMING)
gst_deinit();
#endif
*/
}
src/VideoStreaming/VideoStreaming.h
View file @
76b6b9de
...
@@ -17,5 +17,5 @@
...
@@ -17,5 +17,5 @@
#pragma once
#pragma once
extern
void
initializeVideoStreaming
(
int
&
argc
,
char
*
argv
[],
char
*
filename
,
char
*
debuglevel
);
extern
void
initializeVideoStreaming
(
int
&
argc
,
char
*
argv
[],
char
*
filename
,
char
*
debuglevel
);
extern
void
shutdownVideoStreaming
();
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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