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

issue #633, add test case for play effect repeatly, force the volume of effect&bgm between 0.0~1.0 in SimpleAudioEngine.mm.

This commit is contained in:
Walzer 2011-08-08 21:40:33 +08:00
parent bde465e902
commit 945e5fde00
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CocosDenshion/iphone/SimpleAudioEngine.mm
View File

@ -77,6 +77,7 @@ static float static_getBackgroundMusicVolume()
static void static_setBackgroundMusicVolume(float volume)
{
volume = MAX( MIN(volume, 1.0), 0 );
[SimpleAudioEngine sharedEngine].backgroundMusicVolume = volume;
}
@ -87,6 +88,7 @@ static float static_getEffectsVolume()
static void static_setEffectsVolume(float volume)
{
volume = MAX( MIN(volume, 1.0), 0 );
[SimpleAudioEngine sharedEngine].effectsVolume = volume;
}

2
tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
b21283100ca056134301332a759b4d1ad747f4e2
fa9e79e3eef1e488c7931e695ac7e5ceab93012b

23
tests/tests/CocosDenshionTest/CocosDenshionTest.cpp
View File

@ -33,6 +33,7 @@ m_nSoundId(0)
"rewind background music",
"is background music playing",
"play effect",
"play effect repeatly",
"stop effect",
"unload effect",
"add background music volume",
@ -68,6 +69,10 @@ m_nSoundId(0)
// preload background music and effect
SimpleAudioEngine::sharedEngine()->preloadBackgroundMusic(MUSIC_FILE);
SimpleAudioEngine::sharedEngine()->preloadEffect(EFFECT_FILE);
// set default volume
SimpleAudioEngine::sharedEngine()->setEffectsVolume(0.5);
SimpleAudioEngine::sharedEngine()->setBackgroundMusicVolume(0.5);
}
CocosDenshionTest::~CocosDenshionTest()
@ -124,28 +129,32 @@ void CocosDenshionTest::menuCallback(CCObject * pSender)
case 6:
m_nSoundId = SimpleAudioEngine::sharedEngine()->playEffect(EFFECT_FILE);
break;
// stop effect
case 7:
// play effect
case 7:
m_nSoundId = SimpleAudioEngine::sharedEngine()->playEffect(EFFECT_FILE, true);
break;
// stop effect
case 8:
SimpleAudioEngine::sharedEngine()->stopEffect(m_nSoundId);
break;
// unload effect
case 8:
case 9:
SimpleAudioEngine::sharedEngine()->unloadEffect(EFFECT_FILE);
break;
// add bakcground music volume
case 9:
case 10:
SimpleAudioEngine::sharedEngine()->setBackgroundMusicVolume(SimpleAudioEngine::sharedEngine()->getBackgroundMusicVolume() + 0.1);
break;
// sub backgroud music volume
case 10:
case 11:
SimpleAudioEngine::sharedEngine()->setBackgroundMusicVolume(SimpleAudioEngine::sharedEngine()->getBackgroundMusicVolume() - 0.1);
break;
// add effects volume
case 11:
case 12:
SimpleAudioEngine::sharedEngine()->setEffectsVolume(SimpleAudioEngine::sharedEngine()->getEffectsVolume() + 0.1);
break;
// sub effects volume
case 12:
case 13:
SimpleAudioEngine::sharedEngine()->setEffectsVolume(SimpleAudioEngine::sharedEngine()->getEffectsVolume() - 0.1);
break;
}