Merge lp:~phablet-team/qtubuntu-camera/audio-role into lp:qtubuntu-camera

[Jim Hodapp]

Get rid of using the old QMediaPlayer::Alert role and use the new
QAudio::NotificationRole for vivid and xenial.

Get rid of using the old QMediaPlayer::Alert role and use the new
QAudio::NotificationRole for vivid and xenial.

[lp:~phablet-team/qtubuntu-camera/audio-role]

161. By Jim Hodapp on 2016-03-23

Get rid of using the old QMediaPlayer::Alert role and use the new
QAudio::NotificationRole for vivid and xenial.

=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp	2016-02-09 08:54:12 +0000
+++ src/aalimagecapturecontrol.cpp	2016-03-23 15:31:00 +0000
@@ -36,6 +36,7 @@
 #include <QScreen>
 #include <QSettings>
 #include <QtConcurrent/QtConcurrent>
+#include <QtMultimedia/qaudio.h>
 
 AalImageCaptureControl::AalImageCaptureControl(AalCameraService *service, QObject *parent)
    : QCameraImageCaptureControl(parent),
@@ -50,11 +51,7 @@
 {
     m_galleryPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
     m_audioPlayer->setMedia(QUrl::fromLocalFile("/system/media/audio/ui/camera_click.ogg"));
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-    m_audioPlayer->setAudioRole(QMediaPlayer::AlertRole);
-#else
     m_audioPlayer->setAudioRole(QAudio::NotificationRole);
-#endif
 
     QObject::connect(&m_storageManager, &StorageManager::previewReady,
                      this, &AalImageCaptureControl::imageCaptured);