diff --git a/daemon/src/audio/audiorecord.cpp b/daemon/src/audio/audiorecord.cpp index 4b85829cc089332ddf0702a94b93f381e5e7dca5..27c5c611ea38a2d343e87e69fa48fff4133e995c 100644 --- a/daemon/src/audio/audiorecord.cpp +++ b/daemon/src/audio/audiorecord.cpp @@ -57,24 +57,16 @@ AudioRecord::AudioRecord() : fileHandle_(NULL) , sndSmplRate_(8000) , nbSamplesMic_(0) , nbSamplesSpk_(0) - , nbSamplesMax_(3000) , recordingEnabled_(false) - , mixBuffer_(new SFLDataFormat[nbSamplesMax_]) - , micBuffer_(new SFLDataFormat[nbSamplesMax_]) - , spkBuffer_(new SFLDataFormat[nbSamplesMax_]) + , mixBuffer_() + , micBuffer_() + , spkBuffer_() , filename_() , savePath_() { createFilename(); } -AudioRecord::~AudioRecord() -{ - delete [] mixBuffer_; - delete [] micBuffer_; - delete [] spkBuffer_; -} - void AudioRecord::setSndSamplingRate(int smplRate) { sndSmplRate_ = smplRate; diff --git a/daemon/src/audio/audiorecord.h b/daemon/src/audio/audiorecord.h index 03a9f6a7d3d274ea4976b30674165d804471f756..46b4b78050794352d3114271e69182ea66c42608 100644 --- a/daemon/src/audio/audiorecord.h +++ b/daemon/src/audio/audiorecord.h @@ -33,6 +33,7 @@ #include <string> #include <cstdlib> +#include <memory> #include "global.h" #include "noncopyable.h" @@ -44,8 +45,6 @@ class AudioRecord { AudioRecord(); - ~AudioRecord(); - void setSndSamplingRate(int smplRate); /** * Get the recrding sampling rate @@ -206,7 +205,7 @@ class AudioRecord { /** * Maximum number of samples */ - int nbSamplesMax_; + static const int NB_SAMPLES_MAX = 3000; /** * Recording flage @@ -216,17 +215,17 @@ class AudioRecord { /** * Buffer used for mixing two channels */ - SFLDataFormat* mixBuffer_; + SFLDataFormat mixBuffer_[NB_SAMPLES_MAX]; /** * Buffer used to copy mic info */ - SFLDataFormat* micBuffer_; + SFLDataFormat micBuffer_[NB_SAMPLES_MAX]; /** * Buffer used to copy spkr info */ - SFLDataFormat* spkBuffer_; + SFLDataFormat spkBuffer_[NB_SAMPLES_MAX]; /** * Filename for this recording