summaryrefslogtreecommitdiffstats
path: root/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h')
-rw-r--r--src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h b/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h
index 48e939f82..682d9093b 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h
+++ b/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h
@@ -62,7 +62,7 @@ class QFFmpegMediaPlayer;
namespace QFFmpeg
{
-class PlaybackEngine : public QObject, protected MediaDataHolder
+class PlaybackEngine : public QObject, public MediaDataHolder
{
Q_OBJECT
public:
@@ -100,17 +100,8 @@ public:
using MediaDataHolder::activeTrack;
- bool isSeekable() const;
-
qint64 currentPosition() const;
- // To be removed after aligning with Decoder
- using MediaDataHolder::m_currentAVStreamIndex;
- using MediaDataHolder::m_duration;
- using MediaDataHolder::m_metaData;
- using MediaDataHolder::m_requestedStreams;
- using MediaDataHolder::m_streamMap;
-
signals:
void endOfStream();
void errorOccured(int, const QString &);