[Scummvm-cvs-logs] SF.net SVN: scummvm:[46170] scummvm/trunk/graphics/video

[drmccoy at users.sourceforge.net]

Revision: 46170
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46170&view=rev
Author:   drmccoy
Date:     2009-11-28 00:38:18 +0000 (Sat, 28 Nov 2009)

Log Message:
-----------
Adding a parameter to the AviDecoder constructor to allow changing the SoundType (instead of it being fixed to Plain)

Modified Paths:
--------------
    scummvm/trunk/graphics/video/avi_decoder.cpp
    scummvm/trunk/graphics/video/avi_decoder.h

Modified: scummvm/trunk/graphics/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/avi_decoder.cpp	2009-11-28 00:32:16 UTC (rev 46169)
+++ scummvm/trunk/graphics/video/avi_decoder.cpp	2009-11-28 00:38:18 UTC (rev 46170)
@@ -39,7 +39,9 @@
 
 namespace Graphics {
 
-AviDecoder::AviDecoder(Audio::Mixer *mixer) : _mixer(mixer) {
+AviDecoder::AviDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType) : _mixer(mixer) {
+	_soundType = soundType;
+
 	_videoCodec = NULL;
 	_decodedHeader = false;
 	_audStream = NULL;
@@ -241,7 +243,7 @@
 	// Initialize the video stuff too
 	_audStream = createAudioStream();
 	if (_audStream)
-		_mixer->playInputStream(Audio::Mixer::kPlainSoundType, _audHandle, _audStream);
+		_mixer->playInputStream(_soundType, _audHandle, _audStream);
 			
 	debug (0, "Frames = %d, Dimensions = %d x %d", _header.totalFrames, _header.width, _header.height);
 	debug (0, "Frame Rate = %d", getFrameRate());

Modified: scummvm/trunk/graphics/video/avi_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/avi_decoder.h	2009-11-28 00:32:16 UTC (rev 46169)
+++ scummvm/trunk/graphics/video/avi_decoder.h	2009-11-28 00:38:18 UTC (rev 46170)
@@ -174,7 +174,8 @@
 
 class AviDecoder : public VideoDecoder {
 public:
-	AviDecoder(Audio::Mixer *mixer);
+	AviDecoder(Audio::Mixer *mixer,
+			Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType);
 	virtual ~AviDecoder();
 
 	/**
@@ -207,6 +208,8 @@
 	Codec *_videoCodec;
 	Codec *createCodec();
 	
+	Audio::Mixer::SoundType _soundType;
+
 	void runHandle(uint32 tag);
 	void handleList();
 	void handleStreamHeader();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.