[Scummvm-cvs-logs] scummvm master -> 24a332bd22073257ae9ed33dc0549bfde4538f1b

dhewg dhewg at wiibrew.org
Sun Feb 27 14:16:47 CET 2011


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
72889ee24f ANDROID: Remove dead code
24a332bd22 ANDROID: Prevent AudioTrack unpause on startup


Commit: 72889ee24fc290ba9353084bbf1e1a3fa47a115c
    https://github.com/scummvm/scummvm/commit/72889ee24fc290ba9353084bbf1e1a3fa47a115c
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-27T05:15:47-08:00

Commit Message:
ANDROID: Remove dead code

Changed paths:
    backends/platform/android/android.cpp
    backends/platform/android/jni.cpp
    backends/platform/android/org/inodes/gus/scummvm/ScummVM.java



diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index f20cf84..62b8b60 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 d8203e2..69d1083 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 a6bc5fa..ae7204f 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);
 


Commit: 24a332bd22073257ae9ed33dc0549bfde4538f1b
    https://github.com/scummvm/scummvm/commit/24a332bd22073257ae9ed33dc0549bfde4538f1b
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-27T05:15:47-08:00

Commit Message:
ANDROID: Prevent AudioTrack unpause on startup

Changed paths:
    backends/platform/android/android.cpp



diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 62b8b60..57e84d0 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -189,7 +189,7 @@ void *OSystem_Android::audioThreadFunc(void *arg) {
 	tv_full.tv_nsec = msecs_full * 1000 * 1000;
 
 	bool silence;
-	uint silence_count = 0;
+	uint silence_count = 33;
 
 	while (!system->_audio_thread_exit) {
 		buf = (byte *)env->GetPrimitiveArrayCritical(bufa, 0);






More information about the Scummvm-git-logs mailing list