[Scummvm-cvs-logs] scummvm master -> 3e2ff0a4437224a5d9de0b63d983e414b236992a
clone2727
clone2727 at gmail.com
Mon Aug 27 02:32:34 CEST 2012
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3e2ff0a443 VIDEO: Fix compilation with some compilers
Commit: 3e2ff0a4437224a5d9de0b63d983e414b236992a
https://github.com/scummvm/scummvm/commit/3e2ff0a4437224a5d9de0b63d983e414b236992a
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-08-26T17:30:32-07:00
Commit Message:
VIDEO: Fix compilation with some compilers
Changed paths:
video/coktel_decoder.cpp
video/coktel_decoder.h
diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index 6a60b0e..5d7efe8 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -288,6 +288,14 @@ void CoktelDecoder::close() {
_isPaused = false;
}
+Audio::Mixer::SoundType CoktelDecoder::getSoundType() const {
+ return _soundType;
+}
+
+Audio::AudioStream *CoktelDecoder::getAudioStream() const {
+ return _audioStream;
+}
+
uint16 CoktelDecoder::getWidth() const {
return _width;
}
@@ -2847,11 +2855,11 @@ AdvancedVMDDecoder::VMDAudioTrack::VMDAudioTrack(VMDDecoder *decoder) : _decoder
}
Audio::Mixer::SoundType AdvancedVMDDecoder::VMDAudioTrack::getSoundType() const {
- return _decoder->_soundType;
+ return _decoder->getSoundType();
}
Audio::AudioStream *AdvancedVMDDecoder::VMDAudioTrack::getAudioStream() const {
- return _decoder->_audioStream;
+ return _decoder->getAudioStream();
}
} // End of namespace Video
diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h
index 2a97ead..91d52b6 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();
More information about the Scummvm-git-logs
mailing list