FileRecorder + FilePlayer: Let Create functions return unique_ptr

webrtc/voice_engine/output_mixer.h

Index: webrtc/voice_engine/output_mixer.h
diff --git a/webrtc/voice_engine/output_mixer.h b/webrtc/voice_engine/output_mixer.h
index ae2f53fdb9d7d8197b89c25b0c2a554e8fcfcd93..cc8dddfbfceacd29dfb8a987f9ff9d8edf7a7b2e 100644
--- a/webrtc/voice_engine/output_mixer.h
+++ b/webrtc/voice_engine/output_mixer.h
@@ -11,6 +11,8 @@
 #ifndef WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_
 #define WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_
 
+#include <memory>
+
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/common_types.h"
@@ -104,7 +106,7 @@ private:
     AudioProcessing* _audioProcessingModulePtr;
 
     rtc::CriticalSection _callbackCritSect;
-    // protect the _outputFileRecorderPtr and _outputFileRecording
+    // Protects output_file_recorder_ and _outputFileRecording.
     rtc::CriticalSection _fileCritSect;
     AudioConferenceMixer& _mixerModule;
     AudioFrame _audioFrame;
@@ -119,7 +121,7 @@ private:
     float _panLeft;
     float _panRight;
     int _mixingFrequencyHz;
-    FileRecorder* _outputFileRecorderPtr;
+    std::unique_ptr<FileRecorder> output_file_recorder_;

[ossu, 2016/08/17 11:09:06]

Should this have some sort of annotation if it's being protected by a critical
section? Probably not as part of this CL, though.

[kwiberg-webrtc, 2016/08/17 12:27:39]

Yes.

     bool _outputFileRecording;
 };