summaryrefslogtreecommitdiffstats
path: root/src/multimedia/platform
diff options
context:
space:
mode:
authorVladimir Belyavsky <belyavskyv@gmail.com>2023-05-04 14:00:14 +0300
committerVladimir Belyavsky <belyavskyv@gmail.com>2023-05-04 21:42:30 +0300
commit9830f6593868be875465b8ed9b3796685600adb0 (patch)
tree94e222e39cbae9d5db15b00cb8d39cbf689e5cef /src/multimedia/platform
parent54c2bd33eddc96ac7268ca43773e98b4cd7433f6 (diff)
QMediaPlayer: emit errorChanged signal whenever the error has changed
There was a problem that error/errorString properties were not properly notified when reseted on start playing. So now we use private setError() method whenever 'error' should be changed. Also as a drive-by there are several improvements: - errorChanged signal will be emitted now only when the property's value was actually changed. - errorOccured signal is now emitted only when there is a real error, i.e. it will never be emitted with NoError. Fixes: QTBUG-113386 Pick-to: 6.5 Change-Id: I16e26710941ed6b8429f39c201572092f2714c74 Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'src/multimedia/platform')
-rw-r--r--src/multimedia/platform/qplatformmediaplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/platform/qplatformmediaplayer.cpp b/src/multimedia/platform/qplatformmediaplayer.cpp
index 5fb82b523..76de92cff 100644
--- a/src/multimedia/platform/qplatformmediaplayer.cpp
+++ b/src/multimedia/platform/qplatformmediaplayer.cpp
@@ -29,7 +29,7 @@ void QPlatformMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status)
void QPlatformMediaPlayer::error(int error, const QString &errorString)
{
- player->d_func()->setError(error, errorString);
+ player->d_func()->setError(QMediaPlayer::Error(error), errorString);
}
QT_END_NAMESPACE