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

[m_kiewitz at users.sourceforge.net]

Revision: 46852
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46852&view=rev
Author:   m_kiewitz
Date:     2010-01-01 21:26:46 +0000 (Fri, 01 Jan 2010)

Log Message:
-----------
SCI: kDoAudio now also clips volume and adjusts to mixer volume

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/ksound.cpp
    scummvm/trunk/engines/sci/sfx/audio.h

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2010-01-01 21:18:19 UTC (rev 46851)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2010-01-01 21:26:46 UTC (rev 46852)
@@ -131,9 +131,12 @@
 	case kSciAudioRate:
 		s->_audio->setAudioRate(argv[1].toUint16());
 		break;
-	case kSciAudioVolume:
-		mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, argv[1].toUint16());
+	case kSciAudioVolume: {
+		int16 volume = argv[1].toUint16();
+		volume = CLIP<int16>(volume, 0, AUDIO_VOLUME_MAX);
+		mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, volume * 2);
 		break;
+	}
 	case kSciAudioLanguage:
 		// In SCI1.1: tests for digital audio support
 		if (getSciVersion() == SCI_VERSION_1_1)

Modified: scummvm/trunk/engines/sci/sfx/audio.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/audio.h	2010-01-01 21:18:19 UTC (rev 46851)
+++ scummvm/trunk/engines/sci/sfx/audio.h	2010-01-01 21:26:46 UTC (rev 46852)
@@ -51,6 +51,8 @@
 	kSciAudioSyncStop = 2
 };
 
+#define AUDIO_VOLUME_MAX 127
+
 class Resource;
 class ResourceId;
 class ResourceManager;


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