Merge lp:~tiagosh/telephony-service/delete_player_instance_on_incoming_call into lp:telephony-service

[Tiago Salem Herrmann]

Create new QMediaPlayer instances on every incoming call.

Create new QMediaPlayer instances on every incoming call.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1133
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/586/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/254
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/254/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/254

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/586/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'libtelephonyservice/ringtone.cpp'
--- libtelephonyservice/ringtone.cpp	2015-05-15 20:27:54 +0000
+++ libtelephonyservice/ringtone.cpp	2015-11-03 17:39:42 +0000
@@ -40,9 +40,8 @@
         return;
     }
 
-    if (mCallAudioPlayer) {
-        return;
-    }
+    // force delete all media player instances
+    stopIncomingCallSound();
 
     // pick up the new ringtone in case it changed in the meantime
     mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(GreeterContacts::instance()->incomingCallSound()));