diff options
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.h')
-rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 5d9a393e1..bd070328b 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -40,6 +40,7 @@ #ifndef QMEDIAPLAYER_H #define QMEDIAPLAYER_H +#include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qmediacontent.h> #include <QtMultimedia/qmediaenumdebug.h> @@ -131,6 +132,7 @@ public: void setVideoOutput(QVideoWidget *); void setVideoOutput(QGraphicsVideoItem *); void setVideoOutput(QAbstractVideoSurface *surface); + void setVideoOutput(const QVector<QAbstractVideoSurface *> &surfaces); QMediaContent media() const; const QIODevice *mediaStream() const; @@ -156,7 +158,10 @@ public: Error error() const; QString errorString() const; - QNetworkConfiguration currentNetworkConfiguration() const; +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration currentNetworkConfiguration() const; +QT_WARNING_POP QMultimedia::AvailabilityStatus availability() const override; @@ -181,7 +186,14 @@ public Q_SLOTS: void setMedia(const QMediaContent &media, QIODevice *stream = nullptr); void setPlaylist(QMediaPlaylist *playlist); - void setNetworkConfigurations(const QList<QNetworkConfiguration> &configurations); +#ifndef Q_MOC_RUN // moc fails to parse the expanded macro +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +#endif + QT_DEPRECATED_VERSION_5_15 void setNetworkConfigurations(const QList<QNetworkConfiguration> &configurations); +#ifndef Q_MOC_RUN // moc fails to parse the expanded macro +QT_WARNING_POP +#endif Q_SIGNALS: void mediaChanged(const QMediaContent &media); @@ -208,7 +220,14 @@ Q_SIGNALS: void error(QMediaPlayer::Error error); - void networkConfigurationChanged(const QNetworkConfiguration &configuration); +#ifndef Q_MOC_RUN // moc fails to parse the expanded macro +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +#endif + QT_DEPRECATED_VERSION_5_15 void networkConfigurationChanged(const QNetworkConfiguration &configuration); +#ifndef Q_MOC_RUN // moc fails to parse the expanded macro +QT_WARNING_POP +#endif public: bool bind(QObject *) override; void unbind(QObject *) override; |