aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/support
diff options
context:
space:
mode:
authorPaul Gilbert2017-09-18 21:19:06 -0400
committerPaul Gilbert2017-09-18 21:19:06 -0400
commit1f1a4427f5d3bba62f73fa2bcbf2490aa813d062 (patch)
tree0fc8bbf3b9bb27ba4eb104ac5766dd526272aed1 /engines/titanic/support
parent0362b70225c1a6f89e3b4f933a2d127e3638c101 (diff)
downloadscummvm-rg350-1f1a4427f5d3bba62f73fa2bcbf2490aa813d062.tar.gz
scummvm-rg350-1f1a4427f5d3bba62f73fa2bcbf2490aa813d062.tar.bz2
scummvm-rg350-1f1a4427f5d3bba62f73fa2bcbf2490aa813d062.zip
TITANIC: Change AVISurface _framePixels from ManagedSurface to bool
Diffstat (limited to 'engines/titanic/support')
-rw-r--r--engines/titanic/support/avi_surface.cpp6
-rw-r--r--engines/titanic/support/avi_surface.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index cebc4ba43e..4b60921e31 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -44,7 +44,7 @@ AVISurface::AVISurface(const CResourceKey &key) : _movieName(key.getString()) {
_videoSurface = nullptr;
_streamCount = 0;
_movieFrameSurface[0] = _movieFrameSurface[1] = nullptr;
- _framePixels = nullptr;
+ _framePixels = false;
_priorFrameTime = 0;
// Reset current frame. We need to keep track of frames separately from the decoder,
@@ -75,7 +75,6 @@ AVISurface::AVISurface(const CResourceKey &key) : _movieName(key.getString()) {
AVISurface::~AVISurface() {
if (_videoSurface)
_videoSurface->_flipVertically = false;
- delete _framePixels;
delete _movieFrameSurface[0];
delete _movieFrameSurface[1];
delete _decoder;
@@ -292,8 +291,7 @@ void AVISurface::setupDecompressor() {
}
if (!flag) {
- _framePixels = new Graphics::ManagedSurface(_decoder->getWidth(), _decoder->getHeight(),
- _decoder->getVideoTrack(0).getPixelFormat());
+ _framePixels = true;
} else if (idx == 0) {
// The original developers used a vertical flipped playback to indicate
// an incompatibility between source video and dest surface bit-depths,
diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h
index 4e9166c0f0..3ee8c38c5c 100644
--- a/engines/titanic/support/avi_surface.h
+++ b/engines/titanic/support/avi_surface.h
@@ -104,7 +104,7 @@ private:
CMovieRangeInfoList _movieRangeInfo;
int _streamCount;
Graphics::ManagedSurface *_movieFrameSurface[2];
- Graphics::ManagedSurface *_framePixels;
+ bool _framePixels;
double _frameRate;
int _currentFrame, _priorFrame;
uint32 _priorFrameTime;