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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/voice_engine/voe_file_impl.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
« webrtc/base/event.cc ('K') | « webrtc/voice_engine/voe_external_media_impl.cc ('k') | webrtc/voice_engine/voe_hardware_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voe_file_impl.cc
diff --git a/webrtc/voice_engine/voe_file_impl.cc b/webrtc/voice_engine/voe_file_impl.cc
index 5519c1e8234bbaa525cdd1c04265d73c0c9b1259..aca38b8cf661a8f79aee8cb47123df00a2b8fec4 100644
--- a/webrtc/voice_engine/voe_file_impl.cc
+++ b/webrtc/voice_engine/voe_file_impl.cc
@@ -21,8 +21,8 @@
namespace webrtc {
VoEFile* VoEFile::GetInterface(VoiceEngine* voiceEngine) {
- if (NULL == voiceEngine) {
- return NULL;
+ if (nullptr == voiceEngine) {
+ return nullptr;
}
VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
s->AddRef();
@@ -59,7 +59,7 @@ int VoEFileImpl::StartPlayingFileLocally(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,
"StartPlayingFileLocally() failed to locate channel");
return -1;
@@ -67,7 +67,7 @@ int VoEFileImpl::StartPlayingFileLocally(int channel,
return channelPtr->StartPlayingFileLocally(fileNameUTF8, loop, format,
startPointMs, volumeScaling,
- stopPointMs, NULL);
+ stopPointMs, nullptr);
}
int VoEFileImpl::StartPlayingFileLocally(int channel,
@@ -88,14 +88,14 @@ int VoEFileImpl::StartPlayingFileLocally(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,
"StartPlayingFileLocally() failed to locate channel");
return -1;
}
- return channelPtr->StartPlayingFileLocally(stream, format, startPointMs,
- volumeScaling, stopPointMs, NULL);
+ return channelPtr->StartPlayingFileLocally(
+ stream, format, startPointMs, volumeScaling, stopPointMs, nullptr);
}
int VoEFileImpl::StopPlayingFileLocally(int channel) {
@@ -107,7 +107,7 @@ int VoEFileImpl::StopPlayingFileLocally(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,
"StopPlayingFileLocally() failed to locate channel");
return -1;
@@ -122,7 +122,7 @@ int VoEFileImpl::IsPlayingFileLocally(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,
"StopPlayingFileLocally() failed to locate channel");
return -1;
@@ -154,7 +154,7 @@ int VoEFileImpl::StartPlayingFileAsMicrophone(int channel,
if (channel == -1) {
int res = _shared->transmit_mixer()->StartPlayingFileAsMicrophone(
fileNameUTF8, loop, format, startPointMs, volumeScaling, stopPointMs,
- NULL);
+ nullptr);
if (res) {
WEBRTC_TRACE(
kTraceError, kTraceVoice, VoEId(_shared->instance_id(), -1),
@@ -168,7 +168,7 @@ int VoEFileImpl::StartPlayingFileAsMicrophone(int channel,
// Add file 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,
"StartPlayingFileAsMicrophone() failed to locate channel");
@@ -177,7 +177,7 @@ int VoEFileImpl::StartPlayingFileAsMicrophone(int channel,
int res = channelPtr->StartPlayingFileAsMicrophone(
fileNameUTF8, loop, format, startPointMs, volumeScaling, stopPointMs,
- NULL);
+ nullptr);
if (res) {
WEBRTC_TRACE(
kTraceError, kTraceVoice, VoEId(_shared->instance_id(), -1),
@@ -210,7 +210,7 @@ int VoEFileImpl::StartPlayingFileAsMicrophone(int channel,
if (channel == -1) {
int res = _shared->transmit_mixer()->StartPlayingFileAsMicrophone(
- stream, format, startPointMs, volumeScaling, stopPointMs, NULL);
+ stream, format, startPointMs, volumeScaling, stopPointMs, nullptr);
if (res) {
WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_shared->instance_id(), -1),
"StartPlayingFileAsMicrophone() failed to start "
@@ -224,7 +224,7 @@ int VoEFileImpl::StartPlayingFileAsMicrophone(int channel,
// Add file 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,
"StartPlayingFileAsMicrophone() failed to locate channel");
@@ -232,7 +232,7 @@ int VoEFileImpl::StartPlayingFileAsMicrophone(int channel,
}
int res = channelPtr->StartPlayingFileAsMicrophone(
- stream, format, startPointMs, volumeScaling, stopPointMs, NULL);
+ stream, format, startPointMs, volumeScaling, stopPointMs, nullptr);
if (res) {
WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_shared->instance_id(), -1),
"StartPlayingFileAsMicrophone() failed to start "
@@ -259,7 +259,7 @@ int VoEFileImpl::StopPlayingFileAsMicrophone(int channel) {
// Stop adding file 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,
"StopPlayingFileAsMicrophone() failed to locate channel");
@@ -282,7 +282,7 @@ int VoEFileImpl::IsPlayingFileAsMicrophone(int channel) {
// Stop adding file 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,
"IsPlayingFileAsMicrophone() failed to locate channel");
@@ -313,7 +313,7 @@ int VoEFileImpl::StartRecordingPlayout(int channel,
// Add file 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,
"StartRecordingPlayout() failed to locate channel");
return -1;
@@ -337,7 +337,7 @@ int VoEFileImpl::StartRecordingPlayout(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,
"StartRecordingPlayout() failed to locate channel");
return -1;
@@ -358,7 +358,7 @@ int VoEFileImpl::StopRecordingPlayout(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,
"StopRecordingPlayout() failed to locate channel");
return -1;
« webrtc/base/event.cc ('K') | « webrtc/voice_engine/voe_external_media_impl.cc ('k') | webrtc/voice_engine/voe_hardware_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698