Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2090 from jsambuo/linux-audio-getEffectsVolume-fix 

SimpleAudioEngine::getEffectsVolume() returns bgm volume on linux
This commit is contained in:
minggo 2013-03-03 17:34:13 -08:00
parent 7469fcf033 54a582b3da
commit 160536d4f2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CocosDenshion/linux/FmodAudioPlayer.cpp
View File

@ -274,6 +274,7 @@ float FmodAudioPlayer::getEffectsVolume() {
pSystem->update();
FMOD_RESULT result = pChannelGroup->getVolume(&fVolumn);
ERRCHECKWITHEXIT(result);
return fVolumn;
}
void FmodAudioPlayer::setEffectsVolume(float volume) {

2
CocosDenshion/linux/SimpleAudioEngine.cpp
View File

@ -126,7 +126,7 @@ void SimpleAudioEngine::setBackgroundMusicVolume(float volume) {
}
float SimpleAudioEngine::getEffectsVolume() {
return oAudioPlayer->getBackgroundMusicVolume();
return oAudioPlayer->getEffectsVolume();
}
void SimpleAudioEngine::setEffectsVolume(float volume) {