aboutsummaryrefslogtreecommitdiff
path: root/video/coktel_decoder.h
diff options
context:
space:
mode:
authorMatthew Hoops2012-08-26 20:30:32 -0400
committerMatthew Hoops2012-08-26 20:30:32 -0400
commit3e2ff0a4437224a5d9de0b63d983e414b236992a (patch)
treee4a733dc0bc51b4fe76e73b3d469a6fd6e8bfe6b /video/coktel_decoder.h
parent857b92f8ffececa9c1f990d21a6a8d1630199a62 (diff)
downloadscummvm-rg350-3e2ff0a4437224a5d9de0b63d983e414b236992a.tar.gz
scummvm-rg350-3e2ff0a4437224a5d9de0b63d983e414b236992a.tar.bz2
scummvm-rg350-3e2ff0a4437224a5d9de0b63d983e414b236992a.zip
VIDEO: Fix compilation with some compilers
Diffstat (limited to 'video/coktel_decoder.h')
-rw-r--r--video/coktel_decoder.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h
index 2a97eadf00..91d52b65e6 100644
--- a/video/coktel_decoder.h
+++ b/video/coktel_decoder.h
@@ -98,6 +98,8 @@ public:
/** Override the video's frame rate. */
void setFrameRate(Common::Rational frameRate);
+ /** Get the video's frame rate. */
+ Common::Rational getFrameRate() const;
/** Get the video's default X position. */
uint16 getDefaultX() const;
@@ -165,6 +167,11 @@ public:
/** Close the video. */
void close();
+ /** Get the Mixer SoundType audio is being played with. */
+ Audio::Mixer::SoundType getSoundType() const;
+ /** Get the AudioStream for the audio. */
+ Audio::AudioStream *getAudioStream() const;
+
uint16 getWidth() const;
uint16 getHeight() const;
virtual Graphics::PixelFormat getPixelFormat() const = 0;
@@ -237,8 +244,6 @@ protected:
bool evaluateSeekFrame(int32 &frame, int whence) const;
- Common::Rational getFrameRate() const;
-
// Surface management
bool hasSurface();
void createSurface();