Merge lp:~rsalveti/qtubuntu-camera/add_audio_role into lp:qtubuntu-camera

[Ricardo Salveti]

Setting media role for the shutter sound (alert)

Setting media role for the shutter sound (alert)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:108
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/89/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/30

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks good, thanks

review: Approve (code)

=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp	2014-07-16 14:37:32 +0000
+++ src/aalimagecapturecontrol.cpp	2014-09-08 17:11:28 +0000
@@ -51,6 +51,7 @@
 {
     m_galleryPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
     m_audioPlayer->setMedia(QUrl::fromLocalFile("/system/media/audio/ui/camera_click.ogg"));
+    m_audioPlayer->setAudioRole(QMediaPlayer::AlertRole);
 }
 
 AalImageCaptureControl::~AalImageCaptureControl()