From e080a593378bcaf44a7b44c297dcb291a2b584a8 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 9 Mar 2009 03:45:23 +0000 Subject: Renamed SMKPlayer -> SmackerDecoder and DXAPlayer -> DXADecoder, as well as some other tweaks svn-id: r39255 --- engines/agos/animation.cpp | 2 +- engines/agos/animation.h | 10 +++++----- engines/saga/introproc_saga2.cpp | 14 +++++++------- engines/scumm/he/animation_he.cpp | 2 +- engines/scumm/he/animation_he.h | 2 +- engines/sword1/animation.cpp | 10 +++++----- engines/sword1/animation.h | 6 +++--- engines/sword2/animation.cpp | 10 +++++----- engines/sword2/animation.h | 6 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) (limited to 'engines') diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index 9ba8320098..12d2dfb71a 100644 --- a/engines/agos/animation.cpp +++ b/engines/agos/animation.cpp @@ -390,7 +390,7 @@ bool MoviePlayerDXA::processFrame() { MoviePlayerSMK::MoviePlayerSMK(AGOSEngine *vm, const char *name) - : MoviePlayer(vm), SMKPlayer(vm->_mixer) { + : MoviePlayer(vm), SmackerDecoder(vm->_mixer) { debug(0, "Creating SMK cutscene player"); memset(baseName, 0, sizeof(baseName)); diff --git a/engines/agos/animation.h b/engines/agos/animation.h index a4fcbfc6d0..fcef94d4bf 100644 --- a/engines/agos/animation.h +++ b/engines/agos/animation.h @@ -61,9 +61,9 @@ public: virtual bool load() = 0; virtual void play(); - virtual void playVideo() {}; - virtual void nextFrame() {}; - virtual void stopVideo() {}; + virtual void playVideo() = 0; + virtual void nextFrame() = 0; + virtual void stopVideo() = 0; private: virtual void handleNextFrame(); @@ -71,7 +71,7 @@ private: virtual void startSound() {}; }; -class MoviePlayerDXA : public MoviePlayer, ::Graphics::DXAPlayer { +class MoviePlayerDXA : public MoviePlayer, ::Graphics::DXADecoder { static const char *_sequenceList[90]; uint8 _sequenceNum; public: @@ -90,7 +90,7 @@ private: void startSound(); }; -class MoviePlayerSMK : public MoviePlayer, ::Graphics::SMKPlayer { +class MoviePlayerSMK : public MoviePlayer, ::Graphics::SmackerDecoder { public: MoviePlayerSMK(AGOSEngine *vm, const char *name); diff --git a/engines/saga/introproc_saga2.cpp b/engines/saga/introproc_saga2.cpp index 99e0c2cddd..86b9d6de01 100644 --- a/engines/saga/introproc_saga2.cpp +++ b/engines/saga/introproc_saga2.cpp @@ -52,10 +52,10 @@ int Scene::DinoStartProc() { stopEvent.kbd = Common::KEYCODE_ESCAPE; stopEvents.push_back(stopEvent); - Graphics::SMKPlayer *smkDecoder = new Graphics::SMKPlayer(_vm->_mixer); + Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(_vm->_mixer); Graphics::VideoPlayer *player = new Graphics::VideoPlayer(smkDecoder); if (smkDecoder->loadFile("testvid.smk")) - player->playVideo(&stopEvents); // Play introduction + player->playVideo(stopEvents); // Play introduction smkDecoder->closeFile(); delete player; delete smkDecoder; @@ -75,13 +75,13 @@ int Scene::FTA2StartProc() { stopEvent.kbd = Common::KEYCODE_ESCAPE; stopEvents.push_back(stopEvent); - Graphics::SMKPlayer *smkDecoder = new Graphics::SMKPlayer(_vm->_mixer); + Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(_vm->_mixer); Graphics::VideoPlayer *player = new Graphics::VideoPlayer(smkDecoder); if (smkDecoder->loadFile("trimark.smk")) - player->playVideo(&stopEvents); // Show Ignite logo + player->playVideo(stopEvents); // Show Ignite logo smkDecoder->closeFile(); if (smkDecoder->loadFile("intro.smk")) - player->playVideo(&stopEvents); // Play introduction + player->playVideo(stopEvents); // Play introduction smkDecoder->closeFile(); delete player; delete smkDecoder; @@ -125,10 +125,10 @@ int Scene::FTA2EndProc(FTA2Endings whichEnding) { stopEvents.push_back(stopEvent); // Play ending - Graphics::SMKPlayer *smkDecoder = new Graphics::SMKPlayer(_vm->_mixer); + Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(_vm->_mixer); Graphics::VideoPlayer *player = new Graphics::VideoPlayer(smkDecoder); if (smkDecoder->loadFile(videoName)) { - player->playVideo(&stopEvents); + player->playVideo(stopEvents); smkDecoder->closeFile(); } delete player; diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 4a64f16f42..0cc4419778 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -33,7 +33,7 @@ namespace Scumm { MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer) - : SMKPlayer(mixer), _vm(vm), _mixer(mixer) { + : SmackerDecoder(mixer), _vm(vm), _mixer(mixer) { _flags = 0; _wizResNum = 0; diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h index 93acc2253c..966db0e3f7 100644 --- a/engines/scumm/he/animation_he.h +++ b/engines/scumm/he/animation_he.h @@ -36,7 +36,7 @@ namespace Scumm { class ScummEngine_v90he; -class MoviePlayer : public Graphics::SMKPlayer { +class MoviePlayer : public Graphics::SmackerDecoder { ScummEngine_v90he *_vm; Audio::Mixer *_mixer; diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 2b4a596f9a..032eb15fb9 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -168,7 +168,7 @@ void MoviePlayer::play(void) { stopEvent.kbd = Common::KEYCODE_ESCAPE; stopEvents.push_back(stopEvent); - terminated = !playVideo(&stopEvents); + terminated = !playVideo(stopEvents); if (terminated) _snd->stopHandle(*_bgSoundHandle); @@ -229,11 +229,11 @@ void MoviePlayer::performPostProcessing(byte *screen) { } } -DXAPlayerWithSound::DXAPlayerWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle) +DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle) : _mixer(mixer), _bgSoundHandle(bgSoundHandle) { } -int32 DXAPlayerWithSound::getAudioLag() { +int32 DXADecoderWithSound::getAudioLag() { if (!_fileStream) return 0; @@ -261,7 +261,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::SMKPlayer *smkDecoder = new Graphics::SMKPlayer(snd); + Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(snd); return new MoviePlayer(vm, textMan, snd, system, bgSoundHandle, smkDecoder, kVideoDecoderSMK); } @@ -269,7 +269,7 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, Audio::M if (Common::File::exists(filename)) { #ifdef USE_ZLIB - DXAPlayerWithSound *dxaDecoder = new DXAPlayerWithSound(snd, bgSoundHandle); + DXADecoderWithSound *dxaDecoder = new DXADecoderWithSound(snd, bgSoundHandle); return new MoviePlayer(vm, textMan, snd, system, bgSoundHandle, dxaDecoder, kVideoDecoderDXA); #else GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK"); diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h index a221221546..85c9fc70d6 100644 --- a/engines/sword1/animation.h +++ b/engines/sword1/animation.h @@ -56,10 +56,10 @@ public: } }; -class DXAPlayerWithSound : public Graphics::DXAPlayer { +class DXADecoderWithSound : public Graphics::DXADecoder { public: - DXAPlayerWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle); - ~DXAPlayerWithSound() {} + DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle); + ~DXADecoderWithSound() {} int32 getAudioLag(); private: diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index c2d92a6b29..57b6235b0a 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -158,7 +158,7 @@ void MoviePlayer::play(MovieText *movieTexts, uint32 numMovieTexts, uint32 leadI stopEvent.kbd = Common::KEYCODE_ESCAPE; stopEvents.push_back(stopEvent); - terminated = !playVideo(&stopEvents); + terminated = !playVideo(stopEvents); closeTextObject(_currentMovieText); @@ -291,11 +291,11 @@ void MoviePlayer::performPostProcessing(byte *screen) { } } -DXAPlayerWithSound::DXAPlayerWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle) +DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle) : _mixer(mixer), _bgSoundHandle(bgSoundHandle) { } -int32 DXAPlayerWithSound::getAudioLag() { +int32 DXADecoderWithSound::getAudioLag() { if (!_fileStream) return 0; @@ -323,7 +323,7 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s snprintf(filename, sizeof(filename), "%s.smk", name); if (Common::File::exists(filename)) { - Graphics::SMKPlayer *smkDecoder = new Graphics::SMKPlayer(snd); + Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(snd); return new MoviePlayer(vm, snd, system, bgSoundHandle, smkDecoder, kVideoDecoderSMK); } @@ -331,7 +331,7 @@ MoviePlayer *makeMoviePlayer(const char *name, Sword2Engine *vm, Audio::Mixer *s if (Common::File::exists(filename)) { #ifdef USE_ZLIB - DXAPlayerWithSound *dxaDecoder = new DXAPlayerWithSound(snd, bgSoundHandle); + DXADecoderWithSound *dxaDecoder = new DXADecoderWithSound(snd, bgSoundHandle); return new MoviePlayer(vm, snd, system, bgSoundHandle, dxaDecoder, kVideoDecoderDXA); #else GUI::MessageDialog dialog("DXA cutscenes found but ScummVM has been built without zlib support", "OK"); diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h index dde1b75a8c..cfb1ecf1b1 100644 --- a/engines/sword2/animation.h +++ b/engines/sword2/animation.h @@ -64,10 +64,10 @@ struct MovieInfo { bool seamless; }; -class DXAPlayerWithSound : public Graphics::DXAPlayer { +class DXADecoderWithSound : public Graphics::DXADecoder { public: - DXAPlayerWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle); - ~DXAPlayerWithSound() {} + DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle); + ~DXADecoderWithSound() {} int32 getAudioLag(); private: -- cgit v1.2.3