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

Fix gcc warnings and type mismatch issues in AudioEngine for Linux

This commit is contained in:
mogemimi 2016-05-20 01:39:40 +09:00
parent 3db84916d1
commit 0f3b36e834
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cocos/audio/linux/AudioEngine-linux.cpp
View File

@ -2,6 +2,7 @@
* @author cesarpachon
*/
#include <cstring>
#include <cstdint>
#include "audio/linux/AudioEngine-linux.h"
#include "base/CCDirector.h"
@ -139,7 +140,7 @@ bool AudioEngineImpl::resume(int audioID)
channel->setMode(mapChannelInfo[audioID].loop ? FMOD_LOOP_NORMAL : FMOD_LOOP_OFF);
channel->setLoopCount(mapChannelInfo[audioID].loop ? -1 : 0);
channel->setVolume(mapChannelInfo[audioID].volume);
channel->setUserData((void *)mapChannelInfo[audioID].id);
channel->setUserData(reinterpret_cast<void *>(static_cast<std::intptr_t>(mapChannelInfo[audioID].id)));
mapChannelInfo[audioID].channel = channel;
}
@ -234,11 +235,11 @@ void AudioEngineImpl::setFinishCallback(int audioID, const std::function<void (i
void AudioEngineImpl::onSoundFinished(FMOD::Channel * channel)
{
size_t id;
int id = 0;
try {
void * data;
channel->getUserData(&data);
id = (size_t) data;
id = static_cast<int>(reinterpret_cast<std::intptr_t>(data));
if (mapChannelInfo[id].callback) {
mapChannelInfo[id].callback(id, mapChannelInfo[id].path);
}
@ -289,15 +290,15 @@ int AudioEngineImpl::preload(const std::string& filePath, std::function<void(boo
mapSound[fullPath] = sound;
}
int id = mapChannelInfo.size() + 1;
int id = static_cast<int>(mapChannelInfo.size()) + 1;
auto& chanelInfo = mapChannelInfo[id];
chanelInfo.sound = sound;
chanelInfo.id = (size_t) id;
chanelInfo.id = id;
chanelInfo.channel = nullptr;
chanelInfo.callback = nullptr;
chanelInfo.path = filePath;
//we are going to use UserData to store pointer to Channel when playing
chanelInfo.sound->setUserData((void *)id);
chanelInfo.sound->setUserData(reinterpret_cast<void *>(static_cast<std::intptr_t>(id)));
if (callback) {
callback(true);
@ -319,9 +320,8 @@ FMOD::Sound * AudioEngineImpl::findSound(const std::string &path)
FMOD::Channel * AudioEngineImpl::getChannel(FMOD::Sound *sound)
{
size_t id;
void * data;
sound->getUserData(&data);
id = (size_t) data;
int id = static_cast<int>(reinterpret_cast<std::intptr_t>(data));
return mapChannelInfo[id].channel;
}

2
cocos/audio/linux/AudioEngine-linux.h
View File

@ -83,7 +83,7 @@ private:
FMOD::Channel * getChannel(FMOD::Sound *);
struct ChannelInfo{
size_t id;
int id;
std::string path;
FMOD::Sound * sound;
FMOD::Channel * channel;