diff options
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 3 | ||||
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index c2734f4a9..abd6a62cc 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -132,9 +132,6 @@ \li QMediaPlaylist \li List of media to be played. \row - \li QRadioTuner - \li Access radio device. - \row \li QAbstractVideoSurface \li Base class for video presentation. \endtable diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 276914ae1..5bc6e1308 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -133,7 +133,10 @@ public: QPointer<QObject> videoOutput; QMediaPlaylist *playlist; +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QMediaNetworkAccessControl *networkAccessControl; +QT_WARNING_POP QVideoSurfaceOutput surfaceOutput; QMediaContent qrcMedia; QScopedPointer<QFile> qrcFile; @@ -599,7 +602,10 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags): d->error = ServiceMissingError; } else { d->control = qobject_cast<QMediaPlayerControl*>(d->service->requestControl(QMediaPlayerControl_iid)); +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED d->networkAccessControl = qobject_cast<QMediaNetworkAccessControl*>(d->service->requestControl(QMediaNetworkAccessControl_iid)); +QT_WARNING_POP 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))); @@ -644,8 +650,11 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags): } } if (d->networkAccessControl != nullptr) { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED connect(d->networkAccessControl, &QMediaNetworkAccessControl::configurationChanged, this, &QMediaPlayer::networkConfigurationChanged); +QT_WARNING_POP } } } |