Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1369)

Unified Diff: webrtc/voice_engine/shared_data.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/voice_engine/shared_data.cc
diff --git a/webrtc/voice_engine/shared_data.cc b/webrtc/voice_engine/shared_data.cc
index 41e261bd58c773d344514520782b664069512ac9..63a517215689dc0cf3c5c780da476921ca271faa 100644
--- a/webrtc/voice_engine/shared_data.cc
+++ b/webrtc/voice_engine/shared_data.cc
@@ -26,21 +26,17 @@ SharedData::SharedData()
: _instanceId(++_gInstanceCounter),
_channelManager(_gInstanceCounter),
_engineStatistics(_gInstanceCounter),
- _audioDevicePtr(NULL),
- _moduleProcessThreadPtr(
- ProcessThread::Create("VoiceProcessThread")) {
- Trace::CreateTrace();
- if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0)
- {
- _outputMixerPtr->SetEngineInformation(_engineStatistics);
- }
- if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0)
- {
- _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr,
- _engineStatistics,
- _channelManager);
- }
- _audioDeviceLayer = AudioDeviceModule::kPlatformDefaultAudio;
+ _audioDevicePtr(nullptr),
+ _moduleProcessThreadPtr(ProcessThread::Create("VoiceProcessThread")) {
+ Trace::CreateTrace();
+ if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) {
+ _outputMixerPtr->SetEngineInformation(_engineStatistics);
+ }
+ if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) {
+ _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr,
+ _engineStatistics, _channelManager);
+ }
+ _audioDeviceLayer = AudioDeviceModule::kPlatformDefaultAudio;
}
SharedData::~SharedData()

Powered by Google App Engine
This is Rietveld 408576698