slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android: fix some MediaPlayer signals not being emitted on first load.

Browse Source 
When loading the first media while the video output was not yet ready,
mediaChanged() and mediaStatusChanged() signals were not emitted.
That's because in that particular situation, the backend believed
the delayed loading was a reload of the same media.

Change-Id: If5dfbf383ea2dac065fc26b70640ebfb2c52862d
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
This commit is contained in:
Yoann Lopes
2015-02-26 16:16:49 +01:00
parent f39d8b73ee
commit 95e9155b7f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
View File

@@ -307,7 +307,7 @@ void QAndroidMediaPlayerControl::setMedia(const QMediaContent &mediaContent,
{ {
StateChangeNotifier notifier(this); StateChangeNotifier notifier(this);
mReloadingMedia = (mMediaContent == mediaContent); mReloadingMedia = (mMediaContent == mediaContent) && !mPendingSetMedia;
if (!mReloadingMedia) { if (!mReloadingMedia) {
mMediaContent = mediaContent; mMediaContent = mediaContent;
@@ -712,8 +712,8 @@ void QAndroidMediaPlayerControl::resetBufferingProgress()
void QAndroidMediaPlayerControl::flushPendingStates() void QAndroidMediaPlayerControl::flushPendingStates()
{ {
if (mPendingSetMedia) { if (mPendingSetMedia) {
mPendingSetMedia = false;
setMedia(mMediaContent, 0); setMedia(mMediaContent, 0);
mPendingSetMedia = false;
return; return;
} }