Update Android Asset loader to new callback API

This commit is contained in:
derselbst 2020-07-12 13:03:30 +02:00
parent 62b715483f
commit 277eda6bc6
2 changed files with 6 additions and 6 deletions

View file

@ -83,7 +83,7 @@ int asset_close(void *handle)
return 0; return 0;
} }
long asset_tell(void *handle) fluid_long_long_t asset_tell(void *handle)
{ {
AAsset *asset; AAsset *asset;
@ -91,7 +91,7 @@ long asset_tell(void *handle)
return AAsset_getLength(asset) - AAsset_getRemainingLength(asset); return AAsset_getLength(asset) - AAsset_getRemainingLength(asset);
} }
int asset_seek(void *handle, long offset, int origin) int asset_seek(void *handle, fluid_long_long_t offset, int origin)
{ {
AAsset *asset; AAsset *asset;
@ -99,7 +99,7 @@ int asset_seek(void *handle, long offset, int origin)
return AAsset_seek (asset, (off_t) offset, origin); return AAsset_seek (asset, (off_t) offset, origin);
} }
int asset_read(void *buf, int count, void *handle) int asset_read(void *buf, fluid_long_long_t count, void *handle)
{ {
AAsset *asset; AAsset *asset;

View file

@ -34,9 +34,9 @@ void Java_fluidsynth_androidextensions_NativeHandler_setAssetManagerContext(JNIE
void *asset_open(const char *path); void *asset_open(const char *path);
int asset_close(void *handle); int asset_close(void *handle);
long asset_tell(void *handle); fluid_long_long_t asset_tell(void *handle);
int asset_seek(void *handle, long offset, int origin); int asset_seek(void *handle, fluid_long_long_t offset, int origin);
int asset_read(void *buf, int count, void *handle); int asset_read(void *buf, fluid_long_long_t count, void *handle);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */