[Scummvm-cvs-logs] SF.net SVN: scummvm:[42888] scummvm/branches/branch-1-0-0/graphics/video

[drmccoy at users.sourceforge.net]

Revision: 42888
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42888&view=rev
Author:   drmccoy
Date:     2009-07-29 10:18:19 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Backport: Adding a SoundType parameter to SmackerDecoder, defaulting to kSFXSoundType

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/graphics/video/smk_decoder.cpp
    scummvm/branches/branch-1-0-0/graphics/video/smk_decoder.h

Modified: scummvm/branches/branch-1-0-0/graphics/video/smk_decoder.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/graphics/video/smk_decoder.cpp	2009-07-29 10:17:44 UTC (rev 42887)
+++ scummvm/branches/branch-1-0-0/graphics/video/smk_decoder.cpp	2009-07-29 10:18:19 UTC (rev 42888)
@@ -348,8 +348,8 @@
 	return v;
 }
 
-SmackerDecoder::SmackerDecoder(Audio::Mixer *mixer)
-	: _audioStarted(false), _audioStream(0), _mixer(mixer) {
+SmackerDecoder::SmackerDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType)
+	: _audioStarted(false), _audioStream(0), _mixer(mixer), _soundType(soundType) {
 }
 
 SmackerDecoder::~SmackerDecoder() {
@@ -583,7 +583,7 @@
 			}
 
 			if (!_audioStarted) {
-				_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_audioHandle, _audioStream, -1, 255);
+				_mixer->playInputStream(_soundType, &_audioHandle, _audioStream, -1, 255);
 				_audioStarted = true;
 			}
 		} else {

Modified: scummvm/branches/branch-1-0-0/graphics/video/smk_decoder.h
===================================================================
--- scummvm/branches/branch-1-0-0/graphics/video/smk_decoder.h	2009-07-29 10:17:44 UTC (rev 42887)
+++ scummvm/branches/branch-1-0-0/graphics/video/smk_decoder.h	2009-07-29 10:18:19 UTC (rev 42888)
@@ -55,7 +55,8 @@
  */
 class SmackerDecoder : public VideoDecoder {
 public:
-	SmackerDecoder(Audio::Mixer *mixer);
+	SmackerDecoder(Audio::Mixer *mixer,
+			Audio::Mixer::SoundType soundType = Audio::Mixer::kSFXSoundType);
 	virtual ~SmackerDecoder();
 
 	int getHeight();
@@ -113,6 +114,7 @@
 	// The RGB palette
 	byte *_palette;
 
+	Audio::Mixer::SoundType _soundType;
 	Audio::Mixer *_mixer;
 	bool _audioStarted;
 	Audio::AppendableAudioStream *_audioStream;


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