Merge lp:~bfiller/telephony-service/fix-1392222 into lp:telephony-service/rtm-14.09

[Bill Filler]

fix ringtone change not getting applied until restart

fix ringtone change not getting applied until restart

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'libtelephonyservice/ringtone.cpp'
--- libtelephonyservice/ringtone.cpp	2014-09-03 06:23:48 +0000
+++ libtelephonyservice/ringtone.cpp	2014-12-05 17:07:35 +0000
@@ -27,7 +27,6 @@
     mMessageAudioPlayer(NULL)
 {
     mCallAudioPlaylist.setPlaybackMode(QMediaPlaylist::Loop);
-    mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(GreeterContacts::instance()->incomingCallSound()));
     mCallAudioPlaylist.setCurrentIndex(0);
     mVibrateEffect.setDuration(500);
 }
@@ -46,6 +45,8 @@
         return;
     }
 
+    // pick up the new ringtone in case it changed in the meantime
+    mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(GreeterContacts::instance()->incomingCallSound()));
     mCallAudioPlayer = new QMediaPlayer(this);
     mCallAudioPlayer->setAudioRole(QMediaPlayer::AlertRole);
     mCallAudioPlayer->setPlaylist(&mCallAudioPlaylist);
@@ -60,6 +61,7 @@
         mCallAudioPlayer->deleteLater();
         mCallAudioPlayer = NULL;
     }
+    mCallAudioPlaylist.clear();
 }
 
 void RingtoneWorker::playIncomingMessageSound()