aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/video/video_theora_player.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-01-26 18:06:42 +0100
committerEinar Johan Trøan Sømåen2013-01-26 18:07:07 +0100
commit980dc4a456f55a8b6526d2bc6f7694a0b2d666b3 (patch)
treebef13619df90984b731795e72721da7d39089041 /engines/wintermute/video/video_theora_player.cpp
parent6ae97cdfbe88fa34363aabc46847b0c9a32eefe5 (diff)
downloadscummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.tar.gz
scummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.tar.bz2
scummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.zip
WINTERMUTE: Replace all NULLs with nullptr.
Diffstat (limited to 'engines/wintermute/video/video_theora_player.cpp')
-rw-r--r--engines/wintermute/video/video_theora_player.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index d14c807e11..1f6842c416 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -51,7 +51,7 @@ VideoTheoraPlayer::VideoTheoraPlayer(BaseGame *inGame) : BaseClass(inGame) {
//////////////////////////////////////////////////////////////////////////
void VideoTheoraPlayer::SetDefaults() {
- _file = NULL;
+ _file = nullptr;
_filename = "";
_startTime = 0;
_looping = false;
@@ -68,8 +68,8 @@ void VideoTheoraPlayer::SetDefaults() {
_playbackStarted = false;
_dontDropFrames = false;
- _texture = NULL;
- _alphaImage = NULL;
+ _texture = nullptr;
+ _alphaImage = nullptr;
_alphaFilename = "";
_frameRendered = false;
@@ -84,10 +84,10 @@ void VideoTheoraPlayer::SetDefaults() {
_savedState = THEORA_STATE_NONE;
_savedPos = 0;
_volume = 100;
- _theoraDecoder = NULL;
+ _theoraDecoder = nullptr;
// TODO: Add subtitles-support
- //_subtitler = NULL;
+ //_subtitler = nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -100,7 +100,7 @@ VideoTheoraPlayer::~VideoTheoraPlayer(void) {
void VideoTheoraPlayer::cleanup() {
if (_file) {
BaseFileManager::getEngineInstance()->closeFile(_file);
- _file = NULL;
+ _file = nullptr;
}
_surface.free();
@@ -108,11 +108,11 @@ void VideoTheoraPlayer::cleanup() {
_theoraDecoder->close();
}
delete _theoraDecoder;
- _theoraDecoder = NULL;
+ _theoraDecoder = nullptr;
delete _alphaImage;
- _alphaImage = NULL;
+ _alphaImage = nullptr;
delete _texture;
- _texture = NULL;
+ _texture = nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -157,7 +157,7 @@ bool VideoTheoraPlayer::resetStream() {
_theoraDecoder->close();
}
delete _theoraDecoder;
- _theoraDecoder = NULL;
+ _theoraDecoder = nullptr;
_file = BaseFileManager::getEngineInstance()->openFile(_filename, true, false);
if (!_file) {
@@ -419,7 +419,7 @@ bool VideoTheoraPlayer::setAlphaImage(const Common::String &filename) {
_alphaImage = new BaseImage();
if (!_alphaImage || DID_FAIL(_alphaImage->loadFile(filename))) {
delete _alphaImage;
- _alphaImage = NULL;
+ _alphaImage = nullptr;
_alphaFilename = "";
return STATUS_FAILED;
}