RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied patch from IRC user case__, adding support for FmodAudioManager::set_volume/get_volume

This commit is contained in:
rdb 2009-07-02 16:24:17 +00:00
parent ebf6291663
commit f53400cd04
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
panda/src/audiotraits/fmodAudioManager.cxx
View File

@ -515,25 +515,40 @@ setSpeakerSetup(AudioManager::SpeakerModeCategory cat) {
////////////////////////////////////////////////////////////////////
// Function: FmodAudioManager::set_volume(float volume)
// Access: Public
// Description:
// There isn't a specific system volume function in FMOD-EX,
// so this function is moot now.
// Description: Sets the master volume.
////////////////////////////////////////////////////////////////////
void FmodAudioManager::set_volume(float volume) {
audio_warning("FmodAudioManager::set_volume has no effect." );
FMOD::ChannelGroup *channelGroup;
FMOD_RESULT result;
result = _system->getMasterChannelGroup(&channelGroup);
if (result == FMOD_OK) {
channelGroup->setVolume(volume);
} else {
fmod_audio_errcheck("_system->getMasterChannelGroup()", result);
}
}
////////////////////////////////////////////////////////////////////
// Function: FmodAudioManager::get_volume()
// Access: Public
// Description:
// There isn't a specific system volume function in FMOD-EX,
// so this function is moot now.
// Description: Returns the master volume.
////////////////////////////////////////////////////////////////////
float FmodAudioManager::
get_volume() const {
audio_warning("FmodAudioManager::get_volume has no effect." );
return 1.0;
FMOD::ChannelGroup *channelGroup;
FMOD_RESULT result;
float volume;
result = _system->getMasterChannelGroup(&channelGroup);
if (result == FMOD_OK) {
channelGroup->getVolume(&volume);
} else {
fmod_audio_errcheck("_system->getMasterChannelGroup()", result);
volume = 1.0;
}
return volume;
}
////////////////////////////////////////////////////////////////////