Merge remote branch 'upstream/master' into pegasus

2 files changed, 17 insertions, 4 deletions

diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index 6a60b0e7d7..5d7efe87af 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 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();