| Index: webrtc/voice_engine/voe_volume_control_impl.cc
|
| diff --git a/webrtc/voice_engine/voe_volume_control_impl.cc b/webrtc/voice_engine/voe_volume_control_impl.cc
|
| index 0d79c6c6812616a64f5e80feedb27d727803aac2..878b68d14c3df9b8ea92a8b9a3922a40a2faa6db 100644
|
| --- a/webrtc/voice_engine/voe_volume_control_impl.cc
|
| +++ b/webrtc/voice_engine/voe_volume_control_impl.cc
|
| @@ -20,8 +20,8 @@
|
| namespace webrtc {
|
|
|
| VoEVolumeControl* VoEVolumeControl::GetInterface(VoiceEngine* voiceEngine) {
|
| - if (NULL == voiceEngine) {
|
| - return NULL;
|
| + if (nullptr == voiceEngine) {
|
| + return nullptr;
|
| }
|
| VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
|
| s->AddRef();
|
| @@ -204,7 +204,7 @@ int VoEVolumeControlImpl::SetInputMute(int channel, bool enable) {
|
| // Mute after demultiplexing <=> affects one channel only
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "SetInputMute() failed to locate channel");
|
| return -1;
|
| @@ -222,7 +222,7 @@ int VoEVolumeControlImpl::GetInputMute(int channel, bool& enabled) {
|
| } else {
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "SetInputMute() failed to locate channel");
|
| return -1;
|
| @@ -253,7 +253,7 @@ int VoEVolumeControlImpl::GetSpeechOutputLevel(int channel,
|
| } else {
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetSpeechOutputLevel() failed to locate channel");
|
| return -1;
|
| @@ -285,7 +285,7 @@ int VoEVolumeControlImpl::GetSpeechOutputLevelFullRange(int channel,
|
| } else {
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(
|
| VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetSpeechOutputLevelFullRange() failed to locate channel");
|
| @@ -312,7 +312,7 @@ int VoEVolumeControlImpl::SetChannelOutputVolumeScaling(int channel,
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(
|
| VE_CHANNEL_NOT_VALID, kTraceError,
|
| "SetChannelOutputVolumeScaling() failed to locate channel");
|
| @@ -329,7 +329,7 @@ int VoEVolumeControlImpl::GetChannelOutputVolumeScaling(int channel,
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(
|
| VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetChannelOutputVolumeScaling() failed to locate channel");
|
| @@ -371,7 +371,7 @@ int VoEVolumeControlImpl::SetOutputVolumePan(int channel,
|
| // Per-channel balance (affects the signal before output mixing)
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "SetOutputVolumePan() failed to locate channel");
|
| return -1;
|
| @@ -400,7 +400,7 @@ int VoEVolumeControlImpl::GetOutputVolumePan(int channel,
|
| }
|
| voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
|
| voe::Channel* channelPtr = ch.channel();
|
| - if (channelPtr == NULL) {
|
| + if (channelPtr == nullptr) {
|
| _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
|
| "GetOutputVolumePan() failed to locate channel");
|
| return -1;
|
|
|