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
2e25ca9c
Commit
2e25ca9c
authored
Jul 06, 2015
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Linux Build
parent
4b4f758b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
11 deletions
+11
-11
QGCApplication.cc
src/QGCApplication.cc
+2
-2
VideoItem.cc
src/VideoStreaming/VideoItem.cc
+2
-2
VideoItem.h
src/VideoStreaming/VideoItem.h
+1
-1
VideoStreaming.pri
src/VideoStreaming/VideoStreaming.pri
+1
-1
VideoSurface.cc
src/VideoStreaming/VideoSurface.cc
+1
-1
VideoSurface_p.h
src/VideoStreaming/VideoSurface_p.h
+2
-2
FlightDisplay.cc
src/ui/flightdisplay/FlightDisplay.cc
+2
-2
No files found.
src/QGCApplication.cc
View file @
2e25ca9c
...
...
@@ -41,8 +41,8 @@
#include <QDebug>
#if defined(QGC_GST_STREAMING)
#include <
videoi
tem.h>
#include <
videos
urface.h>
#include <
VideoI
tem.h>
#include <
VideoS
urface.h>
G_BEGIN_DECLS
GST_PLUGIN_STATIC_DECLARE
(
QTVIDEOSINK_NAME
);
G_END_DECLS
...
...
src/VideoStreaming/VideoItem.cc
View file @
2e25ca9c
...
...
@@ -31,8 +31,8 @@ This file is part of the QGROUNDCONTROL project
#include <QtQuick/QSGNode>
#include <QtQuick/QSGFlatColorMaterial>
#include "
videoi
tem.h"
#include "
videos
urface_p.h"
#include "
VideoI
tem.h"
#include "
VideoS
urface_p.h"
struct
VideoItem
::
Private
{
...
...
src/VideoStreaming/VideoItem.h
View file @
2e25ca9c
...
...
@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
#define VIDEO_ITEM_H
#include <QtQuick/QQuickItem>
#include "
videos
urface.h"
#include "
VideoS
urface.h"
class
VideoItem
:
public
QQuickItem
{
...
...
src/VideoStreaming/VideoStreaming.pri
View file @
2e25ca9c
...
...
@@ -29,7 +29,7 @@ LinuxBuild {
packagesExist(gstreamer-1.0) {
message("Including support for video streaming")
DEFINES += QGC_GST_STREAMING
PKGCONFIG += gstreamer-1.0
PKGCONFIG += gstreamer-1.0
gstreamer-video-1.0
CONFIG += VideoEnabled
}
} else:MacBuild {
...
...
src/VideoStreaming/VideoSurface.cc
View file @
2e25ca9c
...
...
@@ -27,7 +27,7 @@ This file is part of the QGROUNDCONTROL project
* @author Gus Grubba <mavlink@grubba.com>
*/
#include "
videos
urface_p.h"
#include "
VideoS
urface_p.h"
#include <QtCore/QDebug>
#include <QtQuick/QQuickItem>
...
...
src/VideoStreaming/
videos
urface_p.h
→
src/VideoStreaming/
VideoS
urface_p.h
View file @
2e25ca9c
...
...
@@ -30,8 +30,8 @@ This file is part of the QGROUNDCONTROL project
#ifndef VIDEO_SURFACE_P_H
#define VIDEO_SURFACE_P_H
#include "
videos
urface.h"
#include "
videoi
tem.h"
#include "
VideoS
urface.h"
#include "
VideoI
tem.h"
class
VideoSurfacePrivate
{
...
...
src/ui/flightdisplay/FlightDisplay.cc
View file @
2e25ca9c
...
...
@@ -32,8 +32,8 @@ This file is part of the QGROUNDCONTROL project
#include <QSettings>
#if defined(QGC_GST_STREAMING)
#include <
videoi
tem.h>
#include <
videos
urface.h>
#include <
VideoI
tem.h>
#include <
VideoS
urface.h>
#include "VideoReceiver.h"
#endif
...
...
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