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
a457abc9
Commit
a457abc9
authored
Jan 17, 2017
by
Jacob Walser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't declare status accessors if there is no gstreamer support
parent
4ce68a44
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+1
-1
VideoReceiver.h
src/VideoStreaming/VideoReceiver.h
+6
-3
No files found.
src/VideoStreaming/VideoReceiver.cc
View file @
a457abc9
...
@@ -25,12 +25,12 @@ QGC_LOGGING_CATEGORY(VideoReceiverLog, "VideoReceiverLog")
...
@@ -25,12 +25,12 @@ QGC_LOGGING_CATEGORY(VideoReceiverLog, "VideoReceiverLog")
VideoReceiver
::
VideoReceiver
(
QObject
*
parent
)
VideoReceiver
::
VideoReceiver
(
QObject
*
parent
)
:
QObject
(
parent
)
:
QObject
(
parent
)
#if defined(QGC_GST_STREAMING)
,
_running
(
false
)
,
_running
(
false
)
,
_recording
(
false
)
,
_recording
(
false
)
,
_streaming
(
false
)
,
_streaming
(
false
)
,
_starting
(
false
)
,
_starting
(
false
)
,
_stopping
(
false
)
,
_stopping
(
false
)
#if defined(QGC_GST_STREAMING)
,
_sink
(
NULL
)
,
_sink
(
NULL
)
,
_tee
(
NULL
)
,
_tee
(
NULL
)
,
_pipeline
(
NULL
)
,
_pipeline
(
NULL
)
...
...
src/VideoStreaming/VideoReceiver.h
View file @
a457abc9
...
@@ -32,24 +32,27 @@ class VideoReceiver : public QObject
...
@@ -32,24 +32,27 @@ class VideoReceiver : public QObject
{
{
Q_OBJECT
Q_OBJECT
public:
public:
#if defined(QGC_GST_STREAMING)
Q_PROPERTY
(
bool
recording
READ
recording
NOTIFY
recordingChanged
)
Q_PROPERTY
(
bool
recording
READ
recording
NOTIFY
recordingChanged
)
#endif
explicit
VideoReceiver
(
QObject
*
parent
=
0
);
explicit
VideoReceiver
(
QObject
*
parent
=
0
);
~
VideoReceiver
();
~
VideoReceiver
();
#if defined(QGC_GST_STREAMING)
#if defined(QGC_GST_STREAMING)
void
setVideoSink
(
GstElement
*
_sink
);
void
setVideoSink
(
GstElement
*
sink
);
#endif
bool
running
()
{
return
_running
;
}
bool
running
()
{
return
_running
;
}
bool
recording
()
{
return
_recording
;
}
bool
recording
()
{
return
_recording
;
}
bool
streaming
()
{
return
_streaming
;
}
bool
streaming
()
{
return
_streaming
;
}
bool
starting
()
{
return
_starting
;
}
bool
starting
()
{
return
_starting
;
}
bool
stopping
()
{
return
_stopping
;
}
bool
stopping
()
{
return
_stopping
;
}
#endif
signals:
signals:
void
recordingChanged
();
#if defined(QGC_GST_STREAMING)
#if defined(QGC_GST_STREAMING)
void
recordingChanged
();
void
msgErrorReceived
();
void
msgErrorReceived
();
void
msgEOSReceived
();
void
msgEOSReceived
();
void
msgStateChangedReceived
();
void
msgStateChangedReceived
();
...
...
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