summaryrefslogtreecommitdiffstats
path: root/src/gsttools/qgstreamerplayersession_p.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-02 03:01:36 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-02 03:01:37 +0100
commit8ca9765dabfd27d7c511e21e6862b24e46c2bf40 (patch)
tree58656a3b756c8f0581a9ca3161052b007f7096da /src/gsttools/qgstreamerplayersession_p.h
parentc877776c354a625373e1dc0f38ac4918da9a056f (diff)
parentdee506f70536dd10f3e00c42f685ead9283433b9 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'src/gsttools/qgstreamerplayersession_p.h')
-rw-r--r--src/gsttools/qgstreamerplayersession_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gsttools/qgstreamerplayersession_p.h b/src/gsttools/qgstreamerplayersession_p.h
index 447b9816a..b613793c4 100644
--- a/src/gsttools/qgstreamerplayersession_p.h
+++ b/src/gsttools/qgstreamerplayersession_p.h
@@ -94,7 +94,6 @@ public:
virtual ~QGstreamerPlayerSession();
GstElement *playbin() const;
- void setPipeline(GstElement *pipeline);
GstElement *pipeline() const { return m_pipeline; }
QGstreamerBusHelper *bus() const { return m_busHelper; }
@@ -178,6 +177,7 @@ signals:
void invalidMedia();
void playbackRateChanged(qreal);
void rendererChanged();
+ void pipelineChanged();
private slots:
void getStreamsInfo();
@@ -208,6 +208,7 @@ private:
void addAudioBufferProbe();
void flushVideoProbes();
void resumeVideoProbes();
+ void setPipeline(GstElement *pipeline);
QNetworkRequest m_request;
QMediaPlayer::State m_state;