aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/fmv/theora_decoder.h
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-06 13:13:25 +0000
committerEugene Sandulenko2010-10-12 22:35:55 +0000
commit47904bc7b2992189bb554833f00a79ff0fea9fb8 (patch)
tree1cec51758c6741b970bd064fafee77607b9f884f /engines/sword25/fmv/theora_decoder.h
parentca17def625154e5f758b797e4fc48c76b0566320 (diff)
downloadscummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.gz
scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.bz2
scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.zip
SWORD25: Mass-astyle.
svn-id: r53222
Diffstat (limited to 'engines/sword25/fmv/theora_decoder.h')
-rw-r--r--[-rwxr-xr-x]engines/sword25/fmv/theora_decoder.h26
1 files changed, 19 insertions, 7 deletions
diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h
index b6cf4567fc..690763e940 100755..100644
--- a/engines/sword25/fmv/theora_decoder.h
+++ b/engines/sword25/fmv/theora_decoder.h
@@ -34,7 +34,7 @@
#include <vorbis/codec.h>
namespace Common {
- class SeekableReadStream;
+class SeekableReadStream;
}
namespace Sword25 {
@@ -65,16 +65,28 @@ public:
*/
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; }
- Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat(3, 8, 8, 8, 0, 0, 0, 0, 0); }
+ bool isVideoLoaded() const {
+ return _fileStream != 0;
+ }
+ uint16 getWidth() const {
+ return _surface->w;
+ }
+ uint16 getHeight() const {
+ return _surface->h;
+ }
+ uint32 getFrameCount() const {
+ return _frameCount;
+ }
+ Graphics::PixelFormat getPixelFormat() const {
+ return Graphics::PixelFormat(3, 8, 8, 8, 0, 0, 0, 0, 0);
+ }
uint32 getElapsedTime() const;
protected:
- Common::Rational getFrameRate() const { return _frameRate; }
+ Common::Rational getFrameRate() const {
+ return _frameRate;
+ }
private:
void queuePage(ogg_page *page);