diff options
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.cpp')
-rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 3773cfe64..e339980a2 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -48,7 +48,6 @@ #include <qmediaplaylist.h> #include <qmediaplaylistcontrol_p.h> #include <qmediaplaylistsourcecontrol_p.h> -#include <qmedianetworkaccesscontrol.h> #include <qaudiorolecontrol.h> #include <qcustomaudiorolecontrol.h> @@ -116,7 +115,6 @@ public: , audioRoleControl(nullptr) , customAudioRoleControl(nullptr) , playlist(nullptr) - , networkAccessControl(nullptr) , state(QMediaPlayer::StoppedState) , status(QMediaPlayer::UnknownMediaStatus) , error(QMediaPlayer::NoError) @@ -133,7 +131,6 @@ public: QPointer<QObject> videoOutput; QMediaPlaylist *playlist; - QMediaNetworkAccessControl *networkAccessControl; QVideoSurfaceOutput surfaceOutput; QMediaContent qrcMedia; QScopedPointer<QFile> qrcFile; @@ -599,7 +596,6 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags): 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 != nullptr) { connect(d->control, SIGNAL(mediaChanged(QMediaContent)), SLOT(_q_handleMediaChanged(QMediaContent))); connect(d->control, SIGNAL(stateChanged(QMediaPlayer::State)), SLOT(_q_stateChanged(QMediaPlayer::State))); @@ -643,10 +639,6 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags): } } } - if (d->networkAccessControl != nullptr) { - connect(d->networkAccessControl, &QMediaNetworkAccessControl::configurationChanged, - this, &QMediaPlayer::networkConfigurationChanged); - } } } @@ -731,23 +723,6 @@ void QMediaPlayer::setPlaylist(QMediaPlaylist *playlist) setMedia(m); } -/*! - \obsolete - - Sets the network access points for remote media playback. - \a configurations contains, in ascending preferential order, a list of - configuration that can be used for network access. - - This will invalidate the choice of previous configurations. -*/ -void QMediaPlayer::setNetworkConfigurations(const QList<QNetworkConfiguration> &configurations) -{ - Q_D(QMediaPlayer); - - if (d->networkAccessControl) - d->networkAccessControl->setConfigurations(configurations); -} - QMediaPlayer::State QMediaPlayer::state() const { Q_D(const QMediaPlayer); @@ -872,24 +847,6 @@ QString QMediaPlayer::errorString() const return d_func()->errorString; } -/*! - \obsolete - - Returns the current network access point in use. - If a default contructed QNetworkConfiguration is returned - this feature is not available or that none of the - current supplied configurations are in use. -*/ -QNetworkConfiguration QMediaPlayer::currentNetworkConfiguration() const -{ - Q_D(const QMediaPlayer); - - if (d->networkAccessControl) - return d_func()->networkAccessControl->currentConfiguration(); - - return QNetworkConfiguration(); -} - //public Q_SLOTS: /*! Start or resume playing the current source. @@ -1667,13 +1624,6 @@ QStringList QMediaPlayer::supportedCustomAudioRoles() const */ /*! - \fn void QMediaPlayer::networkConfigurationChanged(const QNetworkConfiguration &configuration) - \obsolete - - Signal that the active in use network access point has been changed to \a configuration and all subsequent network access will use this \a configuration. -*/ - -/*! \enum QMediaPlayer::Flag \value LowLatency The player is expected to be used with simple audio formats, |