From 72889ee24fc290ba9353084bbf1e1a3fa47a115c Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sun, 27 Feb 2011 11:23:11 +0100
Subject: ANDROID: Remove dead code

---
 backends/platform/android/android.cpp              |  3 +-
 backends/platform/android/jni.cpp                  | 39 ----------------------
 .../android/org/inodes/gus/scummvm/ScummVM.java    |  3 --
 3 files changed, 2 insertions(+), 43 deletions(-)

(limited to 'backends/platform/android')

diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index f20cf848d4..62b8b60495 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -285,7 +285,8 @@ void OSystem_Android::initBackend() {
 	_main_thread = pthread_self();
 
 	ConfMan.setInt("autosave_period", 0);
-	ConfMan.setInt("FM_medium_quality", true);
+	ConfMan.setBool("FM_high_quality", false);
+	ConfMan.setBool("FM_medium_quality", true);
 
 	// must happen before creating TimerManager to avoid race in
 	// creating EventManager
diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index d8203e2a57..69d1083320 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -79,10 +79,6 @@ const JNINativeMethod JNI::_natives[] = {
 	 	(void *)JNI::main },
 	{ "pushEvent", "(Lorg/inodes/gus/scummvm/Event;)V",
 		(void *)JNI::pushEvent },
-	{ "setConfMan", "(Ljava/lang/String;I)V",
-		(void *)JNI::setConfManInt },
-	{ "setConfMan", "(Ljava/lang/String;Ljava/lang/String;)V",
-		(void *)JNI::setConfManString },
 	{ "enableZoning", "(Z)V",
 		(void *)JNI::enableZoning },
 	{ "setSurfaceSize", "(II)V",
@@ -563,41 +559,6 @@ void JNI::pushEvent(JNIEnv *env, jobject self, jobject java_event) {
 	_system->pushEvent(event);
 }
 
-void JNI::setConfManInt(JNIEnv *env, jclass cls, jstring key_obj, jint value) {
-	ENTER("%p, %d", key_obj, (int)value);
-
-	const char *key = env->GetStringUTFChars(key_obj, 0);
-
-	if (key == 0)
-		return;
-
-	ConfMan.setInt(key, value);
-
-	env->ReleaseStringUTFChars(key_obj, key);
-}
-
-void JNI::setConfManString(JNIEnv *env, jclass cls, jstring key_obj,
-							jstring value_obj) {
-	ENTER("%p, %p", key_obj, value_obj);
-
-	const char *key = env->GetStringUTFChars(key_obj, 0);
-
-	if (key == 0)
-		return;
-
-	const char *value = env->GetStringUTFChars(value_obj, 0);
-
-	if (value == 0) {
-		env->ReleaseStringUTFChars(key_obj, key);
-		return;
-	}
-
-	ConfMan.set(key, value);
-
-	env->ReleaseStringUTFChars(value_obj, value);
-	env->ReleaseStringUTFChars(key_obj, key);
-}
-
 void JNI::enableZoning(JNIEnv *env, jobject self, jboolean enable) {
 	assert(_system);
 
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
index a6bc5fafc0..ae7204f752 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
@@ -359,9 +359,6 @@ public class ScummVM implements SurfaceHolder.Callback {
 	}
 
 	// Set scummvm config options
-	final public native static void loadConfigFile(String path);
-	final public native static void setConfMan(String key, int value);
-	final public native static void setConfMan(String key, String value);
 	final public native void enableZoning(boolean enable);
 	final public native void setSurfaceSize(int width, int height);
 
-- 
cgit v1.2.3