summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/playback')
-rw-r--r--src/multimedia/playback/qmediacontent.cpp81
-rw-r--r--src/multimedia/playback/qmediacontent.h13
-rw-r--r--src/multimedia/playback/qmedianetworkplaylistprovider_p.h4
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp86
-rw-r--r--src/multimedia/playback/qmediaplaylist.cpp6
-rw-r--r--src/multimedia/playback/qmediaplaylist_p.h12
-rw-r--r--src/multimedia/playback/qmediaplaylistioplugin_p.h2
-rw-r--r--src/multimedia/playback/qmediaplaylistnavigator.cpp2
-rw-r--r--src/multimedia/playback/qmediaplaylistnavigator_p.h2
-rw-r--r--src/multimedia/playback/qmediaplaylistprovider_p.h8
-rw-r--r--src/multimedia/playback/qmediaresource.cpp4
-rw-r--r--src/multimedia/playback/qmediaresource.h4
-rw-r--r--src/multimedia/playback/qplaylistfileparser.cpp35
-rw-r--r--src/multimedia/playback/qplaylistfileparser_p.h6
14 files changed, 144 insertions, 121 deletions
diff --git a/src/multimedia/playback/qmediacontent.cpp b/src/multimedia/playback/qmediacontent.cpp
index fe377b969..95116d02f 100644
--- a/src/multimedia/playback/qmediacontent.cpp
+++ b/src/multimedia/playback/qmediacontent.cpp
@@ -61,14 +61,24 @@ public:
isPlaylistOwned(false)
{}
+#if QT_DEPRECATED_SINCE(6, 0)
QMediaContentPrivate(const QMediaResourceList &r):
- resources(r),
isPlaylistOwned(false)
- {}
+ {
+ for (auto &item : r)
+ requests << item.request();
+ }
+#endif
+
+ QMediaContentPrivate(const QNetworkRequest &r):
+ isPlaylistOwned(false)
+ {
+ requests << r;
+ }
QMediaContentPrivate(const QMediaContentPrivate &other):
QSharedData(other),
- resources(other.resources),
+ requests(other.requests),
playlist(other.playlist),
isPlaylistOwned(false)
{}
@@ -77,7 +87,7 @@ public:
playlist(pls),
isPlaylistOwned(isOwn)
{
- resources << QMediaResource(url);
+ requests << QNetworkRequest(url);
}
~QMediaContentPrivate()
@@ -88,11 +98,10 @@ public:
bool operator ==(const QMediaContentPrivate &other) const
{
- return resources == other.resources && playlist == other.playlist;
+ return requests == other.requests && playlist == other.playlist;
}
- QMediaResourceList resources;
-
+ QList<QNetworkRequest> requests;
QPointer<QMediaPlaylist> playlist;
bool isPlaylistOwned;
private:
@@ -103,20 +112,19 @@ private:
/*!
\class QMediaContent
- \brief The QMediaContent class provides access to the resources relating to a media content.
+ \brief The QMediaContent class provides access to the resource relating to a media content.
\inmodule QtMultimedia
\ingroup multimedia
\ingroup multimedia_playback
QMediaContent is used within the multimedia framework as the logical handle
- to media content. A QMediaContent object is composed of one or more
- \l {QMediaResource}s where each resource provides the URL and format
- information of a different encoding of the content.
+ to media content. A QMediaContent object contains a \l {QNetworkRequest}
+ which provides the URL of the content.
- A non-null QMediaContent will always have a primary or canonical reference to
- the content available through the canonicalUrl() or canonicalResource()
- methods, any additional resources are optional.
+ A non-null QMediaContent will always have a reference to
+ the content available through the canonicalUrl() or canonicalRequest()
+ methods.
Alternatively QMediaContent can represent a playlist and contain a pointer to a
valid QMediaPlaylist object. In this case URL is optional and can either be empty
@@ -139,7 +147,7 @@ QMediaContent::QMediaContent()
QMediaContent::QMediaContent(const QUrl &url):
d(new QMediaContentPrivate)
{
- d->resources << QMediaResource(url);
+ d->requests << QNetworkRequest(url);
}
/*!
@@ -152,20 +160,25 @@ QMediaContent::QMediaContent(const QUrl &url):
QMediaContent::QMediaContent(const QNetworkRequest &request):
d(new QMediaContentPrivate)
{
- d->resources << QMediaResource(request);
+ d->requests << request;
}
+#if QT_DEPRECATED_SINCE(6, 0)
/*!
+ \obsolete
+
Constructs a media content with \a resource providing a reference to the content.
*/
QMediaContent::QMediaContent(const QMediaResource &resource):
d(new QMediaContentPrivate)
{
- d->resources << resource;
+ d->requests << resource.request();
}
/*!
+ \obsolete
+
Constructs a media content with \a resources providing a reference to the content.
*/
@@ -173,6 +186,7 @@ QMediaContent::QMediaContent(const QMediaResourceList &resources):
d(new QMediaContentPrivate(resources))
{
}
+#endif
/*!
Constructs a copy of the media content \a other.
@@ -221,8 +235,8 @@ QMediaContent& QMediaContent::operator=(const QMediaContent &other)
bool QMediaContent::operator==(const QMediaContent &other) const
{
- return (d.constData() == 0 && other.d.constData() == 0) ||
- (d.constData() != 0 && other.d.constData() != 0 &&
+ return (d.constData() == 0 && other.d.constData() == nullptr) ||
+ (d.constData() != 0 && other.d.constData() != nullptr &&
*d.constData() == *other.d.constData());
}
@@ -241,7 +255,7 @@ bool QMediaContent::operator!=(const QMediaContent &other) const
bool QMediaContent::isNull() const
{
- return d.constData() == 0;
+ return d.constData() == nullptr;
}
/*!
@@ -250,7 +264,7 @@ bool QMediaContent::isNull() const
QUrl QMediaContent::canonicalUrl() const
{
- return canonicalResource().url();
+ return canonicalRequest().url();
}
/*!
@@ -259,31 +273,38 @@ QUrl QMediaContent::canonicalUrl() const
QNetworkRequest QMediaContent::canonicalRequest() const
{
- return canonicalResource().request();
+ return (d && !d->requests.isEmpty()) ? d->requests.first() : QNetworkRequest();
}
+#if QT_DEPRECATED_SINCE(6, 0)
/*!
+ \obsolete
+
Returns a QMediaResource that represents that canonical resource for this media content.
*/
QMediaResource QMediaContent::canonicalResource() const
{
- return d.constData() != 0
- ? d->resources.value(0)
- : QMediaResource();
+ return (d && !d->requests.isEmpty()) ? d->requests.first() : QMediaResource();
}
/*!
+ \obsolete
+
Returns a list of alternative resources for this media content. The first item in this list
is always the canonical resource.
*/
QMediaResourceList QMediaContent::resources() const
{
- return d.constData() != 0
- ? d->resources
- : QMediaResourceList();
+ QMediaResourceList list;
+ if (d) {
+ for (auto &item : d->requests)
+ list << item;
+ }
+ return list;
}
+#endif // #if QT_DEPRECATED_SINCE(6, 0)
/*!
Returns a playlist for this media content or 0 if this QMediaContent is not a playlist.
@@ -291,9 +312,9 @@ QMediaResourceList QMediaContent::resources() const
QMediaPlaylist *QMediaContent::playlist() const
{
- return d.constData() != 0
+ return d.constData() != nullptr
? d->playlist.data()
- : 0;
+ : nullptr;
}
QT_END_NAMESPACE
diff --git a/src/multimedia/playback/qmediacontent.h b/src/multimedia/playback/qmediacontent.h
index f7c086752..5193a1fcc 100644
--- a/src/multimedia/playback/qmediacontent.h
+++ b/src/multimedia/playback/qmediacontent.h
@@ -58,8 +58,10 @@ public:
QMediaContent();
QMediaContent(const QUrl &contentUrl);
QMediaContent(const QNetworkRequest &contentRequest);
- QMediaContent(const QMediaResource &contentResource);
- QMediaContent(const QMediaResourceList &resources);
+#if QT_DEPRECATED_SINCE(6, 0)
+ QT_DEPRECATED QMediaContent(const QMediaResource &contentResource);
+ QT_DEPRECATED QMediaContent(const QMediaResourceList &resources);
+#endif
QMediaContent(const QMediaContent &other);
QMediaContent(QMediaPlaylist *playlist, const QUrl &contentUrl = QUrl(), bool takeOwnership = false);
~QMediaContent();
@@ -73,9 +75,10 @@ public:
QUrl canonicalUrl() const;
QNetworkRequest canonicalRequest() const;
- QMediaResource canonicalResource() const;
-
- QMediaResourceList resources() const;
+#if QT_DEPRECATED_SINCE(6, 0)
+ QT_DEPRECATED QMediaResource canonicalResource() const;
+ QT_DEPRECATED QMediaResourceList resources() const;
+#endif
QMediaPlaylist *playlist() const;
private:
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
index 3d1ffe66a..6b5220935 100644
--- a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
@@ -61,10 +61,10 @@ class Q_MULTIMEDIA_EXPORT QMediaNetworkPlaylistProvider : public QMediaPlaylistP
{
Q_OBJECT
public:
- QMediaNetworkPlaylistProvider(QObject *parent=0);
+ QMediaNetworkPlaylistProvider(QObject *parent = nullptr);
~QMediaNetworkPlaylistProvider();
- bool load(const QNetworkRequest &request, const char *format = 0) override;
+ bool load(const QNetworkRequest &request, const char *format = nullptr) override;
int mediaCount() const override;
QMediaContent media(int pos) const override;
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index e90035cce..81d525ea8 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -109,12 +109,12 @@ class QMediaPlayerPrivate : public QMediaObjectPrivate
public:
QMediaPlayerPrivate()
- : provider(0)
- , control(0)
- , audioRoleControl(0)
- , customAudioRoleControl(0)
- , playlist(0)
- , networkAccessControl(0)
+ : provider(nullptr)
+ , control(nullptr)
+ , audioRoleControl(nullptr)
+ , customAudioRoleControl(nullptr)
+ , playlist(nullptr)
+ , networkAccessControl(nullptr)
, state(QMediaPlayer::StoppedState)
, status(QMediaPlayer::UnknownMediaStatus)
, error(QMediaPlayer::NoError)
@@ -148,7 +148,7 @@ public:
QMediaPlaylist *parentPlaylist(QMediaPlaylist *pls);
bool isInChain(const QUrl &url);
- void setMedia(const QMediaContent &media, QIODevice *stream = 0);
+ void setMedia(const QMediaContent &media, QIODevice *stream = nullptr);
void setPlaylist(QMediaPlaylist *playlist);
void setPlaylistMedia();
@@ -175,7 +175,7 @@ QMediaPlaylist *QMediaPlayerPrivate::parentPlaylist(QMediaPlaylist *pls)
for (QMediaPlaylist *current = rootMedia.playlist(); current && current != pls; current = current->currentMedia().playlist())
if (current->currentMedia().playlist() == pls)
return current;
- return 0;
+ return nullptr;
}
bool QMediaPlayerPrivate::isInChain(const QUrl &url)
@@ -309,7 +309,7 @@ void QMediaPlayerPrivate::_q_updateMedia(const QMediaContent &media)
const QMediaPlayer::State currentState = state;
- setMedia(media, 0);
+ setMedia(media, nullptr);
if (!media.isNull()) {
switch (currentState) {
@@ -329,8 +329,8 @@ void QMediaPlayerPrivate::_q_updateMedia(const QMediaContent &media)
void QMediaPlayerPrivate::_q_playlistDestroyed()
{
- playlist = 0;
- setMedia(QMediaContent(), 0);
+ playlist = nullptr;
+ setMedia(QMediaContent(), nullptr);
}
void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream)
@@ -360,7 +360,7 @@ void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream
// on the backend side since we can't load the new one and we want to be in the
// InvalidMedia status.
ignoreNextStatusChange = QMediaPlayer::NoMedia;
- control->setMedia(QMediaContent(), 0);
+ control->setMedia(QMediaContent(), nullptr);
} else if (hasStreamPlaybackFeature) {
control->setMedia(media, file.data());
@@ -386,7 +386,7 @@ void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream
tempFile->close();
file.reset(tempFile);
- control->setMedia(QMediaContent(QUrl::fromLocalFile(file->fileName())), 0);
+ control->setMedia(QMediaContent(QUrl::fromLocalFile(file->fileName())), nullptr);
#else
qWarning("Qt was built with -no-feature-temporaryfile: playback from resource file is not supported!");
#endif
@@ -447,13 +447,13 @@ void QMediaPlayerPrivate::setPlaylistMedia()
// media is not changed,
// frontend needs to emit currentMediaChanged
bool isSameMedia = (q->currentMedia() == playlist->currentMedia());
- setMedia(playlist->currentMedia(), 0);
+ setMedia(playlist->currentMedia(), nullptr);
if (isSameMedia) {
emit q->currentMediaChanged(q->currentMedia());
}
}
} else {
- setMedia(QMediaContent(), 0);
+ setMedia(QMediaContent(), nullptr);
}
}
@@ -545,7 +545,7 @@ void QMediaPlayerPrivate::_q_handlePlaylistLoadFailed()
if (playlist)
playlist->next();
else
- setMedia(QMediaContent(), 0);
+ setMedia(QMediaContent(), nullptr);
}
static QMediaService *playerService(QMediaPlayer::Flags flags)
@@ -583,12 +583,12 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags):
Q_D(QMediaPlayer);
d->provider = QMediaServiceProvider::defaultServiceProvider();
- if (d->service == 0) {
+ if (d->service == nullptr) {
d->error = ServiceMissingError;
} else {
d->control = qobject_cast<QMediaPlayerControl*>(d->service->requestControl(QMediaPlayerControl_iid));
d->networkAccessControl = qobject_cast<QMediaNetworkAccessControl*>(d->service->requestControl(QMediaNetworkAccessControl_iid));
- if (d->control != 0) {
+ if (d->control != nullptr) {
connect(d->control, SIGNAL(mediaChanged(QMediaContent)), SLOT(_q_handleMediaChanged(QMediaContent)));
connect(d->control, SIGNAL(stateChanged(QMediaPlayer::State)), SLOT(_q_stateChanged(QMediaPlayer::State)));
connect(d->control, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)),
@@ -631,7 +631,7 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags):
}
}
}
- if (d->networkAccessControl != 0) {
+ if (d->networkAccessControl != nullptr) {
connect(d->networkAccessControl, SIGNAL(configurationChanged(QNetworkConfiguration)),
this, SIGNAL(networkConfigurationChanged(QNetworkConfiguration)));
}
@@ -688,7 +688,7 @@ const QIODevice *QMediaPlayer::mediaStream() const
if (d->control && d->qrcMedia.isNull())
return d->control->mediaStream();
- return 0;
+ return nullptr;
}
QMediaPlaylist *QMediaPlayer::playlist() const
@@ -740,7 +740,7 @@ QMediaPlayer::State QMediaPlayer::state() const
// In case if EndOfMedia status is already received
// but state is not.
- if (d->control != 0
+ if (d->control != nullptr
&& d->status == QMediaPlayer::EndOfMedia
&& d->state != d->control->state()) {
return d->control->state();
@@ -758,7 +758,7 @@ qint64 QMediaPlayer::duration() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->duration();
return -1;
@@ -768,7 +768,7 @@ qint64 QMediaPlayer::position() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->position();
return 0;
@@ -778,7 +778,7 @@ int QMediaPlayer::volume() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->volume();
return 0;
@@ -788,7 +788,7 @@ bool QMediaPlayer::isMuted() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isMuted();
return false;
@@ -798,7 +798,7 @@ int QMediaPlayer::bufferStatus() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->bufferStatus();
return 0;
@@ -808,7 +808,7 @@ bool QMediaPlayer::isAudioAvailable() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isAudioAvailable();
return false;
@@ -818,7 +818,7 @@ bool QMediaPlayer::isVideoAvailable() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isVideoAvailable();
return false;
@@ -828,7 +828,7 @@ bool QMediaPlayer::isSeekable() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isSeekable();
return false;
@@ -838,7 +838,7 @@ qreal QMediaPlayer::playbackRate() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->playbackRate();
return 0.0;
@@ -883,7 +883,7 @@ void QMediaPlayer::play()
{
Q_D(QMediaPlayer);
- if (d->control == 0) {
+ if (d->control == nullptr) {
QMetaObject::invokeMethod(this, "_q_error", Qt::QueuedConnection,
Q_ARG(int, QMediaPlayer::ServiceMissingError),
Q_ARG(QString, tr("The QMediaPlayer object does not have a valid service")));
@@ -921,7 +921,7 @@ void QMediaPlayer::pause()
{
Q_D(QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->pause();
}
@@ -933,7 +933,7 @@ void QMediaPlayer::stop()
{
Q_D(QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->stop();
// If media player didn't stop in response to control.
@@ -952,7 +952,7 @@ void QMediaPlayer::setPosition(qint64 position)
{
Q_D(QMediaPlayer);
- if (d->control == 0)
+ if (d->control == nullptr)
return;
d->control->setPosition(qMax(position, 0ll));
@@ -962,7 +962,7 @@ void QMediaPlayer::setVolume(int v)
{
Q_D(QMediaPlayer);
- if (d->control == 0)
+ if (d->control == nullptr)
return;
int clamped = qBound(0, v, 100);
@@ -976,7 +976,7 @@ void QMediaPlayer::setMuted(bool muted)
{
Q_D(QMediaPlayer);
- if (d->control == 0 || muted == isMuted())
+ if (d->control == nullptr || muted == isMuted())
return;
d->control->setMuted(muted);
@@ -986,7 +986,7 @@ void QMediaPlayer::setPlaybackRate(qreal rate)
{
Q_D(QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->setPlaybackRate(rate);
}
@@ -1014,7 +1014,7 @@ void QMediaPlayer::setMedia(const QMediaContent &media, QIODevice *stream)
QMediaContent oldMedia = d->rootMedia;
d->disconnectPlaylist();
- d->playlist = 0;
+ d->playlist = nullptr;
d->rootMedia = media;
d->nestedPlaylists = 0;
@@ -1100,7 +1100,7 @@ void QMediaPlayer::setVideoOutput(QVideoWidget *output)
// We don't know (in this library) that QVideoWidget inherits QObject
QObject *outputObject = reinterpret_cast<QObject*>(output);
- d->videoOutput = outputObject && bind(outputObject) ? outputObject : 0;
+ d->videoOutput = outputObject && bind(outputObject) ? outputObject : nullptr;
}
/*!
@@ -1122,7 +1122,7 @@ void QMediaPlayer::setVideoOutput(QGraphicsVideoItem *output)
// but QObject inheritance depends on QObject coming first, so try this out.
QObject *outputObject = reinterpret_cast<QObject*>(output);
- d->videoOutput = outputObject && bind(outputObject) ? outputObject : 0;
+ d->videoOutput = outputObject && bind(outputObject) ? outputObject : nullptr;
}
/*!
@@ -1142,14 +1142,14 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface)
if (d->videoOutput)
unbind(d->videoOutput);
- d->videoOutput = 0;
+ d->videoOutput = nullptr;
if (surface && bind(&d->surfaceOutput))
d->videoOutput = &d->surfaceOutput;
} else if (!surface) {
//unbind the surfaceOutput if null surface is set
unbind(&d->surfaceOutput);
- d->videoOutput = 0;
+ d->videoOutput = nullptr;
}
}
@@ -1168,7 +1168,7 @@ QAudio::Role QMediaPlayer::audioRole() const
{
Q_D(const QMediaPlayer);
- if (d->audioRoleControl != NULL)
+ if (d->audioRoleControl != nullptr)
return d->audioRoleControl->audioRole();
return QAudio::UnknownRole;
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
index 97fe75044..7618827da 100644
--- a/src/multimedia/playback/qmediaplaylist.cpp
+++ b/src/multimedia/playback/qmediaplaylist.cpp
@@ -124,7 +124,7 @@ QMediaPlaylist::QMediaPlaylist(QObject *parent)
d->q_ptr = this;
d->networkPlaylistControl = new QMediaNetworkPlaylistControl(this);
- setMediaObject(0);
+ setMediaObject(nullptr);
}
/*!
@@ -163,9 +163,9 @@ bool QMediaPlaylist::setMediaObject(QMediaObject *mediaObject)
return true;
QMediaService *service = mediaObject
- ? mediaObject->service() : 0;
+ ? mediaObject->service() : nullptr;
- QMediaPlaylistControl *newControl = 0;
+ QMediaPlaylistControl *newControl = nullptr;
if (service)
newControl = qobject_cast<QMediaPlaylistControl*>(service->requestControl(QMediaPlaylistControl_iid));
diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h
index 8e081dd67..16fce00a9 100644
--- a/src/multimedia/playback/qmediaplaylist_p.h
+++ b/src/multimedia/playback/qmediaplaylist_p.h
@@ -78,9 +78,9 @@ class QMediaPlaylistPrivate
Q_DECLARE_PUBLIC(QMediaPlaylist)
public:
QMediaPlaylistPrivate()
- :mediaObject(0),
- control(0),
- networkPlaylistControl(0),
+ :mediaObject(nullptr),
+ control(nullptr),
+ networkPlaylistControl(nullptr),
error(QMediaPlaylist::NoError)
{
}
@@ -98,10 +98,10 @@ public:
void _q_mediaObjectDeleted()
{
Q_Q(QMediaPlaylist);
- mediaObject = 0;
+ mediaObject = nullptr;
if (control != networkPlaylistControl)
- control = 0;
- q->setMediaObject(0);
+ control = nullptr;
+ q->setMediaObject(nullptr);
}
QMediaObject *mediaObject;
diff --git a/src/multimedia/playback/qmediaplaylistioplugin_p.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h
index 1e157d135..50bdcf9c0 100644
--- a/src/multimedia/playback/qmediaplaylistioplugin_p.h
+++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h
@@ -106,7 +106,7 @@ class Q_MULTIMEDIA_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMedia
Q_OBJECT
Q_INTERFACES(QMediaPlaylistIOInterface)
public:
- explicit QMediaPlaylistIOPlugin(QObject *parent = 0);
+ explicit QMediaPlaylistIOPlugin(QObject *parent = nullptr);
~QMediaPlaylistIOPlugin();
bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const override = 0;
diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp
index 0966c9396..120f621f5 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp
@@ -63,7 +63,7 @@ class QMediaPlaylistNavigatorPrivate
Q_DECLARE_NON_CONST_PUBLIC(QMediaPlaylistNavigator)
public:
QMediaPlaylistNavigatorPrivate()
- :playlist(0),
+ :playlist(nullptr),
currentPos(-1),
lastValidPos(-1),
playbackMode(QMediaPlaylist::Sequential),
diff --git a/src/multimedia/playback/qmediaplaylistnavigator_p.h b/src/multimedia/playback/qmediaplaylistnavigator_p.h
index 3899c42d9..2ac03a62c 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator_p.h
+++ b/src/multimedia/playback/qmediaplaylistnavigator_p.h
@@ -67,7 +67,7 @@ class Q_MULTIMEDIA_EXPORT QMediaPlaylistNavigator : public QObject
Q_PROPERTY(QMediaContent currentItem READ currentItem)
public:
- QMediaPlaylistNavigator(QMediaPlaylistProvider *playlist, QObject *parent = 0);
+ QMediaPlaylistNavigator(QMediaPlaylistProvider *playlist, QObject *parent = nullptr);
virtual ~QMediaPlaylistNavigator();
QMediaPlaylistProvider *playlist() const;
diff --git a/src/multimedia/playback/qmediaplaylistprovider_p.h b/src/multimedia/playback/qmediaplaylistprovider_p.h
index 899c7c8bc..ed27612b9 100644
--- a/src/multimedia/playback/qmediaplaylistprovider_p.h
+++ b/src/multimedia/playback/qmediaplaylistprovider_p.h
@@ -70,12 +70,12 @@ class Q_MULTIMEDIA_EXPORT QMediaPlaylistProvider : public QObject
{
Q_OBJECT
public:
- QMediaPlaylistProvider(QObject *parent=0);
+ QMediaPlaylistProvider(QObject *parent = nullptr);
virtual ~QMediaPlaylistProvider();
- virtual bool load(const QNetworkRequest &request, const char *format = 0);
- virtual bool load(QIODevice * device, const char *format = 0);
- virtual bool save(const QUrl &location, const char *format = 0);
+ virtual bool load(const QNetworkRequest &request, const char *format = nullptr);
+ virtual bool load(QIODevice *device, const char *format = nullptr);
+ virtual bool save(const QUrl &location, const char *format = nullptr);
virtual bool save(QIODevice * device, const char *format);
virtual int mediaCount() const = 0;
diff --git a/src/multimedia/playback/qmediaresource.cpp b/src/multimedia/playback/qmediaresource.cpp
index 0a59b0de8..181b37525 100644
--- a/src/multimedia/playback/qmediaresource.cpp
+++ b/src/multimedia/playback/qmediaresource.cpp
@@ -39,6 +39,8 @@
#include "qmediaresource.h"
+#if QT_DEPRECATED_SINCE(6, 0)
+
#include <QtCore/qsize.h>
#include <QtCore/qurl.h>
#include <QtCore/qvariant.h>
@@ -61,6 +63,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterMediaResourceMetaTypes)
\inmodule QtMultimedia
\ingroup multimedia
\ingroup multimedia_playback
+ \obsolete
A media resource is composed of a \l {url()}{URL} containing the
location of the resource and a set of properties that describe the
@@ -418,3 +421,4 @@ void QMediaResource::setResolution(int width, int height)
}
QT_END_NAMESPACE
+#endif // #if QT_DEPRECATED_SINCE(6, 0)
diff --git a/src/multimedia/playback/qmediaresource.h b/src/multimedia/playback/qmediaresource.h
index 9740166c6..8cded3128 100644
--- a/src/multimedia/playback/qmediaresource.h
+++ b/src/multimedia/playback/qmediaresource.h
@@ -46,6 +46,8 @@
#include <QtMultimedia/qtmultimediaglobal.h>
+#if QT_DEPRECATED_SINCE(6, 0)
+
QT_BEGIN_NAMESPACE
// Class forward declaration required for QDoc bug
@@ -124,4 +126,6 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QMediaResource)
Q_DECLARE_METATYPE(QMediaResourceList)
+#endif // #if QT_DEPRECATED_SINCE(6, 0)
+
#endif
diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp
index 0d33f040d..92e7f97e8 100644
--- a/src/multimedia/playback/qplaylistfileparser.cpp
+++ b/src/multimedia/playback/qplaylistfileparser.cpp
@@ -273,7 +273,7 @@ class QPlaylistFileParserPrivate
public:
QPlaylistFileParserPrivate(QPlaylistFileParser *q)
: q_ptr(q)
- , m_stream(0)
+ , m_stream(nullptr)
, m_type(QPlaylistFileParser::UNKNOWN)
, m_scanIndex(0)
, m_lineIndex(-1)
@@ -299,9 +299,10 @@ public:
struct ParserJob
{
QIODevice *m_stream;
- QMediaResource m_resource;
- bool isValid() const { return m_stream || !m_resource.isNull(); }
- void reset() { m_stream = 0; m_resource = QMediaResource(); }
+ QMediaContent m_media;
+ QString m_mimeType;
+ bool isValid() const { return m_stream || !m_media.isNull(); }
+ void reset() { m_stream = nullptr; m_media = QMediaContent(); m_mimeType = QString(); }
} m_pendingJob;
int m_scanIndex;
int m_lineIndex;
@@ -498,22 +499,12 @@ QPlaylistFileParser::FileType QPlaylistFileParser::findPlaylistType(const QStrin
/*
* Delegating
*/
-void QPlaylistFileParser::start(const QMediaContent &media, QIODevice *stream)
+void QPlaylistFileParser::start(const QMediaContent &media, QIODevice *stream, const QString &mimeType)
{
- const QMediaResource &mediaResource = media.canonicalResource();
- const QString &mimeType = mediaResource.mimeType();
-
- if (stream) {
- start(stream, mediaResource.mimeType());
- } else {
- const QNetworkRequest &request = mediaResource.request();
- const QUrl &url = mediaResource.url();
-
- if (request.url().isValid())
- start(request, mimeType);
- else
- start(QNetworkRequest(url), mimeType);
- }
+ if (stream)
+ start(stream, mimeType);
+ else
+ start(media.canonicalRequest(), mimeType);
}
void QPlaylistFileParser::start(QIODevice *stream, const QString &mimeType)
@@ -528,7 +519,7 @@ void QPlaylistFileParser::start(QIODevice *stream, const QString &mimeType)
if (!d->m_currentParser.isNull()) {
abort();
- d->m_pendingJob = { stream, QMediaResource(QUrl(), mimeType) };
+ d->m_pendingJob = { stream, QUrl(), mimeType };
return;
}
@@ -551,7 +542,7 @@ void QPlaylistFileParser::start(const QNetworkRequest& request, const QString &m
if (!d->m_currentParser.isNull()) {
abort();
- d->m_pendingJob = { nullptr, QMediaResource(request, mimeType) };
+ d->m_pendingJob = { nullptr, request, mimeType };
return;
}
@@ -604,7 +595,7 @@ void QPlaylistFileParserPrivate::handleParserFinished()
m_source.reset();
if (m_pendingJob.isValid())
- q->start(m_pendingJob.m_resource, m_pendingJob.m_stream);
+ q->start(m_pendingJob.m_media, m_pendingJob.m_stream, m_pendingJob.m_mimeType);
}
void QPlaylistFileParserPrivate::abort()
diff --git a/src/multimedia/playback/qplaylistfileparser_p.h b/src/multimedia/playback/qplaylistfileparser_p.h
index 927dbb739..cf96ccdbf 100644
--- a/src/multimedia/playback/qplaylistfileparser_p.h
+++ b/src/multimedia/playback/qplaylistfileparser_p.h
@@ -66,7 +66,7 @@ class Q_MULTIMEDIA_EXPORT QPlaylistFileParser : public QObject
{
Q_OBJECT
public:
- QPlaylistFileParser(QObject *parent = 0);
+ QPlaylistFileParser(QObject *parent = nullptr);
~QPlaylistFileParser();
enum FileType
@@ -86,7 +86,7 @@ public:
NetworkError
};
- void start(const QMediaContent &media, QIODevice *stream = 0);
+ void start(const QMediaContent &media, QIODevice *stream = nullptr, const QString &mimeType = QString());
void start(const QNetworkRequest &request, const QString &mimeType = QString());
void abort();
@@ -109,7 +109,7 @@ private:
const QString& mime);
static FileType findPlaylistType(const QString &suffix,
const QString& mime,
- const char *data = 0,
+ const char *data = nullptr,
quint32 size = 0);
Q_DISABLE_COPY(QPlaylistFileParser)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 16:06:54 +0000