| Index: webrtc/modules/audio_device/dummy/file_audio_device.cc
|
| diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.cc b/webrtc/modules/audio_device/dummy/file_audio_device.cc
|
| index 3dcb1384e7871158510d8b5986d5f413a0cf4271..a012c9721cb02851ae522c999ae18ff07b7bc18a 100644
|
| --- a/webrtc/modules/audio_device/dummy/file_audio_device.cc
|
| +++ b/webrtc/modules/audio_device/dummy/file_audio_device.cc
|
| @@ -27,25 +27,24 @@ const size_t kRecordingBufferSize =
|
|
|
| FileAudioDevice::FileAudioDevice(const int32_t id,
|
| const char* inputFilename,
|
| - const char* outputFilename):
|
| - _ptrAudioBuffer(NULL),
|
| - _recordingBuffer(NULL),
|
| - _playoutBuffer(NULL),
|
| - _recordingFramesLeft(0),
|
| - _playoutFramesLeft(0),
|
| - _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
|
| - _recordingBufferSizeIn10MS(0),
|
| - _recordingFramesIn10MS(0),
|
| - _playoutFramesIn10MS(0),
|
| - _playing(false),
|
| - _recording(false),
|
| - _lastCallPlayoutMillis(0),
|
| - _lastCallRecordMillis(0),
|
| - _outputFile(*FileWrapper::Create()),
|
| - _inputFile(*FileWrapper::Create()),
|
| - _outputFilename(outputFilename),
|
| - _inputFilename(inputFilename) {
|
| -}
|
| + const char* outputFilename)
|
| + : _ptrAudioBuffer(nullptr),
|
| + _recordingBuffer(nullptr),
|
| + _playoutBuffer(nullptr),
|
| + _recordingFramesLeft(0),
|
| + _playoutFramesLeft(0),
|
| + _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
|
| + _recordingBufferSizeIn10MS(0),
|
| + _recordingFramesIn10MS(0),
|
| + _playoutFramesIn10MS(0),
|
| + _playing(false),
|
| + _recording(false),
|
| + _lastCallPlayoutMillis(0),
|
| + _lastCallRecordMillis(0),
|
| + _outputFile(*FileWrapper::Create()),
|
| + _inputFile(*FileWrapper::Create()),
|
| + _outputFilename(outputFilename),
|
| + _inputFilename(inputFilename) {}
|
|
|
| FileAudioDevice::~FileAudioDevice() {
|
| delete &_outputFile;
|
| @@ -203,7 +202,7 @@ int32_t FileAudioDevice::StartPlayout() {
|
| LOG(LS_ERROR) << "Failed to open playout file: " << _outputFilename;
|
| _playing = false;
|
| delete [] _playoutBuffer;
|
| - _playoutBuffer = NULL;
|
| + _playoutBuffer = nullptr;
|
| return -1;
|
| }
|
|
|
| @@ -233,7 +232,7 @@ int32_t FileAudioDevice::StopPlayout() {
|
|
|
| _playoutFramesLeft = 0;
|
| delete [] _playoutBuffer;
|
| - _playoutBuffer = NULL;
|
| + _playoutBuffer = nullptr;
|
| _outputFile.CloseFile();
|
|
|
| LOG(LS_INFO) << "Stopped playout capture to output file: "
|
| @@ -261,7 +260,7 @@ int32_t FileAudioDevice::StartRecording() {
|
| LOG(LS_ERROR) << "Failed to open audio input file: " << _inputFilename;
|
| _recording = false;
|
| delete[] _recordingBuffer;
|
| - _recordingBuffer = NULL;
|
| + _recordingBuffer = nullptr;
|
| return -1;
|
| }
|
|
|
| @@ -293,7 +292,7 @@ int32_t FileAudioDevice::StopRecording() {
|
| _recordingFramesLeft = 0;
|
| if (_recordingBuffer) {
|
| delete [] _recordingBuffer;
|
| - _recordingBuffer = NULL;
|
| + _recordingBuffer = nullptr;
|
| }
|
| _inputFile.CloseFile();
|
|
|
|
|