Skip to content

Commit

Permalink
fix: remove reference to godot activity in FmodSingleton.java (#119)
Browse files Browse the repository at this point in the history
* fix: remove reference to godot activity in FmodSingleton.java

* fix: Change ANDROID_NDK_ROOT in CI to 21.4.7075529
  • Loading branch information
piiertho authored and bitbrain committed Jul 31, 2022
1 parent 4638171 commit 7c9857e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/all_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ jobs:

- name: Compilation
env:
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk-bundle
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529
run: |
cp -r godot-cpp ../godot-cpp
cd ../godot-cpp
Expand Down
7 changes: 0 additions & 7 deletions demo/android/fmod/src/FmodSingleton.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public class FmodSingleton extends Godot.SingletonBase {

protected Activity appActivity;
protected Context appContext;
private Godot activity = null;

static
{
Expand All @@ -29,13 +28,7 @@ public FmodSingleton(Activity p_activity) {
this.appContext = appActivity.getApplicationContext();
// You might want to try initializing your singleton here, but android
// threads are weird and this runs in another thread, so to interact with Godot you usually have to do.
this.activity = (Godot)p_activity;
FMOD.init(p_activity);
this.activity.runOnUiThread(new Runnable() {
public void run() {
System.out.println("Fmod jar init");
}
});
}

// Forwarded callbacks you can reimplement, as SDKs often need them.
Expand Down

0 comments on commit 7c9857e

Please sign in to comment.