thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: Remove dead code

Browse source
This commit is contained in:
dhewg 2011-02-27 11:23:11 +01:00
parent 02e51f9de5
commit 72889ee24f
3 changed files with 2 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backends/platform/android/android.cpp
View file

@ -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

39
backends/platform/android/jni.cpp
View file

@ -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);

3
backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
View file

@ -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);