--disable-libtool not needed anymore to build java bindings

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 2a91a9c076c6f999656f6d15cf729b8d12d80d9e..1844cecdf259a4100b1add4e3d0499b3d72d9ab0 100644 (file)
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -47,13 +47,13 @@ JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32
 LIBJINCLUDES = -L${JAVA_HOME}/lib -ljawt
 JCH = javah
 JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
-JAVALDFLAGS = -mno-cygwin -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic` -Wl,--kill-at
+JAVALDFLAGS = -mno-cygwin -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic external` -Wl,--kill-at
 else
 JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 LIBJINCLUDES = -L$(JAVA_HOME)/jre/lib/$(PROCESSOR_FAMILY) -ljawt
 JCH = gcjh -jni
 JAVACXXFLAGS = `top_builddir=../.. ../../vlc-config --cflags pic` -I../../ -I ../../include $(JINCLUDES)
-JAVALDFLAGS = -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic`
+JAVALDFLAGS = -L../../src -lvlc `top_builddir=../.. ../../vlc-config --libs builtin vlc pic external`
 endif
 
 export JINCLUDES

diff --git a/bindings/java/src/playlist-jni.cc b/bindings/java/src/playlist-jni.cc
index 041fe4e18231bbd4bdc36b561c0e94faf87b614a..689ded1ad811a16a428f45f7600f12da8840f132 100644 (file)
--- a/bindings/java/src/playlist-jni.cc
+++ b/bindings/java/src/playlist-jni.cc
@@ -95,6 +95,13 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_Playlist__1play (JNIEnv *env, jobj
 \r
     libvlc_playlist_play( ( libvlc_instance_t * ) instance, id, i_options, ( char **  ) ppsz_options, exception );\r
 \r
+    CHECK_EXCEPTION;\r
+    \r
+    while (! libvlc_playlist_isplaying( (libvlc_instance_t*) instance, exception ) )\r
+    {\r
+        usleep(100);\r
+    }\r
+\r
     CHECK_EXCEPTION_FREE;\r
 }\r
 \r