From 9255d2e2179ee6a2cd63b6d8f521e3b9d8543be6 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sun, 8 Aug 2010 00:37:52 +0000
Subject: VIDEO/GOB: Add setSurfaceMemory() to CoktelDecoder

This allows the video player to directly draw onto its own video
memory without having to blit each frame another time.
Will also be needed for proper handling of transparency in Woodruff.

svn-id: r51857
---
 engines/gob/videoplayer.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index d15c3cc20c..715d5cfb9a 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -136,19 +136,17 @@ int VideoPlayer::openVideo(bool primary, const Common::String &file, Properties
 		if (!_vm->_draw->_spritesArray[properties.sprite]) {
 			properties.sprite = -1;
 			video->surface.reset();
-			// video->decoder->setVideoMemory();
+			video->decoder->setSurfaceMemory();
 		} else {
 			video->surface = _vm->_draw->_spritesArray[properties.sprite];
-			/*
-			video->decoder->setVideoMemory(video->surface->getVidMem(),
-					video->surface->getWidth(), video->surface->getHeight());
-			*/
+			video->decoder->setSurfaceMemory(video->surface->getVidMem(),
+					video->surface->getWidth(), video->surface->getHeight(), 1);
 		}
 
 	} else {
 		properties.sprite = -1;
 		video->surface.reset();
-		// video->decoder->setVideoMemory();
+		video->decoder->setSurfaceMemory();
 	}
 
 	if (primary)
@@ -270,7 +268,7 @@ bool VideoPlayer::playFrame(int slot, Properties &properties) {
 
 	WRITE_VAR(11, video->decoder->getCurFrame());
 
-	blitFrame(video->surface, *surface);
+	// blitFrame(video->surface, *surface);
 
 	if (_woodruffCohCottWorkaround && (properties.startFrame == 31)) {
 		// WORKAROUND: This frame mistakenly masks Coh Cott, making her vanish
-- 
cgit v1.2.3