Merge lp:~schwann/qtubuntu-camera/camera-click-sound into lp:qtubuntu-camera

[Günter Schwann]

Play sound when capturing a photo fixes LP: #1220736

Play sound when capturing a photo fixes LP: #1220736

[Thomas Moenicke (thomas-moenicke)]

maybe delete it in destructor

[lp:~schwann/qtubuntu-camera/camera-click-sound]

85. By Günter Schwann on 2013-09-17

Explicitly delete the m_audioPlayer object

[Thomas Moenicke (thomas-moenicke)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/38

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-saucy-i386-ci/39

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

review: Approve (continuous-integration)

=== modified file 'src/aalimagecapturecontrol.cpp'
--- src/aalimagecapturecontrol.cpp	2013-06-24 07:00:43 +0000
+++ src/aalimagecapturecontrol.cpp	2013-09-17 09:30:23 +0000
@@ -27,6 +27,7 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QMediaPlayer>
 #include <QStandardPaths>
 #include <QTemporaryFile>
 
@@ -44,13 +45,16 @@
     m_photoWidth(320),
     m_photoHeight(240),
     m_aspectRatio(0.0),
-    m_screenAspectRatio(0.0)
+    m_screenAspectRatio(0.0),
+    m_audioPlayer(new QMediaPlayer(this))
 {
     m_galleryPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+    m_audioPlayer->setMedia(QUrl::fromLocalFile("/system/media/audio/ui/camera_click.ogg"));
 }
 
 AalImageCaptureControl::~AalImageCaptureControl()
 {
+    delete(m_audioPlayer);
 }
 
 bool AalImageCaptureControl::isReadyForCapture() const
@@ -157,6 +161,7 @@
 
 void AalImageCaptureControl::shutter()
 {
+    m_audioPlayer->play();
     Q_EMIT imageExposed(m_lastRequestId);
 }
 

=== modified file 'src/aalimagecapturecontrol.h'
--- src/aalimagecapturecontrol.h	2013-06-24 07:00:43 +0000
+++ src/aalimagecapturecontrol.h	2013-09-17 09:30:23 +0000
@@ -27,6 +27,7 @@
 class AalCameraControl;
 class CameraControl;
 class CameraControlListener;
+class QMediaPlayer;
 
 class AalImageCaptureControl : public QCameraImageCaptureControl
 {
@@ -81,6 +82,7 @@
     /// currently selected camera
     QList<float> m_prioritizedAspectRatios;
     QString m_galleryPath;
+    QMediaPlayer *m_audioPlayer;
 };
 
 #endif