diff options
| author | dhewg | 2011-02-20 20:46:17 +0100 |
|---|---|---|
| committer | dhewg | 2011-02-24 23:18:32 +0100 |
| commit | c4706733d45de09803b7cd40c3536a4e04b4f767 (patch) | |
| tree | 0e62dd214b360ab0a8b85d032316d079a82b3600 /backends/platform/android/android.h | |
| parent | 4af28f96ab4075cb5e512d4050ac085df73a029a (diff) | |
| download | scummvm-rg350-c4706733d45de09803b7cd40c3536a4e04b4f767.tar.gz scummvm-rg350-c4706733d45de09803b7cd40c3536a4e04b4f767.tar.bz2 scummvm-rg350-c4706733d45de09803b7cd40c3536a4e04b4f767.zip | |
ANDROID: Move the global back reference to jni.cpp
Diffstat (limited to 'backends/platform/android/android.h')
| -rw-r--r-- | backends/platform/android/android.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index b31c0fd385..da487c5ceb 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -78,6 +78,9 @@ extern void checkGlError(const char *expr, const char *file, int line); #define GLCALL(x) do { (x); } while (false) #endif +// back pointer to (java) peer instance +extern jobject back_ptr; + extern JNIEnv *JNU_GetEnv(); extern void JNU_AttachThread(); extern void JNU_DetachThread(); @@ -94,9 +97,6 @@ protected: class OSystem_Android : public BaseBackend, public PaletteManager { private: - // back pointer to (java) peer instance - jobject _back_ptr; - jmethodID MID_displayMessageOnOSD; jmethodID MID_setWindowCaption; jmethodID MID_initBackend; @@ -155,7 +155,7 @@ private: public: OSystem_Android(jobject am); virtual ~OSystem_Android(); - bool initJavaHooks(JNIEnv *env, jobject self); + bool initJavaHooks(JNIEnv *env); virtual void initBackend(); void addPluginDirectories(Common::FSList &dirs) const; |