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

Added initialisation checks in pcm audio service (#18934)

This commit is contained in:
Umair Javed 2018-07-13 13:24:36 +05:00 committed by leda
parent 275c37e430
commit ec1fc92e37
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cocos/audio/android/PcmAudioService.cpp
View File

@ -47,7 +47,7 @@ public:
PcmAudioService::PcmAudioService(SLEngineItf engineItf, SLObjectItf outputMixObject) PcmAudioService::PcmAudioService(SLEngineItf engineItf, SLObjectItf outputMixObject)
: _engineItf(engineItf), _outputMixObj(outputMixObject), _playObj(nullptr), : _engineItf(engineItf), _outputMixObj(outputMixObject), _playObj(nullptr),
_playItf(nullptr), _volumeItf(nullptr), _bufferQueueItf(nullptr), _numChannels(-1), _playItf(nullptr), _volumeItf(nullptr), _bufferQueueItf(nullptr), _numChannels(-1),
_sampleRate(-1), _bufferSizeInBytes(0), _controller(nullptr) _sampleRate(-1), _bufferSizeInBytes(0), _controller(nullptr), _isInitialised(false)
{ {
} }
@ -175,19 +175,26 @@ bool PcmAudioService::init(AudioMixerController* controller, int numChannels, in
r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PLAYING); r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PLAYING);
SL_RETURN_VAL_IF_FAILED(r, false, "SetPlayState failed"); SL_RETURN_VAL_IF_FAILED(r, false, "SetPlayState failed");
_isInitialised = true;
return true; return true;
} }
void PcmAudioService::pause() void PcmAudioService::pause()
{ {
SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PAUSED); if (_isInitialised)
SL_RETURN_IF_FAILED(r, "PcmAudioService::pause failed"); {
SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PAUSED);
SL_RETURN_IF_FAILED(r, "PcmAudioService::pause failed");
}
} }
void PcmAudioService::resume() void PcmAudioService::resume()
{ {
SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PLAYING); if (_isInitialised)
SL_RETURN_IF_FAILED(r, "PcmAudioService::resume failed"); {
SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PLAYING);
SL_RETURN_IF_FAILED(r, "PcmAudioService::resume failed");
}
} }
}} // namespace cocos2d { namespace experimental { }} // namespace cocos2d { namespace experimental {

1
cocos/audio/android/PcmAudioService.h
View File

@ -71,6 +71,7 @@ private:
int _numChannels; int _numChannels;
int _sampleRate; int _sampleRate;
int _bufferSizeInBytes; int _bufferSizeInBytes;
bool _isInitialised;
AudioMixerController* _controller; AudioMixerController* _controller;