Merge lp:~phablet-team/qtubuntu-media/fix-1447606 into lp:qtubuntu-media

[Jim Hodapp]

Fix ringtone not looping (QMediaPlaylist loop mode) regression.

Fix ringtone not looping (QMediaPlaylist loop mode) regression.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/104/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/104/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/qtubuntu-media/fix-1447606]

71. By Jim Hodapp on 2015-04-24

Refine the EndOfMedia logic to make sure it works for ringtones, video and music playback.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/105/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/105/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/qtubuntu-media/fix-1447606]

72. By Jim Hodapp on 2015-04-24

EndOfMedia working even better for all audio types and roles.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/106/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/31/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/106/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/qtubuntu-media/fix-1447606]

73. By Ricardo Mendoza on 2015-04-27

Stop backend only if media has been reloaded as a result of EOS

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/107/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/32/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/107/rebuild

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/108/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/33/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/108/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/aal/aalmediaplayercontrol.cpp'
--- src/aal/aalmediaplayercontrol.cpp	2015-03-20 13:12:42 +0000
+++ src/aal/aalmediaplayercontrol.cpp	2015-04-27 20:54:43 +0000
@@ -280,8 +280,10 @@
     qDebug() << __PRETTY_FUNCTION__ << endl;
     // The order of these lines is very important to keep music-app,
     // mediaplayer-app and the QMediaPlaylist loop cases all happy
-    stop();
     setMediaStatus(QMediaPlayer::EndOfMedia);
+    // Stop the Player if no media has been loaded as result of EOS
+    if (m_status == QMediaPlayer::EndOfMedia)
+        stop();
     m_service->setPosition(0);
     Q_EMIT positionChanged(position());
     if (isVideoAvailable())