Merge lp:~phablet-team/telephony-service/audio-role into lp:telephony-service

[Jim Hodapp]

Make sure the sound preview uses the correct audioRole API.

Make sure the sound preview uses the correct audioRole API.

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'libtelephonyservice/ringtone.cpp'
--- libtelephonyservice/ringtone.cpp	2015-12-02 13:14:29 +0000
+++ libtelephonyservice/ringtone.cpp	2016-03-21 19:06:33 +0000
@@ -46,11 +46,7 @@
     // pick up the new ringtone in case it changed in the meantime
     mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(GreeterContacts::instance()->incomingCallSound()));
     mCallAudioPlayer = new QMediaPlayer(this);
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-    mCallAudioPlayer->setAudioRole(QMediaPlayer::AlertRole);
-#else
     mCallAudioPlayer->setAudioRole(QAudio::RingtoneRole);
-#endif
     mCallAudioPlayer->setPlaylist(&mCallAudioPlaylist);
     mCallAudioPlayer->play();
 }
@@ -78,11 +74,7 @@
 
     if (!mMessageAudioPlayer) {
         mMessageAudioPlayer = new QMediaPlayer(this);
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-        mMessageAudioPlayer->setAudioRole(QMediaPlayer::AlertRole);
-#else
         mMessageAudioPlayer->setAudioRole(QAudio::NotificationRole);
-#endif
     }
 
     // WORKAROUND: there is a bug in qmediaplayer/(media-hub?) that never goes into Stopped mode.