commit 5a25d9504acdaab540e1a7f1f26cf3bab34a7d5e
author kwiberg <kwiberg@webrtc.org> Wed Aug 17 07:31:12 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 17 14:31:18 2016 +0000
tree e377b4f37d87136a4fb012e45c73f7ade38446d6
parent 4466782ae43e1b1125a55ee7e18abd10dd37cede

FileRecorder + FilePlayer: Let Create functions return unique_ptr

Because passing ownership in raw pointers makes kittens cry.

This also means we can ditch the Destroy functions and the protected
destructors. (Well, almost. We need to keep the old CreateFilePlayer
and DestroyFilePlayer around for a little while longer because of an
external caller.)

Review-Url: https://codereview.webrtc.org/2049683003
Cr-Commit-Position: refs/heads/master@{#13797}

webrtc/modules/utility/source/file_player.cc

diff --git a/webrtc/modules/utility/source/file_player.cc b/webrtc/modules/utility/source/file_player.cc
index 8434b72..c6429b8 100644
--- a/webrtc/modules/utility/source/file_player.cc
+++ b/webrtc/modules/utility/source/file_player.cc
@@ -53,16 +53,14 @@
   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;
@@ -75,8 +73,7 @@
 
 FilePlayerImpl::FilePlayerImpl(const uint32_t instanceID,
                                const FileFormats fileFormat)
-    : _instanceID(instanceID),
-      _fileFormat(fileFormat),
+    : _fileFormat(fileFormat),
       _fileModule(*MediaFile::CreateMediaFile(instanceID)),
       _decodedLengthInMS(0),
       _audioDecoder(instanceID),
@@ -373,8 +370,9 @@
 
 }  // 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:
@@ -383,13 +381,19 @@
     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;
 }