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/sword2 | |
| 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/sword2')
| -rw-r--r-- | engines/sword2/animation.cpp | 4 | ||||
| -rw-r--r-- | engines/sword2/animation.h | 6 |
2 files changed, 5 insertions, 5 deletions
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; |