FileRecorder + FilePlayer: Let Create functions return unique_ptr

webrtc/modules/utility/source/file_recorder.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 22 matching lines @@
 // The largest decoded frame size in samples (60ms with 32kHz sample rate).
 enum { MAX_AUDIO_BUFFER_IN_SAMPLES = 60 * 32 };
 enum { MAX_AUDIO_BUFFER_IN_BYTES = MAX_AUDIO_BUFFER_IN_SAMPLES * 2 };
 enum { kMaxAudioBufferQueueLength = 100 };
 
 class CriticalSectionWrapper;
 
 class FileRecorderImpl : public FileRecorder {
  public:
   FileRecorderImpl(uint32_t instanceID, FileFormats fileFormat);
-  virtual ~FileRecorderImpl();
+  ~FileRecorderImpl() override;
 
   // FileRecorder functions.
   int32_t RegisterModuleFileCallback(FileCallback* callback) override;
   FileFormats RecordingFileFormat() const override;
   int32_t StartRecordingAudioFile(const char* fileName,
                                   const CodecInst& codecInst,
                                   uint32_t notificationTimeMs) override;
   int32_t StartRecordingAudioFile(OutStream& destStream,
                                   const CodecInst& codecInst,
                                   uint32_t notificationTimeMs) override;
   int32_t StopRecording() override;
   bool IsRecording() const override;
   int32_t codec_info(CodecInst& codecInst) const override;
   int32_t RecordAudioToFile(const AudioFrame& frame) override;
 
- protected:
+ private:
   int32_t WriteEncodedAudioData(const int8_t* audioBuffer, size_t bufferLength);
 
   int32_t SetUpAudioEncoder();
 
   uint32_t _instanceID;
   FileFormats _fileFormat;
   MediaFile* _moduleFile;
 
- private:
   CodecInst codec_info_;
   int8_t _audioBuffer[MAX_AUDIO_BUFFER_IN_BYTES];
   AudioCoder _audioEncoder;
   Resampler _audioResampler;
 };
 
 FileRecorderImpl::FileRecorderImpl(uint32_t instanceID, FileFormats fileFormat)
     : _instanceID(instanceID),
       _fileFormat(fileFormat),
       _moduleFile(MediaFile::CreateMediaFile(_instanceID)),
@@ skipping 169 matching lines @@
   return 0;
 }
 
 int32_t FileRecorderImpl::WriteEncodedAudioData(const int8_t* audioBuffer,
                                                 size_t bufferLength) {
   return _moduleFile->IncomingAudioData(audioBuffer, bufferLength);
 }
 
 }  // namespace
 
-FileRecorder* FileRecorder::CreateFileRecorder(uint32_t instanceID,
-                                               FileFormats fileFormat) {
-  return new FileRecorderImpl(instanceID, fileFormat);
-}
-
-void FileRecorder::DestroyFileRecorder(FileRecorder* recorder) {
-  delete recorder;
+std::unique_ptr<FileRecorder> FileRecorder::CreateFileRecorder(
+    uint32_t instanceID,
+    FileFormats fileFormat) {
+  return std::unique_ptr<FileRecorder>(
+      new FileRecorderImpl(instanceID, fileFormat));
 }
 
 }  // namespace webrtc