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 /video/flic_decoder.h | |
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 'video/flic_decoder.h')
-rw-r--r-- | video/flic_decoder.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/video/flic_decoder.h b/video/flic_decoder.h index 37068c2fb3..7736cdf604 100644 --- a/video/flic_decoder.h +++ b/video/flic_decoder.h @@ -34,7 +34,7 @@ namespace Common { class SeekableReadStream; } -namespace Graphics { +namespace Video { /** * Decoder for FLIC videos. @@ -59,13 +59,13 @@ public: * @note the return surface should *not* be freed * @note this may return 0, in which case the last frame should be kept on screen */ - const Surface *decodeNextFrame(); + const Graphics::Surface *decodeNextFrame(); bool isVideoLoaded() const { return _fileStream != 0; } uint16 getWidth() const { return _surface->w; } uint16 getHeight() const { return _surface->h; } uint32 getFrameCount() const { return _frameCount; } - PixelFormat getPixelFormat() const { return PixelFormat::createFormatCLUT8(); } + Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat::createFormatCLUT8(); } const Common::List<Common::Rect> *getDirtyRects() const { return &_dirtyRects; } void clearDirtyRects() { _dirtyRects.clear(); } @@ -89,13 +89,13 @@ private: void unpackPalette(uint8 *mem); Common::SeekableReadStream *_fileStream; - Surface *_surface; + Graphics::Surface *_surface; uint32 _frameCount; Common::Rational _frameRate; Common::List<Common::Rect> _dirtyRects; }; -} // End of namespace Graphics +} // End of namespace Video #endif |