zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-08-02 12:34:50 +00:00
parent de979ebcf7
commit 90c07db56f
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/sound/sound.cpp
View file

@ -356,6 +356,8 @@ void CSoundMediator::initialise()
s_targetVolume[i]=INITIAL_VOLUME; s_targetVolume[i]=INITIAL_VOLUME;
s_volumeDirty[i]=true; s_volumeDirty[i]=true;
} }
// s_targetVolume[VOL_SONG]=INITIAL_VOLUME-32;
s_targetVolume[VOL_SPEECH]=INITIAL_VOLUME+64;
ASSERT(CXAStream::MIN_VOLUME==0); // Just incase someone decides to change any of these.. things in here will break ( PKG ) ASSERT(CXAStream::MIN_VOLUME==0); // Just incase someone decides to change any of these.. things in here will break ( PKG )
ASSERT(CXAStream::MAX_VOLUME==32767); ASSERT(CXAStream::MAX_VOLUME==32767);
@ -446,7 +448,7 @@ if(_frames==0)_frames=1;
if (isSpeechPlaying()) if (isSpeechPlaying())
{ {
s_volumeDirty[VOL_SONG]=true; s_volumeDirty[VOL_SONG]=true;
s_currentVolume[VOL_FADE]=128; s_currentVolume[VOL_FADE]=64;
} }
if(s_volumeDirty[VOL_SONG]) if(s_volumeDirty[VOL_SONG])
{ {
@ -460,7 +462,12 @@ if(_frames==0)_frames=1;
} }
if(s_volumeDirty[VOL_SPEECH]) if(s_volumeDirty[VOL_SPEECH])
{ {
int vol=((s_currentVolume[VOL_SPEECH]*s_currentVolume[VOL_FADE])>>8)<<7; // int vol=((s_currentVolume[VOL_SPEECH]*s_currentVolume[VOL_FADE])/*>>8*/)/*<<7*/;
int vol=s_currentVolume[VOL_SPEECH]<<8;//*s_currentVolume[VOL_FADE])/*>>8*/)/*<<7*/;
if (vol<=CXAStream::MIN_VOLUME) vol=CXAStream::MIN_VOLUME;
if (vol>=CXAStream::MAX_VOLUME) vol=CXAStream::MAX_VOLUME;
CXAStream::setMasterVolume(vol,vol); CXAStream::setMasterVolume(vol,vol);
s_volumeDirty[VOL_SPEECH]=false; s_volumeDirty[VOL_SPEECH]=false;
} }