[Scummvm-cvs-logs] SF.net SVN: scummvm: [29808] scummvm/trunk/engines/kyra/sound_adlib.cpp

[lordhoto at users.sourceforge.net]

Revision: 29808
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29808&view=rev
Author:   lordhoto
Date:     2007-12-09 15:55:57 -0800 (Sun, 09 Dec 2007)

Log Message:
-----------
Added a hack to allow adjustment of Adlib volume. (see bug #1497961 "KYRA1: music/sfx volume settings not working")

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_adlib.cpp

Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp	2007-12-09 22:41:36 UTC (rev 29807)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp	2007-12-09 23:55:57 UTC (rev 29808)
@@ -444,7 +444,14 @@
 
 	_tablePtr1 = _tablePtr2 = 0;
 
-	_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
+	// HACK: We use MusicSoundType here for now so we can adjust the volume in the launcher dialog.
+	// This affects SFX too, but if we want to support different volumes for SFX and music we would
+	// have to change our player implementation, currently we setup the volume for an AdLib channel
+	// in AdlibDriver::adjustVolume, so if that would be called, we would have to know if the channel
+	// is used by SFX or music, and then adjust the volume accordingly. Since Kyrandia 2 supports
+	// different volumes for SFX and music, looking at the disasm and checking how the original does it
+	// would be a good idea.
+	_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
 
 	_samplesPerCallback = getRate() / CALLBACKS_PER_SECOND;
 	_samplesPerCallbackRemainder = getRate() % CALLBACKS_PER_SECOND;


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