fix audio busy function + get_pos that give invalid number when the player is closed.

tito · tito · commit 62048fef1635 · 2015-03-12T16:17:57.000+01:00
diff --git a/recipes/android/src/android/_android_sound.pyx b/recipes/android/src/android/_android_sound.pyx
@@ -56,10 +56,9 @@ def playing_name(channel):
     android_sound_playing_name(channel, buf, 1024)
 
     rv = buf
-    if not rv:
+    if not len(rv):
         return None
-    else:
-        return rv
+    return rv
 
 def pause(channel):
     android_sound_pause(channel)
diff --git a/src/src/org/renpy/android/RenPySound.java b/src/src/org/renpy/android/RenPySound.java
@@ -188,7 +188,10 @@ synchronized void unpause() {
         }
 
         synchronized int get_pos(){
-            return player[0].getCurrentPosition();
+			if (prepared[0]) {
+				return player[0].getCurrentPosition();
+			}
+			return 0;
         }
 
         synchronized int get_length(){

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,10 @@ synchronized void unpause() {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`synchronized int get_pos(){`
`191`		`- return player[0].getCurrentPosition();`
	`191`	`+ if (prepared[0]) {`
	`192`	`+ return player[0].getCurrentPosition();`
	`193`	`+ }`
	`194`	`+ return 0;`
`192`	`195`	`}`
`193`	`196`
`194`	`197`	`synchronized int get_length(){`