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

Merge pull request #6 from simdsoft/GLenum_to_ALenum 

fix typo, GLenum to ALenum
This commit is contained in:
HALX99 2019-11-25 20:09:33 -08:00 committed by GitHub
parent 47c02393ad bf807f8969
commit 4bd8c03dba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cocos/audio/AudioEngineImpl.cpp
View File

@ -233,7 +233,7 @@ void AudioEngineImpl::setVolume(AUDIO_ID audioID,float volume)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ALOGE("%s: audio id = %d, error = %x", __FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __FUNCTION__,audioID,error);
} }
} }
} }
@ -254,7 +254,7 @@ void AudioEngineImpl::setLoop(AUDIO_ID audioID, bool loop)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ALOGE("%s: audio id = %d, error = %x", __FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __FUNCTION__,audioID,error);
} }
} }
} }
@ -271,7 +271,7 @@ bool AudioEngineImpl::pause(AUDIO_ID audioID)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ret = false; ret = false;
ALOGE("%s: audio id = %d, error = %x\n", __FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x\n", __FUNCTION__,audioID,error);
} }
return ret; return ret;
@ -285,7 +285,7 @@ bool AudioEngineImpl::resume(AUDIO_ID audioID)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ret = false; ret = false;
ALOGE("%s: audio id = %d, error = %x\n", __FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x\n", __FUNCTION__,audioID,error);
} }
return ret; return ret;
@ -342,7 +342,7 @@ float AudioEngineImpl::getCurrentTime(AUDIO_ID audioID)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ALOGE("%s, audio id:%d,error code:%x", __FUNCTION__,audioID,error); ALOGE("%s, audio id:" AUDIO_ID_PRID ",error code:%x", __FUNCTION__,audioID,error);
} }
} }
} }
@ -367,7 +367,7 @@ bool AudioEngineImpl::setCurrentTime(AUDIO_ID audioID, float time)
else { else {
if (player->_audioCache->_framesRead != player->_audioCache->_totalFrames && if (player->_audioCache->_framesRead != player->_audioCache->_totalFrames &&
(time * player->_audioCache->_sampleRate) > player->_audioCache->_framesRead) { (time * player->_audioCache->_sampleRate) > player->_audioCache->_framesRead) {
ALOGE("%s: audio id = %d", __FUNCTION__,audioID); ALOGE("%s: audio id = " AUDIO_ID_PRID, __FUNCTION__,audioID);
break; break;
} }
@ -375,7 +375,7 @@ bool AudioEngineImpl::setCurrentTime(AUDIO_ID audioID, float time)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ALOGE("%s: audio id = %d, error = %x", __FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __FUNCTION__,audioID,error);
} }
ret = true; ret = true;
} }

16
cocos/audio/apple/AudioEngineImpl.mm
View File

