Skip to content

Android fmod 48khz #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
GameParrot wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Android fmod 48khz #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92ff468
Android fmod 48khz
GameParrot Apr 28, 2023
400be99
Merge branch 'minecraft-linux:master' into android-fmod-samplerate-patch
GameParrot Jul 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/mcpelauncher/minecraft_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ class MinecraftUtils {
private:
static void setupApi();

static bool nativeFmodLoaded;

struct HookEntry {
void* value;
void* user;
Expand Down
16 changes: 15 additions & 1 deletion src/minecraft_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <pthread.h>
#endif

bool MinecraftUtils::nativeFmodLoaded = false;
void MinecraftUtils::workaroundLocaleBug() {
setenv("LC_ALL", "C", 1); // HACK: Force set locale to one recognized by MCPE so that the outdated C++ standard library MCPE uses doesn't fail to find one
}
Expand Down Expand Up @@ -64,6 +65,7 @@ void* fmodLib = HybrisUtils::loadLibraryOS("libfmod.so", PathHelper::findDataFil
), fmod_symbols);
if (fmodLib == nullptr)
throw std::runtime_error("Failed to load fmod");
nativeFmodLoaded = true;
return fmodLib;
}

Expand Down Expand Up @@ -193,7 +195,19 @@ void* MinecraftUtils::loadMinecraftLib(void *showMousePointerCallback, void *hid
if (fullscreenCallback) {
hooks.emplace_back(mcpelauncher_hook_t{ "_ZN11AppPlatform17setFullscreenModeE14FullscreenMode", fullscreenCallback });
}

if (!nativeFmodLoaded) {
hooks.emplace_back(mcpelauncher_hook_t{ "_ZN4FMOD6System4initEijPv", (void*) + [](void* t, int maxchannels, int flags, void *extradriverdata) -> int {
void* handle = linker::dlopen("libfmod.so", 0);
typedef int (*fmod)(void* t, int maxchannels, int flags, void *extradriverdata);
typedef int (*fmodsff)(void* t, int maxchannels, int flags, int extradriverdata);
fmod fmodinit;
fmodsff fmodsf;
*(void**)(&fmodinit) = linker::dlsym(handle, "_ZN4FMOD6System4initEijPv");
*(void**)(&fmodsf) = linker::dlsym(handle, "_ZN4FMOD6System17setSoftwareFormatEi16FMOD_SPEAKERMODEi");
fmodsf(t, 48000, 0, 2);
return fmodinit(t, maxchannels, flags, extradriverdata);
}});
}
hooks.emplace_back(mcpelauncher_hook_t{ nullptr, nullptr });
extinfo.flags = ANDROID_DLEXT_MCPELAUNCHER_HOOKS;
extinfo.mcpelauncher_hooks = hooks.data();
Expand Down