diff options
8 files changed, 14 insertions, 12 deletions
diff --git a/src/multimedia/platform/qplatformmediaplayer.cpp b/src/multimedia/platform/qplatformmediaplayer.cpp index b2a200248..fd397be99 100644 --- a/src/multimedia/platform/qplatformmediaplayer.cpp +++ b/src/multimedia/platform/qplatformmediaplayer.cpp @@ -31,9 +31,9 @@ void QPlatformMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status) player->d_func()->setStatus(status); } -void QPlatformMediaPlayer::error(int error, const QString &errorString) +void QPlatformMediaPlayer::error(QMediaPlayer::Error error, const QString &errorString) { - player->d_func()->setError(QMediaPlayer::Error(error), errorString); + player->d_func()->setError(error, errorString); } QPlatformMediaPlayer::PitchCompensationAvailability diff --git a/src/multimedia/platform/qplatformmediaplayer_p.h b/src/multimedia/platform/qplatformmediaplayer_p.h index 7ddcaf214..b859deefc 100644 --- a/src/multimedia/platform/qplatformmediaplayer_p.h +++ b/src/multimedia/platform/qplatformmediaplayer_p.h @@ -116,7 +116,7 @@ public: void stateChanged(QMediaPlayer::PlaybackState newState); void mediaStatusChanged(QMediaPlayer::MediaStatus status); - void error(int error, const QString &errorString); + void error(QMediaPlayer::Error, const QString &errorString); void resetCurrentLoop() { m_currentLoop = 0; } bool doLoop() { diff --git a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder_p.h b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder_p.h index 66ceead6d..aae6e21fb 100644 --- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder_p.h +++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder_p.h @@ -49,7 +49,7 @@ public: struct ContextError { - int code = 0; + QMediaPlayer::Error code{}; QString description; }; diff --git a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegplaybackengineobject_p.h b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegplaybackengineobject_p.h index e41bb2d28..3ee0aa7dc 100644 --- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegplaybackengineobject_p.h +++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegplaybackengineobject_p.h @@ -14,9 +14,11 @@ // We mean it. // +#include <QtCore/qatomic.h> +#include <QtCore/qthread.h> +#include <QtMultimedia/qmediaplayer.h> #include <QtFFmpegMediaPluginImpl/private/qffmpegplaybackenginedefs_p.h> -#include "qthread.h" -#include "qatomic.h" + #include <chrono> QT_BEGIN_NAMESPACE @@ -50,7 +52,7 @@ public: signals: void atEnd(); - void error(int code, const QString &errorString); + void error(QMediaPlayer::Error, const QString &errorString); protected: QTimer &timer(); diff --git a/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer_p.h b/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer_p.h index 4e50f34d0..e32f07c19 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer_p.h +++ b/src/plugins/multimedia/ffmpeg/qffmpegmediaplayer_p.h @@ -89,7 +89,7 @@ private: private slots: void updatePosition(); void endOfStream(); - void error(int error, const QString &errorString) + void error(QMediaPlayer::Error error, const QString &errorString) { QPlatformMediaPlayer::error(error, errorString); } diff --git a/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h b/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h index 70b8e2584..37e331a73 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h +++ b/src/plugins/multimedia/ffmpeg/qffmpegplaybackengine_p.h @@ -126,7 +126,7 @@ public: signals: void endOfStream(); - void errorOccured(int, const QString &); + void errorOccured(QMediaPlayer::Error, const QString &); void loopChanged(); void buffered(); diff --git a/src/plugins/multimedia/qnx/mediaplayer/qqnxmediaplayer.cpp b/src/plugins/multimedia/qnx/mediaplayer/qqnxmediaplayer.cpp index 99a9ec007..230ebc87b 100644 --- a/src/plugins/multimedia/qnx/mediaplayer/qqnxmediaplayer.cpp +++ b/src/plugins/multimedia/qnx/mediaplayer/qqnxmediaplayer.cpp @@ -836,13 +836,13 @@ void QQnxMediaPlayer::emitMmError(const QString &msg) { int errorCode = MMR_ERROR_NONE; const QString errorMessage = mmErrorMessage(msg, m_context, &errorCode); - emit error(errorCode, errorMessage); + emit error(QMediaPlayer::ResourceError, errorMessage); } void QQnxMediaPlayer::emitPError(const QString &msg) { const QString errorMessage = QString::fromLatin1("%1: %2").arg(msg).arg(QString::fromUtf8(strerror(errno))); - emit error(errno, errorMessage); + emit error(QMediaPlayer::ResourceError, errorMessage); } diff --git a/src/plugins/multimedia/windows/player/mfplayercontrol.cpp b/src/plugins/multimedia/windows/player/mfplayercontrol.cpp index ae0022773..5d535c8ce 100644 --- a/src/plugins/multimedia/windows/player/mfplayercontrol.cpp +++ b/src/plugins/multimedia/windows/player/mfplayercontrol.cpp @@ -281,7 +281,7 @@ void MFPlayerControl::handleError(QMediaPlayer::Error errorCode, const QString& { if (isFatal) stop(); - error(int(errorCode), errorString); + error(errorCode, errorString); } void MFPlayerControl::setActiveTrack(TrackType type, int index) |