[Scummvm-cvs-logs] SF.net SVN: scummvm:[52604] scummvm/trunk/engines/sci/sound

[m_kiewitz at users.sourceforge.net]

Revision: 52604
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52604&view=rev
Author:   m_kiewitz
Date:     2010-09-06 18:23:03 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
SCI: fix regression of r52569

fade in/out of samples

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/music.cpp
    scummvm/trunk/engines/sci/sound/music.h
    scummvm/trunk/engines/sci/sound/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-09-06 18:15:51 UTC (rev 52603)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-09-06 18:23:03 UTC (rev 52604)
@@ -431,6 +431,13 @@
 	}
 }
 
+// this is used to set volume of the sample, used for fading only!
+void SciMusic::soundSetSampleVolume(MusicEntry *pSnd, byte volume) {
+	assert(volume <= MUSIC_VOLUME_MAX);
+	assert(pSnd->pStreamAud);
+	_pMixer->setChannelVolume(pSnd->hCurrentAud, volume * 2); // Mixer is 0-255, SCI is 0-127
+}
+
 void SciMusic::soundSetPriority(MusicEntry *pSnd, byte prio) {
 	Common::StackLock lock(_mutex);
 

Modified: scummvm/trunk/engines/sci/sound/music.h
===================================================================
--- scummvm/trunk/engines/sci/sound/music.h	2010-09-06 18:15:51 UTC (rev 52603)
+++ scummvm/trunk/engines/sci/sound/music.h	2010-09-06 18:23:03 UTC (rev 52604)
@@ -148,6 +148,7 @@
 	void soundResume(MusicEntry *pSnd);
 	void soundToggle(MusicEntry *pSnd, bool pause);
 	void soundSetVolume(MusicEntry *pSnd, byte volume);
+	void soundSetSampleVolume(MusicEntry *pSnd, byte volume);
 	void soundSetPriority(MusicEntry *pSnd, byte prio);
 	uint16 soundGetMasterVolume();
 	void soundSetMasterVolume(uint16 vol);

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-09-06 18:15:51 UTC (rev 52603)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-09-06 18:23:03 UTC (rev 52604)
@@ -402,7 +402,7 @@
 		}
 		// We get a flag from MusicEntry::doFade() here to set volume for the stream
 		if (musicSlot->fadeSetVolume) {
-			_music->soundSetVolume(musicSlot, musicSlot->volume);
+			_music->soundSetSampleVolume(musicSlot, musicSlot->volume);
 			musicSlot->fadeSetVolume = false;
 		}
 	} else if (musicSlot->pMidiParser) {


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