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

getFileData() 

* The async case is NYI
 * include stdlib for abort() when forAsync is true
This commit is contained in:
folecr 2013-02-26 16:32:00 -08:00
parent 7090d8daad
commit 21405531aa
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cocos2dx/platform/android/CCFileUtilsAndroid.cpp
View File

@ -28,6 +28,8 @@ THE SOFTWARE.
#include "android/asset_manager.h"
#include "android/asset_manager_jni.h"
#include <stdlib.h>
#define LOG_TAG "CCFileUtilsAndroid.cpp"
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
@ -167,11 +169,44 @@ unsigned char* FileUtilsAndroid::doGetFileData(const char* pszFileName, const ch
{
if (forAsync)
{
pData = s_pZipFile->getFileData(fullPath.c_str(), pSize, s_pZipFile->_dataThread);
// pData = s_pZipFile->getFileData(fullPath.c_str(), pSize, s_pZipFile->_dataThread);
abort();
}
else
{
pData = s_pZipFile->getFileData(fullPath.c_str(), pSize);
string fullPath = fullPathForFilename(pszFileName);
const char* relativepath = fullPath.c_str();
// "assets/" is at the beginning of the path and we don't want it
relativepath += strlen("assets/");
if (NULL == s_assetmanager) {
LOGD("... s_assetmanager is NULL");
return NULL;
}
// read asset data
AAsset* asset =
AAssetManager_open(s_assetmanager,
relativepath,
AASSET_MODE_UNKNOWN);
if (NULL == asset) {
LOGD("asset : is NULL");
return NULL;
}
off_t size = AAsset_getLength(asset);
pData = new unsigned char[size];
int bytesread = AAsset_read(asset, (void*)pData, size);
if (pSize)
{
*pSize = bytesread;
}
AAsset_close(asset);
}
}
else