[Android] libvlc: native expendMedia doesn't need position

Thomas Guillem git at videolan.org
Wed Dec 31 18:03:49 CET 2014


vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Dec 31 14:27:03 2014 +0100| [2ea98b8def7ec375ec9b1735b2299adedb23bf63] | committer: Thomas Guillem

libvlc: native expendMedia doesn't need position

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=2ea98b8def7ec375ec9b1735b2299adedb23bf63
---

 libvlc/jni/libvlcjni-medialist.c              |    2 +-
 libvlc/src/org/videolan/libvlc/LibVLC.java    |    2 +-
 libvlc/src/org/videolan/libvlc/MediaList.java |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libvlc/jni/libvlcjni-medialist.c b/libvlc/jni/libvlcjni-medialist.c
index a9a5e98..7319439 100644
--- a/libvlc/jni/libvlcjni-medialist.c
+++ b/libvlc/jni/libvlcjni-medialist.c
@@ -75,7 +75,7 @@ static int expand_media_internal(JNIEnv *env, libvlc_instance_t* p_instance, job
     }
 }
 
-jint Java_org_videolan_libvlc_LibVLC_expandMedia(JNIEnv *env, jobject thiz, jint position, jobject children) {
+jint Java_org_videolan_libvlc_LibVLC_expandMedia(JNIEnv *env, jobject thiz, jobject children) {
     return (jint)expand_media_internal(env,
         getLibVlcInstance(env, thiz),
         children,
diff --git a/libvlc/src/org/videolan/libvlc/LibVLC.java b/libvlc/src/org/videolan/libvlc/LibVLC.java
index 1a58290..d60c479 100644
--- a/libvlc/src/org/videolan/libvlc/LibVLC.java
+++ b/libvlc/src/org/videolan/libvlc/LibVLC.java
@@ -849,5 +849,5 @@ public class LibVLC {
 
     /* MediaList */
     protected native void loadPlaylist(String mrl, ArrayList<String> items);
-    protected native int expandMedia(int position, ArrayList<String> children);
+    protected native int expandMedia(ArrayList<String> children);
 }
diff --git a/libvlc/src/org/videolan/libvlc/MediaList.java b/libvlc/src/org/videolan/libvlc/MediaList.java
index 2daec2f..408a609 100644
--- a/libvlc/src/org/videolan/libvlc/MediaList.java
+++ b/libvlc/src/org/videolan/libvlc/MediaList.java
@@ -71,7 +71,7 @@ public class MediaList {
      */
     public int expandMedia(int position) {
         ArrayList<String> children = new ArrayList<String>();
-        int ret = mLibVLC.expandMedia(position, children);
+        int ret = mLibVLC.expandMedia(children);
         if(ret == 0) {
             mEventHandler.callback(EventHandler.CustomMediaListExpanding, new Bundle());
             this.remove(position);



More information about the Android mailing list