diff options
author | Johannes Schickel | 2010-07-21 18:17:51 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-07-21 18:17:51 +0000 |
commit | e5e94d45118781902465024fc9a85c7aa0bfd3ce (patch) | |
tree | bd33dbdb2c7334bfae212b5fdbf058e8ff4f6883 /graphics/video | |
parent | fcc9de35e254d62d58aac0c68b314bb2f7b5b6db (diff) | |
download | scummvm-rg350-e5e94d45118781902465024fc9a85c7aa0bfd3ce.tar.gz scummvm-rg350-e5e94d45118781902465024fc9a85c7aa0bfd3ce.tar.bz2 scummvm-rg350-e5e94d45118781902465024fc9a85c7aa0bfd3ce.zip |
Strip trailing whitespaces in our common code base.
svn-id: r51094
Diffstat (limited to 'graphics/video')
-rw-r--r-- | graphics/video/dxa_decoder.h | 2 | ||||
-rw-r--r-- | graphics/video/flic_decoder.cpp | 4 | ||||
-rw-r--r-- | graphics/video/qt_decoder.cpp | 2 | ||||
-rw-r--r-- | graphics/video/video_decoder.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/graphics/video/dxa_decoder.h b/graphics/video/dxa_decoder.h index 0312828195..d61346324f 100644 --- a/graphics/video/dxa_decoder.h +++ b/graphics/video/dxa_decoder.h @@ -45,7 +45,7 @@ public: bool load(Common::SeekableReadStream &stream); void close(); - + bool isVideoLoaded() const { return _fileStream != 0; } uint16 getWidth() const { return _width; } uint16 getHeight() const { return _height; } diff --git a/graphics/video/flic_decoder.cpp b/graphics/video/flic_decoder.cpp index bb5b4f219b..b07e369cd8 100644 --- a/graphics/video/flic_decoder.cpp +++ b/graphics/video/flic_decoder.cpp @@ -57,7 +57,7 @@ bool FlicDecoder::load(Common::SeekableReadStream &stream) { return false; } - + _frameCount = _fileStream->readUint16LE(); uint16 width = _fileStream->readUint16LE(); uint16 height = _fileStream->readUint16LE(); @@ -265,7 +265,7 @@ Surface *FlicDecoder::decodeNextFrame() { delete[] data; } } - + _curFrame++; if (_curFrame == 0) diff --git a/graphics/video/qt_decoder.cpp b/graphics/video/qt_decoder.cpp index a95243ba6a..61b0f5166d 100644 --- a/graphics/video/qt_decoder.cpp +++ b/graphics/video/qt_decoder.cpp @@ -206,7 +206,7 @@ void QuickTimeDecoder::stopAudio() { void QuickTimeDecoder::pauseVideoIntern(bool pause) { if (_audStream) - g_system->getMixer()->pauseHandle(_audHandle, pause); + g_system->getMixer()->pauseHandle(_audHandle, pause); } Surface *QuickTimeDecoder::decodeNextFrame() { diff --git a/graphics/video/video_decoder.cpp b/graphics/video/video_decoder.cpp index fe4a5848f3..9733afc5cc 100644 --- a/graphics/video/video_decoder.cpp +++ b/graphics/video/video_decoder.cpp @@ -64,7 +64,7 @@ void VideoDecoder::setSystemPalette() { delete[] sysPalette; } -bool VideoDecoder::needsUpdate() const { +bool VideoDecoder::needsUpdate() const { return !endOfVideo() && getTimeToNextFrame() == 0; } |