diff options
| author | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2017-11-15 17:03:17 +0100 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2018-08-30 10:28:42 +0000 |
| commit | 72536fa39c71b32f963322a8aa0c1dee320102fc (patch) | |
| tree | a32ce84044137c15ce567f3f60f1251f4ac6a521 /src/plugins/directshow | |
| parent | ec597d89320dd312382457a711ebddb085b16a59 (diff) | |
Do not use QMediaResource internally
Removed usage of QMediaResource internally, since it is going to be deprecated.
Task-number: QTBUG-28850
Change-Id: I476ae11ac58215aa4df4a76abb0cec3aa44f206a
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/plugins/directshow')
| -rw-r--r-- | src/plugins/directshow/player/directshowplayerservice.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/directshow/player/directshowplayerservice.h | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 63635b059..abbbd4b49 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -297,7 +297,7 @@ void DirectShowPlayerService::load(const QMediaContent &media, QIODevice *stream if (m_graph) releaseGraph(); - m_resources = media.resources(); + m_url = media.canonicalUrl(); m_stream = stream; m_error = QMediaPlayer::NoError; m_errorString = QString(); @@ -312,11 +312,9 @@ void DirectShowPlayerService::load(const QMediaContent &media, QIODevice *stream m_dontCacheNextSeekResult = false; m_metaDataControl->reset(); - if (m_resources.isEmpty() && !stream) { + if (m_url.isEmpty() && !stream) { m_pendingTasks = 0; m_graphStatus = NoMedia; - - m_url.clear(); } else if (stream && (!stream->isReadable() || stream->isSequential())) { m_pendingTasks = 0; m_graphStatus = InvalidMedia; @@ -348,9 +346,6 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker) { IBaseFilter *source = 0; - QMediaResource resource = m_resources.takeFirst(); - m_url = resource.url(); - HRESULT hr = E_FAIL; if (m_url.scheme() == QLatin1String("http") || m_url.scheme() == QLatin1String("https")) { static const GUID clsid_WMAsfReader = { @@ -403,7 +398,7 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker) m_pendingTasks |= SetRate; m_source = source; - } else if (!m_resources.isEmpty()) { + } else if (!m_url.isEmpty()) { m_pendingTasks |= SetUrlSource; } else { m_graphStatus = InvalidMedia; diff --git a/src/plugins/directshow/player/directshowplayerservice.h b/src/plugins/directshow/player/directshowplayerservice.h index 01d05449e..de71a6fdf 100644 --- a/src/plugins/directshow/player/directshowplayerservice.h +++ b/src/plugins/directshow/player/directshowplayerservice.h @@ -224,7 +224,6 @@ private: qint64 m_duration; QMediaTimeRange m_playbackRange; QUrl m_url; - QMediaResourceList m_resources; QString m_errorString; QMutex m_mutex; bool m_buffering; |