start to fix the sound length

tito · tito · commit d2471581dad1 · 2013-01-16T12:57:17.000+01:00
diff --git a/recipes/android/src/android_mixer.py b/recipes/android/src/android_mixer.py
@@ -129,11 +129,16 @@ def fadeout(self, time):
         self.stop()
 
     def set_volume(self, left, right=None):
-        # Not implemented.
-        return
+        sound.set_volume(self.id, left)
 
     def get_volume(self):
-        return 1.0
+        return sound.get_volume(self.id)
+
+    def get_pos(self):
+        return sound.get_pos(self.id)
+
+    def get_length(self):
+        return sound.get_length(self.id)
 
     def get_busy(self):
         return sound.busy(self.id)
@@ -214,10 +219,14 @@ def fadeout(self, time):
         self.stop()
 
     def set_volume(self, left, right=None):
-        return
+        if self._channel is None:
+            return
+        self._channel.set_volume(left)
 
     def get_volume(self):
-        return 1.0
+        if self._channel is None:
+            return
+        return self._channel.get_volume()
 
     def get_num_channels(self):
         rv = 0
@@ -229,7 +238,14 @@ def get_num_channels(self):
         return rv
 
     def get_length(self):
-        return 1.0
+        if self._channel is None:
+            return 0
+        return self._channel.get_length()
+
+    def get_pos(self):
+        if self._channel is None:
+            return -1
+        return self._channel.get_pos()
 
 music_channel = Channel(256)
 music_sound = None
diff --git a/recipes/android/src/android_sound.pyx b/recipes/android/src/android_sound.pyx
@@ -9,6 +9,8 @@ cdef extern void android_sound_unpause(int)
 cdef extern void android_sound_set_volume(int, float)
 cdef extern void android_sound_set_secondary_volume(int, float)
 cdef extern void android_sound_set_pan(int, float)
+cdef extern double android_sound_get_pos(int)
+cdef extern double android_sound_get_length(int)
 
 cdef extern int android_sound_queue_depth(int)
 
@@ -78,7 +80,7 @@ def busy(channel):
     return playing_name(channel) != None
 
 def get_pos(channel):
-    return 0
+    return android_sound_get_pos(channel)
 
 def set_volume(channel, volume):
     android_sound_set_volume(channel, volume)
@@ -96,6 +98,9 @@ def set_end_event(channel, event):
 def get_volume(channel):
     return volumes.get(channel, 1.0)
 
+def get_length(channel):
+    return android_sound_get_length(channel)
+
 def init(freq, stereo, samples, status=False):
     return
 
diff --git a/recipes/android/src/android_sound_jni.c b/recipes/android/src/android_sound_jni.c
@@ -248,3 +248,37 @@ void android_sound_unpause(int channel) {
         env, cls, mid,
         channel);
 }
