diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-02-25 10:46:18 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-03-15 20:07:28 +0000 |
commit | ed9fb88a0ca8231d384bb21a71ea8c6b74c6f187 (patch) | |
tree | 7682eb45365f10d584327fdc45beeccd748be8a5 /src/multimedia/playback/qmediaplayer.h | |
parent | 967570004e2a0dde043970021c5c32312feee4ed (diff) |
Cleanups in Q(Platform)MediaPlayer
QPlatformMediaPlayer now has a pointer to the public frontend
class. That way it doesn't need to inherit from QObject anymore,
and we remove all the signal forwarding code that we had in
here until now.
Also apply some build fixes for Android.
Change-Id: Iad6835a4b818c69a002c37b5f2d5aba36cbb07e2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.h')
-rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 58f5201ce..38429ecb7 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -218,9 +218,7 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QMediaPlayer) Q_DECLARE_PRIVATE(QMediaPlayer) - Q_PRIVATE_SLOT(d_func(), void _q_stateChanged(QMediaPlayer::State)) - Q_PRIVATE_SLOT(d_func(), void _q_mediaStatusChanged(QMediaPlayer::MediaStatus)) - Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &)) + friend class QPlatformMediaPlayer; Q_PRIVATE_SLOT(d_func(), void _q_notify()) }; |