FileRecorder + FilePlayer: Let Create functions return unique_ptr

webrtc/modules/utility/source/file_player.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 35 matching lines @@
                                    uint32_t notification,
                                    uint32_t stopPosition = 0,
                                    const CodecInst* codecInst = NULL);
   virtual int32_t StopPlayingFile();
   virtual bool IsPlayingFile() const;
   virtual int32_t GetPlayoutPosition(uint32_t& durationMs);
   virtual int32_t AudioCodec(CodecInst& audioCodec) const;
   virtual int32_t Frequency() const;
   virtual int32_t SetAudioScaling(float scaleFactor);
 
- protected:
+ private:
   int32_t SetUpAudioDecoder();
 
-  uint32_t _instanceID;
   const FileFormats _fileFormat;
   MediaFile& _fileModule;
 
   uint32_t _decodedLengthInMS;
 
- private:
   AudioCoder _audioDecoder;
 
   CodecInst _codec;
   int32_t _numberOf10MsPerFrame;
   int32_t _numberOf10MsInDecoder;
 
   Resampler _resampler;
   float _scaling;
 };
 
 FilePlayerImpl::FilePlayerImpl(const uint32_t instanceID,
                                const FileFormats fileFormat)
-    : _instanceID(instanceID),
-      _fileFormat(fileFormat),
+    : _fileFormat(fileFormat),
       _fileModule(*MediaFile::CreateMediaFile(instanceID)),
       _decodedLengthInMS(0),
       _audioDecoder(instanceID),
       _codec(),
       _numberOf10MsPerFrame(0),
       _numberOf10MsInDecoder(0),
       _resampler(),
       _scaling(1.0) {
   _codec.plfreq = 0;
 }
@@ skipping 276 matching lines @@
                     << " not supported.";
     return -1;
   }
   _numberOf10MsPerFrame = _codec.pacsize / (_codec.plfreq / 100);
   _numberOf10MsInDecoder = 0;
   return 0;
 }
 
 }  // namespace
 
-FilePlayer* FilePlayer::CreateFilePlayer(uint32_t instanceID,
-                                         FileFormats fileFormat) {
+std::unique_ptr<FilePlayer> FilePlayer::NewFilePlayer(
+    uint32_t instanceID,
+    FileFormats fileFormat) {
   switch (fileFormat) {
     case kFileFormatWavFile:
     case kFileFormatCompressedFile:
     case kFileFormatPreencodedFile:
     case kFileFormatPcm16kHzFile:
     case kFileFormatPcm8kHzFile:
     case kFileFormatPcm32kHzFile:
       // audio formats
-      return new FilePlayerImpl(instanceID, fileFormat);
+      return std::unique_ptr<FilePlayer>(
+          new FilePlayerImpl(instanceID, fileFormat));
     default:
       assert(false);
-      return NULL;
+      return nullptr;
   }
 }
 
+FilePlayer* FilePlayer::CreateFilePlayer(uint32_t instanceID,
+                                         FileFormats fileFormat) {
+  return FilePlayer::NewFilePlayer(instanceID, fileFormat).release();
+}
+
 void FilePlayer::DestroyFilePlayer(FilePlayer* player) {
   delete player;
 }
 
 }  // namespace webrtc