aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/scalpel/3do/movie_decoder.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-09-09 20:26:05 -0400
committerPaul Gilbert2015-09-09 20:26:05 -0400
commit707afebbf19e62462f6ffd632f658fb2c1cf2cb4 (patch)
tree939b74fb1165d6f955bff6b4712d8fb844af001d /engines/sherlock/scalpel/3do/movie_decoder.cpp
parent2dc27b57a68cfa9ddab48b193f9a7bb6276aff58 (diff)
downloadscummvm-rg350-707afebbf19e62462f6ffd632f658fb2c1cf2cb4.tar.gz
scummvm-rg350-707afebbf19e62462f6ffd632f658fb2c1cf2cb4.tar.bz2
scummvm-rg350-707afebbf19e62462f6ffd632f658fb2c1cf2cb4.zip
SHERLOCK: 3DO: Move 3do movie playback method into ScalpelEngine
Diffstat (limited to 'engines/sherlock/scalpel/3do/movie_decoder.cpp')
-rw-r--r--engines/sherlock/scalpel/3do/movie_decoder.cpp43
1 files changed, 0 insertions, 43 deletions
diff --git a/engines/sherlock/scalpel/3do/movie_decoder.cpp b/engines/sherlock/scalpel/3do/movie_decoder.cpp
index 8e8f99bc19..da4d08ca47 100644
--- a/engines/sherlock/scalpel/3do/movie_decoder.cpp
+++ b/engines/sherlock/scalpel/3do/movie_decoder.cpp
@@ -464,47 +464,4 @@ Audio::AudioStream *Scalpel3DOMovieDecoder::StreamAudioTrack::getAudioStream() c
return _audioStream;
}
-// Test-code
-
-// Code for showing a movie. Only meant for testing/debug purposes
-bool Scalpel3DOMoviePlay(const char *filename, Common::Point pos) {
- Scalpel3DOMovieDecoder *videoDecoder = new Scalpel3DOMovieDecoder();
-
- if (!videoDecoder->loadFile(filename)) {
- warning("Scalpel3DOMoviePlay: could not open '%s'", filename);
- return false;
- }
-
- bool skipVideo = false;
- //byte bytesPerPixel = videoDecoder->getPixelFormat().bytesPerPixel;
- uint16 width = videoDecoder->getWidth();
- uint16 height = videoDecoder->getHeight();
- //uint16 pitch = videoDecoder->getWidth() * bytesPerPixel;
-
- videoDecoder->start();
-
- while (!g_engine->shouldQuit() && !videoDecoder->endOfVideo() && (!skipVideo)) {
- if (videoDecoder->needsUpdate()) {
- const Graphics::Surface *frame = videoDecoder->decodeNextFrame();
-
- if (frame) {
- g_system->copyRectToScreen(frame->getPixels(), frame->pitch, pos.x, pos.y, width, height);
- g_system->updateScreen();
- }
- }
-
- Common::Event event;
- while (g_system->getEventManager()->pollEvent(event)) {
- if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE))
- skipVideo = true;
- }
-
- g_system->delayMillis(10);
- }
- videoDecoder->close();
- delete videoDecoder;
-
- return !skipVideo;
-}
-
} // End of namespace Sherlock