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

Browse source
This commit is contained in:
Paul 2000-10-12 15:18:47 +00:00
parent 27b7ee5531
commit aad1689a44
7 changed files with 187 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

38
source/sound/sound.cpp
View file

@ -140,8 +140,9 @@ void CSoundMediator::initialise()
s_targetVolume[i]=INITIAL_VOLUME;
s_volumeDirty[i]=true;
}
// 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::MIN_VOLUME==0); // Just incase someone decides to change any of these.. things in here will break ( PKG )
ASSERT(CXAStream::MAX_VOLUME==32767);
// Initial reverb settings
setReverbType(NONE);//ECHO_TEST);
@ -212,7 +213,7 @@ void CSoundMediator::think(int _frames)
}
// Update of anything that needs it
// CXAStream::ControlXA();
CXAStream::ControlXA();
s_xmplaySound->think();
@ -227,12 +228,12 @@ void CSoundMediator::think(int _frames)
s_xmplaySound->setMasterSfxVolume(s_currentVolume[SFX]);
s_volumeDirty[SFX]=false;
}
// if(s_volumeDirty[SPEECH])
// {
// int vol=s_currentVolume[SPEECH]<<7;
// CXAStream::SetVolume(vol,vol);
// s_volumeDirty[SPEECH]=false;
// }
if(s_volumeDirty[SPEECH])
{
int vol=s_currentVolume[SPEECH]<<7;
CXAStream::setMasterVolume(vol,vol);
s_volumeDirty[SPEECH]=false;
}
}
@ -414,13 +415,25 @@ void CSoundMediator::stopSfx(xmPlayingId _playingId)
---------------------------------------------------------------------- */
void CSoundMediator::playSpeech(SpeechEquate _speech)
{
// if(CXAStream::IsPlaying())
// CXAStream::Stop();
// CXAStream::PlaySpeech(_speech);
stopSpeech();
CXAStream::PlaySpeech(_speech);
// s_volumeDirty[SPEECH]=true; // Force a volume update
}
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
void CSoundMediator::stopSpeech()
{
if(CXAStream::IsPlaying())
CXAStream::Stop();
}
/*----------------------------------------------------------------------
Function:
Purpose:
@ -457,6 +470,7 @@ int CSoundMediator::getVolume(VOLUMETYPE _type)
void CSoundMediator::stopAllSound()
{
s_xmplaySound->stopAndUnlockAllSound();
CXAStream::Stop();
}