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/toon | |
| 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/toon')
| -rw-r--r-- | engines/toon/movie.cpp | 6 | ||||
| -rw-r--r-- | engines/toon/movie.h | 2 |
2 files changed, 4 insertions, 4 deletions
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() {} |