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

Cleanup AudioEngine resource after exiting NewAudioEngineTest. (#17675) 

* Unschedules update in AudioEngine implementation while AudioEngine::end is called.

* Cleanup AudioEngine resource after exiting NewAudioEngineTest.
This commit is contained in:
James Chen 2017-04-13 17:58:49 +08:00 committed by minggo
parent 75d0ebfefc
commit 3c1e36c2c3
5 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/audio/apple/AudioEngine-inl.mm
View File

@ -192,12 +192,18 @@ static id s_AudioEngineSessionHandler = nullptr;
AudioEngineImpl::AudioEngineImpl()
: _lazyInitLoop(true)
, _currentAudioID(0)
, _scheduler(nullptr)
{
}
AudioEngineImpl::~AudioEngineImpl()
{
if (_scheduler != nullptr)
{
_scheduler->unschedule(CC_SCHEDULE_SELECTOR(AudioEngineImpl::update), this);
}
if (s_ALContext) {
alDeleteSources(MAX_AUDIOINSTANCES, _alSources);

6
cocos/audio/win32/AudioEngine-win32.cpp
View File

@ -112,12 +112,18 @@ static ALCcontext *s_ALContext = nullptr;
AudioEngineImpl::AudioEngineImpl()
: _lazyInitLoop(true)
, _currentAudioID(0)
, _scheduler(nullptr)
{
}
AudioEngineImpl::~AudioEngineImpl()
{
if (_scheduler != nullptr)
{
_scheduler->unschedule(CC_SCHEDULE_SELECTOR(AudioEngineImpl::update), this);
}
if (s_ALContext) {
alDeleteSources(MAX_AUDIOINSTANCES, _alSources);

2
cocos/audio/winrt/AudioEngine-winrt.cpp
View File

@ -38,6 +38,8 @@ AudioEngineImpl::AudioEngineImpl()
AudioEngineImpl::~AudioEngineImpl()
{
auto scheduler = cocos2d::Director::getInstance()->getScheduler();
scheduler->unschedule(schedule_selector(AudioEngineImpl::update), this);
_audioCaches.clear();
}

6
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
View File

@ -207,6 +207,12 @@ std::string AudioEngineTestDemo::title() const
return "New Audio Engine Test";
}
void AudioEngineTestDemo::onBackCallback(cocos2d::Ref* sender)
{
AudioEngine::end();
TestCase::onBackCallback(sender);
}
// AudioControlTest
bool AudioControlTest::init()
{

3
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
View File

@ -41,6 +41,9 @@ public:
virtual std::string title() const override;
virtual void onExit() override;
virtual void onBackCallback(cocos2d::Ref* sender) override;
protected:
std::shared_ptr<bool> _isDestroyed;
};