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/avfoundation/mediaplayer | |
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/avfoundation/mediaplayer')
-rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm index 2309221c2..3b3f47a43 100644 --- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm +++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm @@ -491,7 +491,7 @@ const QIODevice *AVFMediaPlayerSession::mediaStream() const void AVFMediaPlayerSession::setMedia(const QMediaContent &content, QIODevice *stream) { #ifdef QT_DEBUG_AVF - qDebug() << Q_FUNC_INFO << content.canonicalUrl(); + qDebug() << Q_FUNC_INFO << content.request().url(); #endif [static_cast<AVFMediaPlayerSessionObserver*>(m_observer) unloadMedia]; @@ -508,7 +508,7 @@ void AVFMediaPlayerSession::setMedia(const QMediaContent &content, QIODevice *st const QMediaPlayer::MediaStatus oldMediaStatus = m_mediaStatus; const QMediaPlayer::State oldState = m_state; - if (content.isNull() || content.canonicalUrl().isEmpty()) { + if (content.isNull() || content.request().url().isEmpty()) { m_mediaStatus = QMediaPlayer::NoMedia; if (m_mediaStatus != oldMediaStatus) Q_EMIT mediaStatusChanged(m_mediaStatus); @@ -526,7 +526,7 @@ void AVFMediaPlayerSession::setMedia(const QMediaContent &content, QIODevice *st //Load AVURLAsset //initialize asset using content's URL - NSString *urlString = [NSString stringWithUTF8String:content.canonicalUrl().toEncoded().constData()]; + NSString *urlString = [NSString stringWithUTF8String:content.request().url().toEncoded().constData()]; NSURL *url = [NSURL URLWithString:urlString]; [static_cast<AVFMediaPlayerSessionObserver*>(m_observer) setURL:url]; |