1
=== modified file 'src/aalmediarecordercontrol.cpp'
2
--- src/aalmediarecordercontrol.cpp	2014-11-18 18:24:52 +0000
3
+++ src/aalmediarecordercontrol.cpp	2014-12-03 22:17:37 +0000
4
@@ -63,7 +63,7 @@
5
63
    m_currentState(QMediaRecorder::StoppedState),
63
    m_currentState(QMediaRecorder::StoppedState),
6
64
    m_currentStatus(QMediaRecorder::UnloadedStatus),
64
    m_currentStatus(QMediaRecorder::UnloadedStatus),
7
65
    m_recordingTimer(0),
65
    m_recordingTimer(0),
9
66
    m_workerThread(new QThread)
66
    m_workerThread(0)
10
67
{
67
{
11
68
}
68
}
12
69
69
13
@@ -73,8 +73,6 @@
14
73
AalMediaRecorderControl::~AalMediaRecorderControl()
73
AalMediaRecorderControl::~AalMediaRecorderControl()
15
74
{
74
{
16
75
    delete m_recordingTimer;
75
    delete m_recordingTimer;
17
76
    m_workerThread->deleteLater();
18
77
    m_audioCapture->deleteLater();
19
78
    deleteRecorder();
76
    deleteRecorder();
20
79
}
77
}
21
80
78
22
@@ -170,6 +168,7 @@
23
170
        m_mediaRecorder = android_media_new_recorder();
168
        m_mediaRecorder = android_media_new_recorder();
24
171
169
25
172
        m_audioCapture = new AudioCapture(m_mediaRecorder);
170
        m_audioCapture = new AudioCapture(m_mediaRecorder);
26
171
        m_workerThread = new QThread;
27
173
172
28
174
        if (m_audioCapture == 0) {
173
        if (m_audioCapture == 0) {
29
175
            qWarning() << "Unable to create new audio capture, audio recording won't function";
174
            qWarning() << "Unable to create new audio capture, audio recording won't function";
30
@@ -184,7 +183,14 @@
31
184
183
32
185
            // Finished signal is for when the workerThread is completed. Important to connect this so that
184
            // Finished signal is for when the workerThread is completed. Important to connect this so that
33
186
            // resources are cleaned up in the proper order and not leaked
185
            // resources are cleaned up in the proper order and not leaked
35
187
            ret = connect(m_workerThread, SIGNAL(finished()), m_audioCapture, SLOT(deleteLater()));
186
            ret = connect(m_audioCapture, SIGNAL(finished()), m_workerThread, SLOT(quit()));
36
187
            if (!ret)
37
188
                qWarning() << "Failed to connect quit() to the m_audioCapture finished signal";
38
189
            ret = connect(m_audioCapture, SIGNAL(finished()), m_audioCapture, SLOT(deleteLater()));
39
190
            if (!ret)
40
191
                qWarning() << "Failed to connect deleteLater() to the m_audioCapture finished signal";
41
192
            // Clean up the worker thread after we finish recording
42
193
            ret = connect(m_workerThread, SIGNAL(finished()), m_workerThread, SLOT(deleteLater()));
43
188
            if (!ret)
194
            if (!ret)
44
189
                qWarning() << "Failed to connect deleteLater() to the m_workerThread finished signal";
195
                qWarning() << "Failed to connect deleteLater() to the m_workerThread finished signal";
45
190
            // startWorkerThread signal comes from an Android layer callback that resides down in
196
            // startWorkerThread signal comes from an Android layer callback that resides down in
46
191
197
47
=== modified file 'src/audiocapture.cpp'
48
--- src/audiocapture.cpp	2014-07-31 16:44:03 +0000
49
+++ src/audiocapture.cpp	2014-12-03 22:17:37 +0000
50
@@ -95,6 +95,13 @@
51
95
                && bytesWritten == readSize
95
                && bytesWritten == readSize
52
96
                && !m_flagExit);
96
                && !m_flagExit);
53
97
97
54
98
    // Make sure that Pulse stops reading the microphone when recording stops
55
99
    if (m_paStream != NULL)
56
100
    {
57
101
        pa_simple_free(m_paStream);
58
102
        m_paStream = NULL;
59
103
    }
60
104
61
98
    Q_EMIT finished();
105
    Q_EMIT finished();
62
99
}
106
}
63
100
107
Reviewer	Review Type	Date Requested	Status
Ricardo Salveti (community)		2014-12-03	Approve on 2014-12-04
PS Jenkins bot	continuous-integration		Approve on 2014-12-03
Review via email: mp+243563@code.launchpad.net