diff audio/AudioCallbackRecordTarget.cpp @ 644:6fd0ebfd2bbe

Merge from branch fix-static-analysis

--- a/audio/AudioCallbackRecordTarget.cpp	Wed Jan 09 14:42:25 2019 +0000
+++ b/audio/AudioCallbackRecordTarget.cpp	Wed Jan 09 15:25:09 2019 +0000
@@ -35,8 +35,8 @@
     m_recordSampleRate(44100),
     m_recordChannelCount(2),
     m_frameCount(0),
-    m_model(0),
-    m_buffers(0),
+    m_model(nullptr),
+    m_buffers(nullptr),
     m_bufferCount(0),
     m_inputLeft(0.f),
     m_inputRight(0.f),
@@ -56,7 +56,7 @@
     cerr << "AudioCallbackRecordTarget dtor" << endl;
 #endif
     
-    m_viewManager->setAudioRecordTarget(0);
+    m_viewManager->setAudioRecordTarget(nullptr);
 
     QMutexLocker locker(&m_bufPtrMutex);
     for (int c = 0; c < m_bufferCount; ++c) {
@@ -232,7 +232,7 @@
 #ifdef DEBUG_AUDIO_CALLBACK_RECORD_TARGET
         cerr << "AudioCallbackRecordTarget::modelAboutToBeDeleted: taking note" << endl;
 #endif
-        m_model = 0;
+        m_model = nullptr;
         m_recording = false;
     } else if (m_model) {
         SVCERR << "WARNING: AudioCallbackRecordTarget::modelAboutToBeDeleted: this is not my model!" << endl;
@@ -244,14 +244,14 @@
 {
     if (m_recording) {
         SVCERR << "WARNING: AudioCallbackRecordTarget::startRecording: We are already recording" << endl;
-        return 0;
+        return nullptr;
     }
 
-    m_model = 0;
+    m_model = nullptr;
     m_frameCount = 0;
 
     QString folder = RecordDirectory::getRecordDirectory();
-    if (folder == "") return 0;
+    if (folder == "") return nullptr;
     QDir recordedDir(folder);
 
     QDateTime now = QDateTime::currentDateTime();
@@ -276,8 +276,8 @@
                << endl;
         //!!! and throw?
         delete m_model;
-        m_model = 0;
-        return 0;
+        m_model = nullptr;
+        return nullptr;
     }
 
     connect(m_model, SIGNAL(aboutToBeDeleted()), 
@@ -310,7 +310,7 @@
     updateModel();
 
     m_model->writeComplete();
-    m_model = 0;
+    m_model = nullptr;
     
     emit recordStatusChanged(false);
     emit recordCompleted();