@ -503,7 +503,7 @@ void AudioEngineImpl::setVolume(AUDIO_ID audioID,float volume)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ALOGE("%s: audio id = %zu, error = %x", __PRETTY_FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __PRETTY_FUNCTION__,audioID,error);
} }
} }
} }
@ -531,7 +531,7 @@ void AudioEngineImpl::setLoop(AUDIO_ID audioID, bool loop)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ALOGE("%s: audio id = %zu, error = %x", __PRETTY_FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __PRETTY_FUNCTION__,audioID,error);
} }
} }
} }
@ -557,7 +557,7 @@ bool AudioEngineImpl::pause(AUDIO_ID audioID)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ret = false; ret = false;
ALOGE("%s: audio id = %zu, error = %x", __PRETTY_FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __PRETTY_FUNCTION__,audioID,error);
} }
return ret; return ret;
@ -579,7 +579,7 @@ bool AudioEngineImpl::resume(AUDIO_ID audioID)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ret = false; ret = false;
ALOGE("%s: audio id = %zu, error = %x", __PRETTY_FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __PRETTY_FUNCTION__,audioID,error);
} }
return ret; return ret;
@ -634,7 +634,7 @@ float AudioEngineImpl::getCurrentTime(AUDIO_ID audioID)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ALOGE("%s, audio id:%zu,error code:%x", __PRETTY_FUNCTION__,audioID,error); ALOGE("%s, audio id:" AUDIO_ID_PRID ",error code:%x", __PRETTY_FUNCTION__,audioID,error);
} }
} }
} }
@ -659,7 +659,7 @@ bool AudioEngineImpl::setCurrentTime(AUDIO_ID audioID, float time)
else { else {
if (player->_audioCache->_framesRead != player->_audioCache->_totalFrames && if (player->_audioCache->_framesRead != player->_audioCache->_totalFrames &&
(time * player->_audioCache->_sampleRate) > player->_audioCache->_framesRead) { (time * player->_audioCache->_sampleRate) > player->_audioCache->_framesRead) {
ALOGE("%s: audio id = %zu", __PRETTY_FUNCTION__,audioID); ALOGE("%s: audio id = " AUDIO_ID_PRID, __PRETTY_FUNCTION__,audioID);
break; break;
} }
@ -667,7 +667,7 @@ bool AudioEngineImpl::setCurrentTime(AUDIO_ID audioID, float time)
auto error = alGetError(); auto error = alGetError();
if (error != AL_NO_ERROR) { if (error != AL_NO_ERROR) {
ALOGE("%s: audio id = %zu, error = %x", __PRETTY_FUNCTION__,audioID,error); ALOGE("%s: audio id = " AUDIO_ID_PRID ", error = %x", __PRETTY_FUNCTION__,audioID,error);
} }
ret = true; ret = true;
} }
@ -716,7 +716,7 @@ void AudioEngineImpl::update(float dt)
std::string filePath; std::string filePath;
if (player->_finishCallbak) { if (player->_finishCallbak) {
auto& audioInfo = AudioEngine::_audioIDInfoMap[audioID]; auto& audioInfo = AudioEngine::_audioIDInfoMap[audioID];
filePath = *audioInfo.filePath; filePath = audioInfo.filePath;
} }
AudioEngine::remove(audioID); AudioEngine::remove(audioID);

5
cocos/audio/include/AudioEngine.h
View File

@ -27,6 +27,7 @@
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#include "platform/CCPlatformMacros.h" #include "platform/CCPlatformMacros.h"
#include "audio/include/AudioMacros.h"
#include "audio/include/Export.h" #include "audio/include/Export.h"
#include <functional> #include <functional>
#include <list> #include <list>
@ -37,10 +38,6 @@
#undef ERROR #undef ERROR
#endif // ERROR #endif // ERROR
#if !defined(AUDIO_ID)
#define AUDIO_ID int
#endif
/** /**
* @addtogroup audio * @addtogroup audio
* @{ * @{

5
cocos/audio/include/AudioMacros.h
View File

@ -62,7 +62,7 @@
#if defined(COCOS2D_DEBUG) && COCOS2D_DEBUG > 0 #if defined(COCOS2D_DEBUG) && COCOS2D_DEBUG > 0
#define CHECK_AL_ERROR_DEBUG() \ #define CHECK_AL_ERROR_DEBUG() \
do { \ do { \
GLenum __error = alGetError(); \ ALenum __error = alGetError(); \
if (__error) { \ if (__error) { \
ALOGE("OpenAL error 0x%04X in %s %s %d\n", __error, __FILE__, __FUNCTION__, __LINE__); \ ALOGE("OpenAL error 0x%04X in %s %s %d\n", __error, __FILE__, __FUNCTION__, __LINE__); \
} \ } \
@ -82,6 +82,5 @@ do { \
break; \ break; \
} }
#if !defined(AUDIO_ID)
#define AUDIO_ID int #define AUDIO_ID int
#endif #define AUDIO_ID_PRID "%d"