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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/voice_engine/shared_data.h" 11 #include "webrtc/voice_engine/shared_data.h"
12 12
13 #include "webrtc/modules/audio_processing/include/audio_processing.h" 13 #include "webrtc/modules/audio_processing/include/audio_processing.h"
14 #include "webrtc/system_wrappers/include/trace.h" 14 #include "webrtc/system_wrappers/include/trace.h"
15 #include "webrtc/voice_engine/channel.h" 15 #include "webrtc/voice_engine/channel.h"
16 #include "webrtc/voice_engine/output_mixer.h" 16 #include "webrtc/voice_engine/output_mixer.h"
17 #include "webrtc/voice_engine/transmit_mixer.h" 17 #include "webrtc/voice_engine/transmit_mixer.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 namespace voe { 21 namespace voe {
22 22
23 static int32_t _gInstanceCounter = 0; 23 static int32_t _gInstanceCounter = 0;
24 24
25 SharedData::SharedData() 25 SharedData::SharedData()
26 : _instanceId(++_gInstanceCounter), 26 : _instanceId(++_gInstanceCounter),
27 _channelManager(_gInstanceCounter), 27 _channelManager(_gInstanceCounter),
28 _engineStatistics(_gInstanceCounter), 28 _engineStatistics(_gInstanceCounter),
29 _audioDevicePtr(NULL), 29 _audioDevicePtr(nullptr),
30 _moduleProcessThreadPtr( 30 _moduleProcessThreadPtr(ProcessThread::Create("VoiceProcessThread")) {
31 ProcessThread::Create("VoiceProcessThread")) { 31 Trace::CreateTrace();
32 Trace::CreateTrace(); 32 if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) {
33 if (OutputMixer::Create(_outputMixerPtr, _gInstanceCounter) == 0) 33 _outputMixerPtr->SetEngineInformation(_engineStatistics);
34 { 34 }
35 _outputMixerPtr->SetEngineInformation(_engineStatistics); 35 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) {
36 } 36 _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr,
37 if (TransmitMixer::Create(_transmitMixerPtr, _gInstanceCounter) == 0) 37 _engineStatistics, _channelManager);
38 { 38 }
39 _transmitMixerPtr->SetEngineInformation(*_moduleProcessThreadPtr, 39 _audioDeviceLayer = AudioDeviceModule::kPlatformDefaultAudio;
40 _engineStatistics,
41 _channelManager);
42 }
43 _audioDeviceLayer = AudioDeviceModule::kPlatformDefaultAudio;
44 } 40 }
45 41
46 SharedData::~SharedData() 42 SharedData::~SharedData()
47 { 43 {
48 OutputMixer::Destroy(_outputMixerPtr); 44 OutputMixer::Destroy(_outputMixerPtr);
49 TransmitMixer::Destroy(_transmitMixerPtr); 45 TransmitMixer::Destroy(_transmitMixerPtr);
50 if (_audioDevicePtr) { 46 if (_audioDevicePtr) {
51 _audioDevicePtr->Release(); 47 _audioDevicePtr->Release();
52 } 48 }
53 _moduleProcessThreadPtr->Stop(); 49 _moduleProcessThreadPtr->Stop();
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 } 97 }
102 98
103 void SharedData::SetLastError(int32_t error, TraceLevel level, 99 void SharedData::SetLastError(int32_t error, TraceLevel level,
104 const char* msg) const { 100 const char* msg) const {
105 _engineStatistics.SetLastError(error, level, msg); 101 _engineStatistics.SetLastError(error, level, msg);
106 } 102 }
107 103
108 } // namespace voe 104 } // namespace voe
109 105
110 } // namespace webrtc 106 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698