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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/voice_engine/file_player.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/channel_manager.cc ('k') | webrtc/voice_engine/file_player_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/file_player.cc
diff --git a/webrtc/voice_engine/file_player.cc b/webrtc/voice_engine/file_player.cc
index b581d5235b78dc892018cece8c127b0aaabb7a17..1e0b344b36438fa798338b3c9e2c374059a9fe9c 100644
--- a/webrtc/voice_engine/file_player.cc
+++ b/webrtc/voice_engine/file_player.cc
@@ -253,7 +253,7 @@ int32_t FilePlayerImpl::StartPlayingFile(const char* fileName,
return -1;
}
} else {
- CodecInst* no_inst = NULL;
+ CodecInst* no_inst = nullptr;
if (_fileModule.StartPlayingAudioFile(fileName, notification, loop,
_fileFormat, no_inst, startPosition,
stopPosition) == -1) {
@@ -319,7 +319,7 @@ int32_t FilePlayerImpl::StartPlayingFile(InStream* sourceStream,
return -1;
}
} else {
- CodecInst* no_inst = NULL;
+ CodecInst* no_inst = nullptr;
if (_fileModule.StartPlayingAudioStream(*sourceStream, notification,
_fileFormat, no_inst, startPosition,
stopPosition) == -1) {
« webrtc/base/event.cc ('K') | « webrtc/voice_engine/channel_manager.cc ('k') | webrtc/voice_engine/file_player_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698