diff options
author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-04-24 10:56:24 +0200 |
---|---|---|
committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-05-13 09:42:53 +0000 |
commit | 5ed9d1d830b90c5d5093cc7ca4a5c7cd5b15240c (patch) | |
tree | a316240590730ef6f7b8625e71b95fd0d5c2835a /src/plugins/android/src | |
parent | f0f354f2a1eec54733c871bf735f67e0c4ea945c (diff) |
Deprecate canonicalUrl and canonicalRequest in QMediaContent
Since QMediaContent can contain only one content
and media resources are already deprecated,
canonicalUrl and canonicalRequest are a bit confusing and outdated.
Deprecated and replaced by QMediaContent::request() which already contains the url.
Change-Id: I418006e112f49466b0129bf1e6e1ae629c714538
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'src/plugins/android/src')
-rw-r--r-- | src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp | 2 | ||||
-rw-r--r-- | src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp index 13a8cdbbb..82250b654 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp +++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp @@ -384,7 +384,7 @@ void QAndroidMediaPlayerControl::setMedia(const QMediaContent &mediaContent, if ((mMediaPlayer->display() == 0) && mVideoOutput) mMediaPlayer->setDisplay(mVideoOutput->surfaceTexture()); - mMediaPlayer->setDataSource(mediaContent.canonicalRequest()); + mMediaPlayer->setDataSource(mediaContent.request()); mMediaPlayer->prepareAsync(); } diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp index 1185e63dc..ef86af896 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp +++ b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp @@ -126,7 +126,7 @@ void QAndroidMetaDataReaderControl::onUpdateMetaData() if (m_mediaContent.isNull()) return; - const QUrl &url = m_mediaContent.canonicalUrl(); + const QUrl &url = m_mediaContent.request().url(); QtConcurrent::run(&extractMetadata, this, url); } @@ -134,7 +134,7 @@ void QAndroidMetaDataReaderControl::updateData(const QVariantMap &metadata, cons { const QMutexLocker l(&m_mtx); - if (m_mediaContent.canonicalUrl() != url) + if (m_mediaContent.request().url() != url) return; const bool oldAvailable = m_available; |