+
+double android_sound_get_pos(int channel) {
+    static JNIEnv *env = NULL;
+    static jclass *cls = NULL;
+    static jmethodID mid = NULL;
+
+    if (env == NULL) {
+        env = SDL_ANDROID_GetJNIEnv();
+        aassert(env);
+        cls = (*env)->FindClass(env, "org/renpy/android/RenPySound");
+        aassert(cls);
+        mid = (*env)->GetStaticMethodID(env, cls, "get_pos", "(I)D");
+        aassert(mid);
+    }
+
+    return (*env)->CallStaticDoubleMethod(env, cls, mid, channel);
+}
+
+double android_sound_get_length(int channel) {
+    static JNIEnv *env = NULL;
+    static jclass *cls = NULL;
+    static jmethodID mid = NULL;
+
+    if (env == NULL) {
+        env = SDL_ANDROID_GetJNIEnv();
+        aassert(env);
+        cls = (*env)->FindClass(env, "org/renpy/android/RenPySound");
+        aassert(cls);
+        mid = (*env)->GetStaticMethodID(env, cls, "get_length", "(I)D");
+        aassert(mid);
+    }
+
+    return (*env)->CallStaticDoubleMethod(env, cls, mid, channel);
+}
diff --git a/src/src/org/renpy/android/RenPySound.java b/src/src/org/renpy/android/RenPySound.java
@@ -7,37 +7,39 @@
 import java.util.HashMap;
 
 public class RenPySound {
-    
+
     private static class Channel implements MediaPlayer.OnCompletionListener, MediaPlayer.OnPreparedListener {
 
         // MediaPlayers for the currently playing and queued up
         // sounds.
         MediaPlayer player[];
-        
+
         // Filenames for the currently playing and queued up sounds.
         String filename[];
 
         // Is the corresponding player prepareD?
         boolean prepared[];
-        
+
         // The volume for the left and right channel.
         double volume;
         double secondary_volume;
         double left_volume;
         double right_volume;
-        
+		double duration;
+
         Channel() {
             player = new MediaPlayer[2];
             filename = new String[2];
             prepared = new boolean[2];
-            
+
             player[0] = new MediaPlayer();
             player[1] = new MediaPlayer();
 
             volume = 1.0;
             secondary_volume = 1.0;
             left_volume = 1.0;
-            right_volume = 1.0;            
+            right_volume = 1.0;
+			duration = 0.0;
         }
 
         /**
@@ -50,7 +52,7 @@ synchronized void queue(String fn, String real_fn, long base, long length) {
 
             try {
                 FileInputStream f = new FileInputStream(real_fn);
-                
+
                 if (length >= 0) {
                     mp.setDataSource(f.getFD(), base, length);
                 } else {
@@ -59,18 +61,18 @@ synchronized void queue(String fn, String real_fn, long base, long length) {
 
                 mp.setOnCompletionListener(this);
                 mp.setOnPreparedListener(this);
-                
+
                 mp.prepareAsync();
-                
+
                 f.close();
             } catch (IOException e) {
                 Log.w("RenPySound", e);
                 return;
             }
-            
 
-            filename[1] = fn;           
-            
+
+            filename[1] = fn;
+
         }
 
         /**
@@ -80,26 +82,26 @@ synchronized void play() {
             MediaPlayer tmp;
 
             player[0].reset();
-            
+
             tmp = player[0];
             player[0] = player[1];
             player[1] = tmp;
-            
+
             filename[0] = filename[1];
             filename[1] = null;
 
             prepared[0] = prepared[1];
             prepared[1] = false;
-            
+
             if (filename[0] != null) {
                 updateVolume();
 
-                if (prepared[0]) {                
+                if (prepared[0]) {
                     player[0].start();
                 }
             }
         }
-        
+
         /**
          * Stop playback on this channel.
          */
@@ -161,7 +163,7 @@ synchronized void set_pan(float pan) {
                 left_volume = 1.0 - pan;
                 right_volume = 1.0;
             }
-            
+
             updateVolume();
          }
 
@@ -187,7 +189,7 @@ synchronized public void onPrepared(MediaPlayer mp) {
                 prepared[1] = true;
             }
         }
-                
+
         /**
          * Called on completion.
          */
@@ -197,7 +199,21 @@ synchronized public void onCompletion(MediaPlayer mp) {
             }
         }
 
-        
+		synchronized public double get_pos() {
+            if (filename[0] == null)
+				return 0;
+			return player[0].getCurrentPosition();
+		}
+
+		synchronized public double get_length() {
+			if (duration != 0)
+				return duration;
+            if (filename[0] == null)
+				return 0;
+			duration = player[0].getDuration() / 1000.;
+			return duration;
+		}
+
     }
 
     // A map from channel number to channel object.
@@ -218,13 +234,13 @@ static Channel getChannel(int num) {
         return rv;
     }
 
-    static void queue(int channel, String filename, String real_fn, long base, long length) {        
+    static void queue(int channel, String filename, String real_fn, long base, long length) {
         Channel c = getChannel(channel);
         c.queue(filename, real_fn, base, length);
         if (c.filename[0] == null) {
           c.play();
         }
-        
+
     }
 
     static void play(int channel,
@@ -291,8 +307,18 @@ static void unpause(int channel) {
         c.unpause();
     }
 
+	static double get_pos(int channel) {
+		Channel c = getChannel(channel);
+		return c.get_pos();
+	}
+
+	static double get_length(int channel) {
+		Channel c = getChannel(channel);
+		return c.get_length();
+	}
+
     static {
         new MediaPlayer();
     }
-    
-}
+
+}
