1
=== modified file 'src/aalimagecapturecontrol.cpp'
2
--- src/aalimagecapturecontrol.cpp	2013-06-24 07:00:43 +0000
3
+++ src/aalimagecapturecontrol.cpp	2013-09-17 09:30:23 +0000
4
@@ -27,6 +27,7 @@
5
27
#include <QDir>
27
#include <QDir>
6
28
#include <QFile>
28
#include <QFile>
7
29
#include <QFileInfo>
29
#include <QFileInfo>
8
30
#include <QMediaPlayer>
9
30
#include <QStandardPaths>
31
#include <QStandardPaths>
10
31
#include <QTemporaryFile>
32
#include <QTemporaryFile>
11
32
33
12
@@ -44,13 +45,16 @@
13
44
    m_photoWidth(320),
45
    m_photoWidth(320),
14
45
    m_photoHeight(240),
46
    m_photoHeight(240),
15
46
    m_aspectRatio(0.0),
47
    m_aspectRatio(0.0),
17
47
    m_screenAspectRatio(0.0)
48
    m_screenAspectRatio(0.0),
18
49
    m_audioPlayer(new QMediaPlayer(this))
19
48
{
50
{
20
49
    m_galleryPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
51
    m_galleryPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
21
52
    m_audioPlayer->setMedia(QUrl::fromLocalFile("/system/media/audio/ui/camera_click.ogg"));
22
50
}
53
}
23
51
54
24
52
AalImageCaptureControl::~AalImageCaptureControl()
55
AalImageCaptureControl::~AalImageCaptureControl()
25
53
{
56
{
26
57
    delete(m_audioPlayer);
27
54
}
58
}
28
55
59
29
56
bool AalImageCaptureControl::isReadyForCapture() const
60
bool AalImageCaptureControl::isReadyForCapture() const
30
@@ -157,6 +161,7 @@
31
157
161
32
158
void AalImageCaptureControl::shutter()
162
void AalImageCaptureControl::shutter()
33
159
{
163
{
34
164
    m_audioPlayer->play();
35
160
    Q_EMIT imageExposed(m_lastRequestId);
165
    Q_EMIT imageExposed(m_lastRequestId);
36
161
}
166
}
37
162
167
38
163
168
39
=== modified file 'src/aalimagecapturecontrol.h'
40
--- src/aalimagecapturecontrol.h	2013-06-24 07:00:43 +0000
41
+++ src/aalimagecapturecontrol.h	2013-09-17 09:30:23 +0000
42
@@ -27,6 +27,7 @@
43
27
class AalCameraControl;
27
class AalCameraControl;
44
28
class CameraControl;
28
class CameraControl;
45
29
class CameraControlListener;
29
class CameraControlListener;
46
30
class QMediaPlayer;
47
30
31
48
31
class AalImageCaptureControl : public QCameraImageCaptureControl
32
class AalImageCaptureControl : public QCameraImageCaptureControl
49
32
{
33
{
50
@@ -81,6 +82,7 @@
51
81
    /// currently selected camera
82
    /// currently selected camera
52
82
    QList<float> m_prioritizedAspectRatios;
83
    QList<float> m_prioritizedAspectRatios;
53
83
    QString m_galleryPath;
84
    QString m_galleryPath;
54
85
    QMediaPlayer *m_audioPlayer;
55
84
};
86
};
56
85
87
57
86
#endif
88
#endif
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-09-17
Thomas Moenicke (community)		2013-09-17	Approve on 2013-09-17
Review via email: mp+185989@code.launchpad.net