diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agos/animation.h | 4 | ||||
-rw-r--r-- | engines/gob/videoplayer.cpp | 12 | ||||
-rw-r--r-- | engines/gob/videoplayer.h | 4 | ||||
-rw-r--r-- | engines/mohawk/myst_stacks/channelwood.cpp | 8 | ||||
-rw-r--r-- | engines/mohawk/myst_stacks/dni.cpp | 14 | ||||
-rw-r--r-- | engines/mohawk/myst_stacks/myst.cpp | 46 | ||||
-rw-r--r-- | engines/mohawk/riven_external.cpp | 18 | ||||
-rw-r--r-- | engines/mohawk/video.cpp | 12 | ||||
-rw-r--r-- | engines/mohawk/video.h | 10 | ||||
-rw-r--r-- | engines/saga/introproc_saga2.cpp | 2 | ||||
-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 | ||||
-rw-r--r-- | engines/scumm/he/animation_he.h | 2 | ||||
-rw-r--r-- | engines/sword1/animation.cpp | 4 | ||||
-rw-r--r-- | engines/sword1/animation.h | 6 | ||||
-rw-r--r-- | engines/sword2/animation.cpp | 4 | ||||
-rw-r--r-- | engines/sword2/animation.h | 6 | ||||
-rw-r--r-- | engines/sword25/fmv/theora_decoder.h | 2 | ||||
-rw-r--r-- | engines/toon/movie.cpp | 6 | ||||
-rw-r--r-- | engines/toon/movie.h | 2 | ||||
-rw-r--r-- | engines/tucker/tucker.h | 2 |
22 files changed, 94 insertions, 94 deletions
diff --git a/engines/agos/animation.h b/engines/agos/animation.h index 20cc85986e..a61255b558 100644 --- a/engines/agos/animation.h +++ b/engines/agos/animation.h @@ -77,7 +77,7 @@ protected: uint32 _firstFrameOffset; }; -class MoviePlayerDXA : public MoviePlayer, ::Graphics::DXADecoder { +class MoviePlayerDXA : public MoviePlayer, Video::DXADecoder { static const char *_sequenceList[90]; uint8 _sequenceNum; public: @@ -95,7 +95,7 @@ private: void copyFrameToBuffer(byte *dst, uint x, uint y, uint pitch); }; -class MoviePlayerSMK : public MoviePlayer, ::Graphics::SmackerDecoder { +class MoviePlayerSMK : public MoviePlayer, Video::SmackerDecoder { public: MoviePlayerSMK(AGOSEngine_Feeble *vm, const char *name); diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index b9eb42a2fe..3cd363e8fb 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -798,7 +798,7 @@ Common::String VideoPlayer::findFile(const Common::String &file, Properties &pro return fileName; } -Graphics::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Properties &properties) { +::Video::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Properties &properties) { Common::String fileName = findFile(file, properties); if (fileName.empty()) return 0; @@ -807,15 +807,15 @@ Graphics::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Prop if (!stream) return 0; - Graphics::CoktelDecoder *video = 0; + ::Video::CoktelDecoder *video = 0; if (properties.type == kVideoTypeIMD) - video = new Graphics::IMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType); + video = new ::Video::IMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType); else if (properties.type == kVideoTypePreIMD) - video = new Graphics::PreIMDDecoder(properties.width, properties.height, _vm->_mixer, Audio::Mixer::kSFXSoundType); + video = new ::Video::PreIMDDecoder(properties.width, properties.height, _vm->_mixer, Audio::Mixer::kSFXSoundType); else if (properties.type == kVideoTypeVMD) - video = new Graphics::VMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType); + video = new ::Video::VMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType); else if (properties.type == kVideoTypeRMD) - video = new Graphics::VMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType); + video = new ::Video::VMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType); else warning("Couldn't open video \"%s\": Invalid video Type", fileName.c_str()); diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h index fff2a951e4..2a1223b0b1 100644 --- a/engines/gob/videoplayer.h +++ b/engines/gob/videoplayer.h @@ -150,7 +150,7 @@ public: private: struct Video { - Graphics::CoktelDecoder *decoder; + ::Video::CoktelDecoder *decoder; Common::String fileName; SurfacePtr surface; @@ -186,7 +186,7 @@ private: Common::String findFile(const Common::String &file, Properties &properties); - Graphics::CoktelDecoder *openVideo(const Common::String &file, Properties &properties); + ::Video::CoktelDecoder *openVideo(const Common::String &file, Properties &properties); bool playFrame(int slot, Properties &properties); diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp index af2baa7a39..b5379c2adf 100644 --- a/engines/mohawk/myst_stacks/channelwood.cpp +++ b/engines/mohawk/myst_stacks/channelwood.cpp @@ -293,9 +293,9 @@ void MystScriptParser_Channelwood::o_bridgeToggle(uint16 op, uint16 var, uint16 // Toggle bridge state if (_state.waterPumpBridgeState) - _vm->_video->setVideoBounds(bridge, Graphics::VideoTimestamp(3050, 600), Graphics::VideoTimestamp(6100, 600)); + _vm->_video->setVideoBounds(bridge, Video::VideoTimestamp(3050, 600), Video::VideoTimestamp(6100, 600)); else - _vm->_video->setVideoBounds(bridge, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(3050, 600)); + _vm->_video->setVideoBounds(bridge, Video::VideoTimestamp(0, 600), Video::VideoTimestamp(3050, 600)); _vm->_video->waitUntilMovieEnds(bridge); } @@ -311,9 +311,9 @@ void MystScriptParser_Channelwood::o_pipeExtend(uint16 op, uint16 var, uint16 ar // Toggle pipe state if (_state.pipeState) - _vm->_video->setVideoBounds(pipe, Graphics::VideoTimestamp(3040, 600), Graphics::VideoTimestamp(6080, 600)); + _vm->_video->setVideoBounds(pipe, Video::VideoTimestamp(3040, 600), Video::VideoTimestamp(6080, 600)); else - _vm->_video->setVideoBounds(pipe, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(3040, 600)); + _vm->_video->setVideoBounds(pipe, Video::VideoTimestamp(0, 600), Video::VideoTimestamp(3040, 600)); _vm->_video->waitUntilMovieEnds(pipe); _vm->_sound->resumeBackgroundMyst(); diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp index d79170c41b..8c98df6d9b 100644 --- a/engines/mohawk/myst_stacks/dni.cpp +++ b/engines/mohawk/myst_stacks/dni.cpp @@ -103,13 +103,13 @@ void MystScriptParser_Dni::o_handPage(uint16 op, uint16 var, uint16 argc, uint16 VideoHandle atrus = _vm->_video->findVideoHandle(_video); // Good ending and Atrus asked to give page - if (_globals.ending == 1 && _vm->_video->getElapsedTime(atrus) > Graphics::VideoTimestamp(6801, 600).getUnitsInScale(1000)) { + if (_globals.ending == 1 && _vm->_video->getElapsedTime(atrus) > Video::VideoTimestamp(6801, 600).getUnitsInScale(1000)) { _globals.ending = 2; _globals.heldPage = 0; _vm->_cursor->setCursor(kDefaultMystCursor); // Play movie end (atrus leaving) - _vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(14813, 600), Graphics::VideoTimestamp(0xFFFFFFFF)); + _vm->_video->setVideoBounds(atrus, Video::VideoTimestamp(14813, 600), Video::VideoTimestamp(0xFFFFFFFF)); _vm->_video->setVideoLooping(atrus, false); _atrusLeft = true; @@ -122,7 +122,7 @@ void MystScriptParser_Dni::atrusLeft_run() { if (_vm->_system->getMillis() > _atrusLeftTime + 63333) { _video = _vm->wrapMovieFilename("atrus2", kDniStack); VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77); - _vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(98000, 600)); + _vm->_video->setVideoBounds(atrus, Video::VideoTimestamp(0, 600), Video::VideoTimestamp(98000, 600)); _waitForLoop = true; _loopStart = 73095; @@ -140,7 +140,7 @@ void MystScriptParser_Dni::atrusLeft_run() { void MystScriptParser_Dni::loopVideo_run() { if (!_vm->_video->isVideoPlaying()) { VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77); - _vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(_loopStart, 600), Graphics::VideoTimestamp(_loopEnd, 600)); + _vm->_video->setVideoBounds(atrus, Video::VideoTimestamp(_loopStart, 600), Video::VideoTimestamp(_loopEnd, 600)); _vm->_video->setVideoLooping(atrus, true); _waitForLoop = false; @@ -156,13 +156,13 @@ void MystScriptParser_Dni::atrus_run() { if (!_vm->_video->isVideoPlaying()) { _video = _vm->wrapMovieFilename("atr1page", kDniStack); VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77, true); - _vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(7388, 600), Graphics::VideoTimestamp(14700, 600)); + _vm->_video->setVideoBounds(atrus, Video::VideoTimestamp(7388, 600), Video::VideoTimestamp(14700, 600)); } } else if (_globals.ending != 3 && _globals.ending != 4) { if (_globals.heldPage == 13) { _video = _vm->wrapMovieFilename("atr1page", kDniStack); VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77); - _vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(14700, 600)); + _vm->_video->setVideoBounds(atrus, Video::VideoTimestamp(0, 600), Video::VideoTimestamp(14700, 600)); _waitForLoop = true; _loopStart = 7388; @@ -174,7 +174,7 @@ void MystScriptParser_Dni::atrus_run() { } else { _video = _vm->wrapMovieFilename("atr1nopg", kDniStack); VideoHandle atrus = _vm->_video->playMovie(_video, 215, 77); - _vm->_video->setVideoBounds(atrus, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(46175, 600)); + _vm->_video->setVideoBounds(atrus, Video::VideoTimestamp(0, 600), Video::VideoTimestamp(46175, 600)); _waitForLoop = true; _loopStart = 30656; diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index d63cf77987..063a37ccf4 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -1133,7 +1133,7 @@ void MystScriptParser_Myst::o_clockWheelsExecute(uint16 op, uint16 var, uint16 a // Gears rise up VideoHandle gears = _vm->_video->playMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 33); - _vm->_video->setVideoBounds(gears, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(650, 600)); + _vm->_video->setVideoBounds(gears, Video::VideoTimestamp(0, 600), Video::VideoTimestamp(650, 600)); _vm->_video->waitUntilMovieEnds(gears); @@ -1145,7 +1145,7 @@ void MystScriptParser_Myst::o_clockWheelsExecute(uint16 op, uint16 var, uint16 a // Gears sink down VideoHandle gears = _vm->_video->playMovie(_vm->wrapMovieFilename("gears", kMystStack), 305, 33); - _vm->_video->setVideoBounds(gears, Graphics::VideoTimestamp(700, 600), Graphics::VideoTimestamp(1300, 600)); + _vm->_video->setVideoBounds(gears, Video::VideoTimestamp(700, 600), Video::VideoTimestamp(1300, 600)); _vm->_video->waitUntilMovieEnds(gears); _state.clockTowerBridgeOpen = 0; @@ -1189,14 +1189,14 @@ void MystScriptParser_Myst::o_imagerPlayButton(uint16 op, uint16 var, uint16 arg // Mountains disappearing Common::String file = _vm->wrapMovieFilename("vltmntn", kMystStack); VideoHandle mountain = _vm->_video->playMovie(file, 159, 96, false); - _vm->_video->setVideoBounds(mountain, Graphics::VideoTimestamp(11180, 600), Graphics::VideoTimestamp(16800, 600)); + _vm->_video->setVideoBounds(mountain, Video::VideoTimestamp(11180, 600), Video::VideoTimestamp(16800, 600)); _state.imagerActive = 0; } else { // Mountains appearing Common::String file = _vm->wrapMovieFilename("vltmntn", kMystStack); VideoHandle mountain = _vm->_video->playMovie(file, 159, 96, false); - _vm->_video->setVideoBounds(mountain, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(11180, 600)); + _vm->_video->setVideoBounds(mountain, Video::VideoTimestamp(0, 600), Video::VideoTimestamp(11180, 600)); _state.imagerActive = 1; } @@ -1209,19 +1209,19 @@ void MystScriptParser_Myst::o_imagerPlayButton(uint16 op, uint16 var, uint16 arg // Water disappearing VideoHandle water = _imagerMovie->playMovie(); - _vm->_video->setVideoBounds(water, Graphics::VideoTimestamp(4204, 600), Graphics::VideoTimestamp(6040, 600)); + _vm->_video->setVideoBounds(water, Video::VideoTimestamp(4204, 600), Video::VideoTimestamp(6040, 600)); _vm->_video->setVideoLooping(water, false); _state.imagerActive = 0; } else { // Water appearing VideoHandle water = _imagerMovie->playMovie(); - _vm->_video->setVideoBounds(water, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(1814, 600)); + _vm->_video->setVideoBounds(water, Video::VideoTimestamp(0, 600), Video::VideoTimestamp(1814, 600)); _vm->_video->waitUntilMovieEnds(water); // Water looping water = _imagerMovie->playMovie(); - _vm->_video->setVideoBounds(water, Graphics::VideoTimestamp(1814, 600), Graphics::VideoTimestamp(4204, 600)); + _vm->_video->setVideoBounds(water, Video::VideoTimestamp(1814, 600), Video::VideoTimestamp(4204, 600)); _vm->_video->setVideoLooping(water, true); _state.imagerActive = 1; @@ -2192,12 +2192,12 @@ void MystScriptParser_Myst::rocketCheckSolution() { // Book appearing Common::String movieFile = _vm->wrapMovieFilename("selenbok", kMystStack); _rocketLinkBook = _vm->_video->playMovie(movieFile, 224, 41); - _vm->_video->setVideoBounds(_rocketLinkBook, Graphics::VideoTimestamp(0, 600), Graphics::VideoTimestamp(660, 600)); + _vm->_video->setVideoBounds(_rocketLinkBook, Video::VideoTimestamp(0, 600), Video::VideoTimestamp(660, 600)); _vm->_video->waitUntilMovieEnds(_rocketLinkBook); // Book looping closed _rocketLinkBook = _vm->_video->playMovie(movieFile, 224, 41, true); - _vm->_video->setVideoBounds(_rocketLinkBook, Graphics::VideoTimestamp(660, 600), Graphics::VideoTimestamp(3500, 600)); + _vm->_video->setVideoBounds(_rocketLinkBook, Video::VideoTimestamp(660, 600), Video::VideoTimestamp(3500, 600)); _tempVar = 1; } @@ -2312,7 +2312,7 @@ void MystScriptParser_Myst::o_rocketOpenBook(uint16 op, uint16 var, uint16 argc, debugC(kDebugScript, "Opcode %d: Rocket open link book", op); // Flyby movie - _vm->_video->setVideoBounds(_rocketLinkBook, Graphics::VideoTimestamp(3500, 600), Graphics::VideoTimestamp(13100, 600)); + _vm->_video->setVideoBounds(_rocketLinkBook, Video::VideoTimestamp(3500, 600), Video::VideoTimestamp(13100, 600)); // Set linkable _tempVar = 2; @@ -2836,16 +2836,16 @@ void MystScriptParser_Myst::clockGearForwardOneStep(uint16 gear) { uint16 gearPosition = _clockGearsPositions[gear] - 1; _clockGearsVideos[gear] = _vm->_video->playMovie(_vm->wrapMovieFilename(videos[gear], kMystStack), x[gear], y[gear]); _vm->_video->setVideoBounds(_clockGearsVideos[gear], - Graphics::VideoTimestamp(startTime[gearPosition], 600), - Graphics::VideoTimestamp(endTime[gearPosition], 600)); + Video::VideoTimestamp(startTime[gearPosition], 600), + Video::VideoTimestamp(endTime[gearPosition], 600)); } void MystScriptParser_Myst::clockWeightDownOneStep() { // Set video bounds _clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0); _vm->_video->setVideoBounds(_clockWeightVideo, - Graphics::VideoTimestamp(_clockWeightPosition, 600), - Graphics::VideoTimestamp(_clockWeightPosition + 246, 600)); + Video::VideoTimestamp(_clockWeightPosition, 600), + Video::VideoTimestamp(_clockWeightPosition + 246, 600)); // Increment value by one step _clockWeightPosition += 246; @@ -2897,8 +2897,8 @@ void MystScriptParser_Myst::clockGearsCheckSolution() { _vm->_sound->replaceSoundMyst(9113); _clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0); _vm->_video->setVideoBounds(_clockWeightVideo, - Graphics::VideoTimestamp(_clockWeightPosition, 600), - Graphics::VideoTimestamp(2214, 600)); + Video::VideoTimestamp(_clockWeightPosition, 600), + Video::VideoTimestamp(2214, 600)); _vm->_video->waitUntilMovieEnds(_clockWeightVideo); _clockWeightPosition = 2214; @@ -2976,8 +2976,8 @@ void MystScriptParser_Myst::clockResetWeight() { if (!(_vm->getFeatures() & GF_ME)) { _clockWeightVideo = _vm->_video->playMovie(_vm->wrapMovieFilename("cl1wlfch", kMystStack) , 124, 0); _vm->_video->setVideoBounds(_clockWeightVideo, - Graphics::VideoTimestamp(2214 * 2 - _clockWeightPosition, 600), - Graphics::VideoTimestamp(2214 * 2, 600)); + Video::VideoTimestamp(2214 * 2 - _clockWeightPosition, 600), + Video::VideoTimestamp(2214 * 2, 600)); } else { //FIXME: Needs QT backwards playing warning("Weight going back up not implemented"); @@ -2998,8 +2998,8 @@ void MystScriptParser_Myst::clockResetGear(uint16 gear) { if (gearPosition != 2) { _clockGearsVideos[gear] = _vm->_video->playMovie(_vm->wrapMovieFilename(videos[gear], kMystStack), x[gear], y[gear]); _vm->_video->setVideoBounds(_clockGearsVideos[gear], - Graphics::VideoTimestamp(time[gearPosition], 600), - Graphics::VideoTimestamp(time[2], 600)); + Video::VideoTimestamp(time[gearPosition], 600), + Video::VideoTimestamp(time[2], 600)); } // Reset gear position @@ -3220,7 +3220,7 @@ void MystScriptParser_Myst::imager_run() { if (_state.imagerActive && _state.imagerSelection == 67) { VideoHandle water = _imagerMovie->playMovie(); - _vm->_video->setVideoBounds(water, Graphics::VideoTimestamp(1814, 600), Graphics::VideoTimestamp(4204, 600)); + _vm->_video->setVideoBounds(water, Video::VideoTimestamp(1814, 600), Video::VideoTimestamp(4204, 600)); _vm->_video->setVideoLooping(water, true); } } @@ -3562,12 +3562,12 @@ void MystScriptParser_Myst::greenBook_run() { _vm->_video->playMovie(file, 314, 76); } else { VideoHandle book = _vm->_video->playMovie(file, 314, 76, true); - _vm->_video->setVideoBounds(book, Graphics::VideoTimestamp(loopStart, 600), Graphics::VideoTimestamp(loopEnd, 600)); + _vm->_video->setVideoBounds(book, Video::VideoTimestamp(loopStart, 600), Video::VideoTimestamp(loopEnd, 600)); _tempVar = 0; } } else if (_tempVar == 2 && !_vm->_video->isVideoPlaying()) { VideoHandle book = _vm->_video->playMovie(file, 314, 76); - _vm->_video->setVideoBounds(book, Graphics::VideoTimestamp(loopStart, 600), Graphics::VideoTimestamp(loopEnd, 600)); + _vm->_video->setVideoBounds(book, Video::VideoTimestamp(loopStart, 600), Video::VideoTimestamp(loopEnd, 600)); _vm->_video->setVideoLooping(book, true); _tempVar = 0; } diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp index afdf2e4a82..c806c93130 100644 --- a/engines/mohawk/riven_external.cpp +++ b/engines/mohawk/riven_external.cpp @@ -1066,7 +1066,7 @@ void RivenExternal::lowerPins() { // Play the video of the pins going down VideoHandle handle = _vm->_video->playMovieRiven(*upMovie); assert(handle != NULL_VID_HANDLE); - _vm->_video->setVideoBounds(handle, Graphics::VideoTimestamp(startTime, 600), Graphics::VideoTimestamp(startTime + 550, 600)); + _vm->_video->setVideoBounds(handle, Video::VideoTimestamp(startTime, 600), Video::VideoTimestamp(startTime + 550, 600)); _vm->_video->waitUntilMovieEnds(handle); *upMovie = 0; @@ -1098,7 +1098,7 @@ void RivenExternal::xgrotatepins(uint16 argc, uint16 *argv) { // Play the video of the pins rotating VideoHandle handle = _vm->_video->playMovieRiven(*_vm->getVar("gupmoov")); assert(handle != NULL_VID_HANDLE); - _vm->_video->setVideoBounds(handle, Graphics::VideoTimestamp(startTime, 600), Graphics::VideoTimestamp(startTime + 1215, 600)); + _vm->_video->setVideoBounds(handle, Video::VideoTimestamp(startTime, 600), Video::VideoTimestamp(startTime + 1215, 600)); _vm->_video->waitUntilMovieEnds(handle); } @@ -1183,7 +1183,7 @@ void RivenExternal::xgpincontrols(uint16 argc, uint16 *argv) { VideoHandle handle = _vm->_video->playMovieRiven(pinMovieCodes[imagePos - 1]); assert(handle != NULL_VID_HANDLE); uint32 startTime = 9630 - pinPos * 600; - _vm->_video->setVideoBounds(handle, Graphics::VideoTimestamp(startTime, 600), Graphics::VideoTimestamp(startTime + 550, 600)); + _vm->_video->setVideoBounds(handle, Video::VideoTimestamp(startTime, 600), Video::VideoTimestamp(startTime + 550, 600)); _vm->_video->waitUntilMovieEnds(handle); // Update the relevant variables @@ -1259,7 +1259,7 @@ void RivenExternal::xgrviewer(uint16 argc, uint16 *argv) { // Now play the movie VideoHandle handle = _vm->_video->playMovieRiven(1); assert(handle != NULL_VID_HANDLE); - _vm->_video->setVideoBounds(handle, Graphics::VideoTimestamp(s_viewerTimeIntervals[*curPos], 600), Graphics::VideoTimestamp(s_viewerTimeIntervals[newPos], 600)); + _vm->_video->setVideoBounds(handle, Video::VideoTimestamp(s_viewerTimeIntervals[*curPos], 600), Video::VideoTimestamp(s_viewerTimeIntervals[newPos], 600)); _vm->_video->waitUntilMovieEnds(handle); // Set the new position and let the card's scripts take over again @@ -1328,7 +1328,7 @@ void RivenExternal::xglviewer(uint16 argc, uint16 *argv) { // Now play the movie VideoHandle handle = _vm->_video->playMovieRiven(1); assert(handle != NULL_VID_HANDLE); - _vm->_video->setVideoBounds(handle, Graphics::VideoTimestamp(s_viewerTimeIntervals[*curPos], 600), Graphics::VideoTimestamp(s_viewerTimeIntervals[newPos], 600)); + _vm->_video->setVideoBounds(handle, Video::VideoTimestamp(s_viewerTimeIntervals[*curPos], 600), Video::VideoTimestamp(s_viewerTimeIntervals[newPos], 600)); _vm->_video->waitUntilMovieEnds(handle); // Set the new position to the variable @@ -1778,9 +1778,9 @@ void RivenExternal::xschool280_playwhark(uint16 argc, uint16 *argv) { // (11560/600)s is the length of each of the two movies. We divide it into 19 parts // (one for each of the possible positions the villager can have). VideoHandle handle = _vm->_video->playMovieRiven(doomMLST); - Graphics::VideoTimestamp startTime = Graphics::VideoTimestamp((11560 / 19) * (*posVar), 600); + Video::VideoTimestamp startTime = Video::VideoTimestamp((11560 / 19) * (*posVar), 600); *posVar += number; // Adjust to the end - Graphics::VideoTimestamp endTime = Graphics::VideoTimestamp((11560 / 19) * (*posVar), 600); + Video::VideoTimestamp endTime = Video::VideoTimestamp((11560 / 19) * (*posVar), 600); _vm->_video->setVideoBounds(handle, startTime, endTime); _vm->_video->waitUntilMovieEnds(handle); @@ -2183,7 +2183,7 @@ void RivenExternal::xtexterior300_telescopedown(uint16 argc, uint16 *argv) { static const uint32 timeIntervals[] = { 4320, 3440, 2560, 1760, 880, 0 }; uint16 movieCode = (*telescopeCover) ? 1 : 2; VideoHandle handle = _vm->_video->playMovieRiven(movieCode); - _vm->_video->setVideoBounds(handle, Graphics::VideoTimestamp(timeIntervals[*telescopePos], 600), Graphics::VideoTimestamp(timeIntervals[*telescopePos - 1], 600)); + _vm->_video->setVideoBounds(handle, Video::VideoTimestamp(timeIntervals[*telescopePos], 600), Video::VideoTimestamp(timeIntervals[*telescopePos - 1], 600)); _vm->_sound->playSound(14); // Play the moving sound _vm->_video->waitUntilMovieEnds(handle); @@ -2215,7 +2215,7 @@ void RivenExternal::xtexterior300_telescopeup(uint16 argc, uint16 *argv) { static const uint32 timeIntervals[] = { 0, 800, 1680, 2560, 3440, 4320 }; uint16 movieCode = (*_vm->getVar("ttelecover")) ? 4 : 5; VideoHandle handle = _vm->_video->playMovieRiven(movieCode); - _vm->_video->setVideoBounds(handle, Graphics::VideoTimestamp(timeIntervals[*telescopePos - 1], 600), Graphics::VideoTimestamp(timeIntervals[*telescopePos], 600)); + _vm->_video->setVideoBounds(handle, Video::VideoTimestamp(timeIntervals[*telescopePos - 1], 600), Video::VideoTimestamp(timeIntervals[*telescopePos], 600)); _vm->_sound->playSound(14); // Play the moving sound _vm->_video->waitUntilMovieEnds(handle); diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp index 0a9705a4db..838d855d88 100644 --- a/engines/mohawk/video.cpp +++ b/engines/mohawk/video.cpp @@ -38,8 +38,8 @@ void VideoEntry::clear() { y = 0; loop = false; enabled = false; - start = Graphics::VideoTimestamp(0); - end = Graphics::VideoTimestamp(0xFFFFFFFF); // Largest possible, there is an endOfVideo() check anyway + start = Video::VideoTimestamp(0); + end = Video::VideoTimestamp(0xFFFFFFFF); // Largest possible, there is an endOfVideo() check anyway filename.clear(); id = 0; } @@ -384,7 +384,7 @@ VideoHandle VideoManager::createVideoHandle(uint16 id, uint16 x, uint16 y, bool return i; // Otherwise, create a new entry - Graphics::QuickTimeDecoder *decoder = new Graphics::QuickTimeDecoder(); + Video::QuickTimeDecoder *decoder = new Video::QuickTimeDecoder(); decoder->setChunkBeginOffset(_vm->getResourceOffset(ID_TMOV, id)); decoder->load(_vm->getResource(ID_TMOV, id)); @@ -418,7 +418,7 @@ VideoHandle VideoManager::createVideoHandle(const Common::String &filename, uint // Otherwise, create a new entry VideoEntry entry; entry.clear(); - entry.video = new Graphics::QuickTimeDecoder(); + entry.video = new Video::QuickTimeDecoder(); entry.x = x; entry.y = y; entry.filename = filename; @@ -505,14 +505,14 @@ bool VideoManager::isVideoPlaying() { return false; } -void VideoManager::setVideoBounds(VideoHandle handle, Graphics::VideoTimestamp start, Graphics::VideoTimestamp end) { +void VideoManager::setVideoBounds(VideoHandle handle, Video::VideoTimestamp start, Video::VideoTimestamp end) { assert(handle != NULL_VID_HANDLE); _videoStreams[handle].start = start; _videoStreams[handle].end = end; _videoStreams[handle]->seekToTime(start); } -void VideoManager::seekToTime(VideoHandle handle, Graphics::VideoTimestamp time) { +void VideoManager::seekToTime(VideoHandle handle, Video::VideoTimestamp time) { assert(handle != NULL_VID_HANDLE); _videoStreams[handle]->seekToTime(time); } diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h index 9661dbcd25..11d9ec3387 100644 --- a/engines/mohawk/video.h +++ b/engines/mohawk/video.h @@ -48,19 +48,19 @@ struct MLSTRecord { struct VideoEntry { // Playback variables - Graphics::SeekableVideoDecoder *video; + Video::SeekableVideoDecoder *video; uint16 x; uint16 y; bool loop; bool enabled; - Graphics::VideoTimestamp start, end; + Video::VideoTimestamp start, end; // Identification Common::String filename; // External video files uint16 id; // Internal Mohawk files // Helper functions - Graphics::SeekableVideoDecoder *operator->() const { assert(video); return video; } // TODO: Remove this eventually + Video::SeekableVideoDecoder *operator->() const { assert(video); return video; } // TODO: Remove this eventually void clear(); bool endOfVideo(); }; @@ -105,8 +105,8 @@ public: uint32 getFrameCount(VideoHandle handle); uint32 getElapsedTime(VideoHandle handle); bool endOfVideo(VideoHandle handle); - void setVideoBounds(VideoHandle handle, Graphics::VideoTimestamp start, Graphics::VideoTimestamp end); - void seekToTime(VideoHandle handle, Graphics::VideoTimestamp time); + void setVideoBounds(VideoHandle handle, Video::VideoTimestamp start, Video::VideoTimestamp end); + void seekToTime(VideoHandle handle, Video::VideoTimestamp time); void seekToFrame(VideoHandle handle, uint32 frame); void setVideoLooping(VideoHandle handle, bool loop); void waitUntilMovieEnds(VideoHandle videoHandle); diff --git a/engines/saga/introproc_saga2.cpp b/engines/saga/introproc_saga2.cpp index c16c95a2a7..2752ddd933 100644 --- a/engines/saga/introproc_saga2.cpp +++ b/engines/saga/introproc_saga2.cpp @@ -92,7 +92,7 @@ int Scene::FTA2EndProc(FTA2Endings whichEnding) { } void Scene::playMovie(const char *filename) { - Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(_vm->_mixer); + Video::SmackerDecoder *smkDecoder = new Video::SmackerDecoder(_vm->_mixer); if (!smkDecoder->loadFile(filename)) return; 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(); diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h index 756bc666d8..7914d09f40 100644 --- a/engines/scumm/he/animation_he.h +++ b/engines/scumm/he/animation_he.h @@ -34,7 +34,7 @@ namespace Scumm { class ScummEngine_v90he; -class MoviePlayer : public Graphics::SmackerDecoder { +class MoviePlayer : public Video::SmackerDecoder { ScummEngine_v90he *_vm; Audio::Mixer *_mixer; diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index e0b601d547..20ce543a55 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -66,7 +66,7 @@ static const char *sequenceList[20] = { // Basic movie player /////////////////////////////////////////////////////////////////////////////// -MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Graphics::VideoDecoder *decoder, DecoderType decoderType) +MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Video::VideoDecoder *decoder, DecoderType decoderType) : _vm(vm), _textMan(textMan), _snd(snd), _bgSoundHandle(bgSoundHandle), _system(system) { _bgSoundStream = NULL; _decoderType = decoderType; @@ -333,7 +333,7 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, Audio::M snprintf(filename, sizeof(filename), "%s.smk", sequenceList[id]); if (Common::File::exists(filename)) { - Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(snd); + Video::SmackerDecoder *smkDecoder = new Video::SmackerDecoder(snd); return new MoviePlayer(vm, textMan, snd, system, bgSoundHandle, smkDecoder, kVideoDecoderSMK); } diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h index 4ac3ddce63..566ca31c2f 100644 --- a/engines/sword1/animation.h +++ b/engines/sword1/animation.h @@ -59,7 +59,7 @@ public: } }; -class DXADecoderWithSound : public Graphics::DXADecoder { +class DXADecoderWithSound : public Video::DXADecoder { public: DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle); ~DXADecoderWithSound() {} @@ -73,7 +73,7 @@ private: class MoviePlayer { public: - MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Graphics::VideoDecoder *decoder, DecoderType decoderType); + MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Video::VideoDecoder *decoder, DecoderType decoderType); virtual ~MoviePlayer(); bool load(uint32 id); void play(); @@ -88,7 +88,7 @@ protected: byte _white, _black; DecoderType _decoderType; - Graphics::VideoDecoder *_decoder; + Video::VideoDecoder *_decoder; Audio::SoundHandle *_bgSoundHandle; Audio::AudioStream *_bgSoundStream; diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 50548486f0..dd06456656 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -46,7 +46,7 @@ namespace Sword2 { // Basic movie player /////////////////////////////////////////////////////////////////////////////// -MoviePlayer::MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Graphics::VideoDecoder *decoder, DecoderType decoderType) +MoviePlayer::MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Video::VideoDecoder *decoder, DecoderType decoderType) : _vm(vm), _snd(snd), _bgSoundHandle(bgSoundHandle), _system(system) { _bgSoundStream = NULL; _decoderType = decoderType; @@ -360,7 +360,7 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s snprintf(filename, sizeof(filename), "%s.smk", name); if (Common::File::exists(filename)) { - Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(snd); + Video::SmackerDecoder *smkDecoder = new Video::SmackerDecoder(snd); return new MoviePlayer(vm, snd, system, bgSoundHandle, smkDecoder, kVideoDecoderSMK); } diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h index 64a712682d..b90726537c 100644 --- a/engines/sword2/animation.h +++ b/engines/sword2/animation.h @@ -58,7 +58,7 @@ struct MovieText { } }; -class DXADecoderWithSound : public Graphics::DXADecoder { +class DXADecoderWithSound : public Video::DXADecoder { public: DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle); ~DXADecoderWithSound() {} @@ -71,7 +71,7 @@ private: class MoviePlayer { public: - MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Graphics::VideoDecoder *decoder, DecoderType decoderType); + MoviePlayer(Sword2Engine *vm, Audio::Mixer *snd, OSystem *system, Audio::SoundHandle *bgSoundHandle, Video::VideoDecoder *decoder, DecoderType decoderType); virtual ~MoviePlayer(); bool load(const char *name); @@ -89,7 +89,7 @@ protected: byte _white, _black; DecoderType _decoderType; - Graphics::VideoDecoder *_decoder; + Video::VideoDecoder *_decoder; Audio::SoundHandle *_bgSoundHandle; Audio::AudioStream *_bgSoundStream; diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h index b06d0abef0..0faed4fdef 100644 --- a/engines/sword25/fmv/theora_decoder.h +++ b/engines/sword25/fmv/theora_decoder.h @@ -49,7 +49,7 @@ namespace Sword25 { * Video decoder used in engines: * - sword25 */ -class TheoraDecoder : public Graphics::FixedRateVideoDecoder { +class TheoraDecoder : public Video::FixedRateVideoDecoder { public: TheoraDecoder(Audio::Mixer *mixer = 0, Audio::Mixer::SoundType soundType = Audio::Mixer::kMusicSoundType); virtual ~TheoraDecoder(); diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp index 160bf00e4d..272fadf75e 100644 --- a/engines/toon/movie.cpp +++ b/engines/toon/movie.cpp @@ -35,7 +35,7 @@ void ToonstruckSmackerDecoder::handleAudioTrack(byte track, uint32 chunkSize, ui uint16 height = _fileStream->readUint16LE(); _lowRes = (height == getHeight() / 2); } else - Graphics::SmackerDecoder::handleAudioTrack(track, chunkSize, unpackedSize); + Video::SmackerDecoder::handleAudioTrack(track, chunkSize, unpackedSize); } bool ToonstruckSmackerDecoder::loadFile(const Common::String &filename, int forcedflags) { @@ -43,7 +43,7 @@ bool ToonstruckSmackerDecoder::loadFile(const Common::String &filename, int forc _lowRes = false; - if (Graphics::SmackerDecoder::loadFile(filename)) { + if (Video::SmackerDecoder::loadFile(filename)) { if (forcedflags & 0x10 || _surface->h == 200) { if (_surface) { _surface->free(); @@ -61,7 +61,7 @@ bool ToonstruckSmackerDecoder::loadFile(const Common::String &filename, int forc return false; } -ToonstruckSmackerDecoder::ToonstruckSmackerDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType) : Graphics::SmackerDecoder(mixer, soundType) { +ToonstruckSmackerDecoder::ToonstruckSmackerDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType) : Video::SmackerDecoder(mixer, soundType) { _lowRes = false; } diff --git a/engines/toon/movie.h b/engines/toon/movie.h index 8b34fe3039..229791e90c 100644 --- a/engines/toon/movie.h +++ b/engines/toon/movie.h @@ -31,7 +31,7 @@ namespace Toon { -class ToonstruckSmackerDecoder : public Graphics::SmackerDecoder { +class ToonstruckSmackerDecoder : public Video::SmackerDecoder { public: ToonstruckSmackerDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType = Audio::Mixer::kSFXSoundType); virtual ~ToonstruckSmackerDecoder() {} diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h index 7feb58ddda..feb63c301b 100644 --- a/engines/tucker/tucker.h +++ b/engines/tucker/tucker.h @@ -976,7 +976,7 @@ private: bool _changeToNextSequence; const SequenceUpdateFunc *_updateFunc; int _updateFuncIndex; - ::Graphics::FlicDecoder _flicPlayer[2]; + Video::FlicDecoder _flicPlayer[2]; uint8 _animationPalette[256 * 4]; int _soundSeqDataCount; int _soundSeqDataIndex; |