diff options
author | Eugene Sandulenko | 2011-01-23 19:08:09 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2011-01-23 19:08:09 +0000 |
commit | caa6684752a310e916b179125a4125a8b3be36f0 (patch) | |
tree | dc364d58619b297194bc5d0673b694c34fb51b6c /engines/sci | |
parent | 3d15871ee2d6a9c0ce4819a6ab5925638bafa8b9 (diff) | |
download | scummvm-rg350-caa6684752a310e916b179125a4125a8b3be36f0.tar.gz scummvm-rg350-caa6684752a310e916b179125a4125a8b3be36f0.tar.bz2 scummvm-rg350-caa6684752a310e916b179125a4125a8b3be36f0.zip |
VIDEO: Move video classes to Video:: namespace
svn-id: r55479
Diffstat (limited to 'engines/sci')
-rw-r--r-- | engines/sci/console.cpp | 10 | ||||
-rw-r--r-- | engines/sci/engine/kvideo.cpp | 12 | ||||
-rw-r--r-- | engines/sci/video/seq_decoder.h | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 71697d6c0a..7d24b1f248 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -227,11 +227,11 @@ void Console::preEnter() { _engine->pauseEngine(true); } -extern void playVideo(Graphics::VideoDecoder *videoDecoder, VideoState videoState); +extern void playVideo(Video::VideoDecoder *videoDecoder, VideoState videoState); void Console::postEnter() { if (!_videoFile.empty()) { - Graphics::VideoDecoder *videoDecoder = 0; + Video::VideoDecoder *videoDecoder = 0; #ifdef ENABLE_SCI32 bool duckMode = false; @@ -243,17 +243,17 @@ void Console::postEnter() { videoDecoder = seqDecoder; #ifdef ENABLE_SCI32 } else if (_videoFile.hasSuffix(".vmd")) { - videoDecoder = new Graphics::VMDDecoder(g_system->getMixer()); + videoDecoder = new Video::VMDDecoder(g_system->getMixer()); #endif } else if (_videoFile.hasSuffix(".duk")) { #ifdef ENABLE_SCI32 duckMode = true; - videoDecoder = new Graphics::AviDecoder(g_system->getMixer()); + videoDecoder = new Video::AviDecoder(g_system->getMixer()); #else warning("Duck videos require SCI32 support compiled in"); #endif } else if (_videoFile.hasSuffix(".avi")) { - videoDecoder = new Graphics::AviDecoder(g_system->getMixer()); + videoDecoder = new Video::AviDecoder(g_system->getMixer()); } if (videoDecoder && videoDecoder->loadFile(_videoFile)) { diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp index 86e2d333a3..ef47f9b9c6 100644 --- a/engines/sci/engine/kvideo.cpp +++ b/engines/sci/engine/kvideo.cpp @@ -39,7 +39,7 @@ namespace Sci { -void playVideo(Graphics::VideoDecoder *videoDecoder, VideoState videoState) { +void playVideo(Video::VideoDecoder *videoDecoder, VideoState videoState) { if (!videoDecoder) return; @@ -122,7 +122,7 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) { uint16 screenWidth = g_system->getWidth(); uint16 screenHeight = g_system->getHeight(); - Graphics::VideoDecoder *videoDecoder = 0; + Video::VideoDecoder *videoDecoder = 0; if (argv[0].segment != 0) { Common::String filename = s->_segMan->getString(argv[0]); @@ -139,7 +139,7 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) { return NULL_REG; } - videoDecoder = new Graphics::QuickTimeDecoder(); + videoDecoder = new Video::QuickTimeDecoder(); if (!videoDecoder->loadFile(filename)) error("Could not open '%s'", filename.c_str()); } else { @@ -173,7 +173,7 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) { switch (argv[0].toUint16()) { case 0: { Common::String filename = s->_segMan->getString(argv[1]); - videoDecoder = new Graphics::AviDecoder(g_system->getMixer()); + videoDecoder = new Video::AviDecoder(g_system->getMixer()); if (!videoDecoder->loadFile(filename.c_str())) { warning("Failed to open movie file %s", filename.c_str()); @@ -210,7 +210,7 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) { reg_t kPlayVMD(EngineState *s, int argc, reg_t *argv) { uint16 operation = argv[0].toUint16(); - Graphics::VideoDecoder *videoDecoder = 0; + Video::VideoDecoder *videoDecoder = 0; bool reshowCursor = g_sci->_gfxCursor->isVisible(); Common::String warningMsg; @@ -274,7 +274,7 @@ reg_t kPlayVMD(EngineState *s, int argc, reg_t *argv) { break; } case 6: // Play - videoDecoder = new Graphics::VMDDecoder(g_system->getMixer()); + videoDecoder = new Video::VMDDecoder(g_system->getMixer()); if (!videoDecoder->loadFile(s->_videoState.fileName)) { warning("Could not open VMD %s", s->_videoState.fileName.c_str()); diff --git a/engines/sci/video/seq_decoder.h b/engines/sci/video/seq_decoder.h index a7f403c4d2..fb13d3a509 100644 --- a/engines/sci/video/seq_decoder.h +++ b/engines/sci/video/seq_decoder.h @@ -33,7 +33,7 @@ namespace Sci { /** * Implementation of the Sierra SEQ decoder, used in KQ6 DOS floppy/CD and GK1 DOS */ -class SeqDecoder : public Graphics::FixedRateVideoDecoder { +class SeqDecoder : public Video::FixedRateVideoDecoder { public: SeqDecoder(); virtual ~SeqDecoder(); |