android/Bridge: add shutdown()

Break the mainloop and terminate run call.

android/Bridge: add shutdown()
74fcbb38 · Thomas Guillem · Max Kellermann · 9836b1dd · 74fcbb38 · 74fcbb38
Commit 74fcbb38 authored Sep 15, 2014 by Thomas Guillem Committed by Max Kellermann Sep 16, 2014
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

Bridge.java android/src/Bridge.java +1 -0

Main.cxx src/Main.cxx +9 -0

No files found.
--- a/android/src/Bridge.java
+++ b/android/src/Bridge.java
@@ -26,4 +26,5 @@ import android.content.Context;
 */
 public class Bridge {
 	public static native void run(Context context);
+	public static native void shutdown();
 }
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -696,6 +696,7 @@ int mpd_main(int argc, char *argv[])
 #endif
 	delete instance->event_loop;
 	delete instance;
+	instance = nullptr;
 #ifndef ANDROID
 	daemonize_finish();
 #endif
@@ -727,4 +728,12 @@ Java_org_musicpd_Bridge_run(JNIEnv *env, jclass, jobject _context)
 	Environment::Deinitialise(env);
 }

+gcc_visibility_default
+JNIEXPORT void JNICALL
+Java_org_musicpd_Bridge_shutdown(JNIEnv *, jclass)
+{
+	if (instance != nullptr)
+		instance->event_loop->Break();
+}
+
 #endif