diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-25 03:00:30 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-25 03:00:30 +0200 |
commit | a7e9a8e00703b1805b5e44e83b1e9e7cfaf84785 (patch) | |
tree | 0d144aff2688de8c52049ba94d60f32f30bf33a6 /src | |
parent | 0c9bc813c6dabbed8d57843ad1e7ea21fe1008f1 (diff) | |
parent | 0edc032bd8ac3a68c56e1d6b6e07d524c9c152f2 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h index f6e0ef3bf..7a268a3d9 100644 --- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h +++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h @@ -125,43 +125,6 @@ Q_SIGNALS: void error(int error, const QString &errorString); private: - class ResourceHandler { - public: - ResourceHandler() : resource(nullptr) {} - ~ResourceHandler() { clear(); } - void setResourceFile(const QString &file) { - if (resource) { - if (resource->fileName() == file) - return; - delete resource; - rawData.clear(); - } - resource = new QResource(file); - } - bool isValid() const { return resource && resource->isValid() && resource->data() != nullptr; } - const uchar *data() { - if (!isValid()) - return nullptr; - if (resource->isCompressed()) { - if (rawData.size() == 0) - rawData = qUncompress(resource->data(), resource->size()); - return (const uchar *)rawData.constData(); - } - return resource->data(); - } - qint64 size() { - if (data() == nullptr) - return 0; - return resource->isCompressed() ? rawData.size() : resource->size(); - } - void clear() { - delete resource; - rawData.clear(); - } - QResource *resource; - QByteArray rawData; - }; - void setAudioAvailable(bool available); void setVideoAvailable(bool available); void setSeekable(bool seekable); @@ -173,7 +136,6 @@ private: QMediaPlayer::MediaStatus m_mediaStatus; QIODevice *m_mediaStream; QMediaContent m_resources; - ResourceHandler m_resourceHandler; bool m_muted; bool m_tryingAsync; |