comparison audio/AudioCallbackRecordTarget.cpp @ 636:e2715204feaa fix-static-analysis

Use nullptr throughout
author Chris Cannam
date Mon, 26 Nov 2018 14:34:06 +0000
parents 5e0018969003
children 6fd0ebfd2bbe
comparison
equal deleted inserted replaced
635:26a0cb8335e3 636:e2715204feaa
32 m_clientName(clientName.toUtf8().data()), 32 m_clientName(clientName.toUtf8().data()),
33 m_recording(false), 33 m_recording(false),
34 m_recordSampleRate(44100), 34 m_recordSampleRate(44100),
35 m_recordChannelCount(2), 35 m_recordChannelCount(2),
36 m_frameCount(0), 36 m_frameCount(0),
37 m_model(0), 37 m_model(nullptr),
38 m_buffers(0), 38 m_buffers(nullptr),
39 m_bufferCount(0), 39 m_bufferCount(0),
40 m_inputLeft(0.f), 40 m_inputLeft(0.f),
41 m_inputRight(0.f), 41 m_inputRight(0.f),
42 m_levelsSet(false) 42 m_levelsSet(false)
43 { 43 {
49 recreateBuffers(); 49 recreateBuffers();
50 } 50 }
51 51
52 AudioCallbackRecordTarget::~AudioCallbackRecordTarget() 52 AudioCallbackRecordTarget::~AudioCallbackRecordTarget()
53 { 53 {
54 m_viewManager->setAudioRecordTarget(0); 54 m_viewManager->setAudioRecordTarget(nullptr);
55 55
56 QMutexLocker locker(&m_bufPtrMutex); 56 QMutexLocker locker(&m_bufPtrMutex);
57 for (int c = 0; c < m_bufferCount; ++c) { 57 for (int c = 0; c < m_bufferCount; ++c) {
58 delete m_buffers[c]; 58 delete m_buffers[c];
59 } 59 }
215 215
216 void 216 void
217 AudioCallbackRecordTarget::modelAboutToBeDeleted() 217 AudioCallbackRecordTarget::modelAboutToBeDeleted()
218 { 218 {
219 if (sender() == m_model) { 219 if (sender() == m_model) {
220 m_model = 0; 220 m_model = nullptr;
221 m_recording = false; 221 m_recording = false;
222 } 222 }
223 } 223 }
224 224
225 WritableWaveFileModel * 225 WritableWaveFileModel *
226 AudioCallbackRecordTarget::startRecording() 226 AudioCallbackRecordTarget::startRecording()
227 { 227 {
228 if (m_recording) { 228 if (m_recording) {
229 SVCERR << "WARNING: AudioCallbackRecordTarget::startRecording: We are already recording" << endl; 229 SVCERR << "WARNING: AudioCallbackRecordTarget::startRecording: We are already recording" << endl;
230 return 0; 230 return nullptr;
231 } 231 }
232 232
233 m_model = 0; 233 m_model = nullptr;
234 m_frameCount = 0; 234 m_frameCount = 0;
235 235
236 QString folder = RecordDirectory::getRecordDirectory(); 236 QString folder = RecordDirectory::getRecordDirectory();
237 if (folder == "") return 0; 237 if (folder == "") return nullptr;
238 QDir recordedDir(folder); 238 QDir recordedDir(folder);
239 239
240 QDateTime now = QDateTime::currentDateTime(); 240 QDateTime now = QDateTime::currentDateTime();
241 241
242 // Don't use QDateTime::toString(Qt::ISODate) as the ":" character 242 // Don't use QDateTime::toString(Qt::ISODate) as the ":" character
257 if (!m_model->isOK()) { 257 if (!m_model->isOK()) {
258 SVCERR << "ERROR: AudioCallbackRecordTarget::startRecording: Recording failed" 258 SVCERR << "ERROR: AudioCallbackRecordTarget::startRecording: Recording failed"
259 << endl; 259 << endl;
260 //!!! and throw? 260 //!!! and throw?
261 delete m_model; 261 delete m_model;
262 m_model = 0; 262 m_model = nullptr;
263 return 0; 263 return nullptr;
264 } 264 }
265 265
266 m_model->setObjectName(label); 266 m_model->setObjectName(label);
267 m_recording = true; 267 m_recording = true;
268 268
288 288
289 // buffers should now be up-to-date 289 // buffers should now be up-to-date
290 updateModel(); 290 updateModel();
291 291
292 m_model->writeComplete(); 292 m_model->writeComplete();
293 m_model = 0; 293 m_model = nullptr;
294 294
295 emit recordStatusChanged(false); 295 emit recordStatusChanged(false);
296 emit recordCompleted(); 296 emit recordCompleted();
297 } 297 }
298 298