]> git.sesse.net Git - vlc/commitdiff
Fix typos for WIN32 compilation of Java bindings.
authorPhilippe Morin <phmo95@videolan.org>
Tue, 12 Dec 2006 21:08:50 +0000 (21:08 +0000)
committerPhilippe Morin <phmo95@videolan.org>
Tue, 12 Dec 2006 21:08:50 +0000 (21:08 +0000)
bindings/java/src/playlist-jni.cc
bindings/java/src/video-jni.cc

index 689ded1ad811a16a428f45f7600f12da8840f132..b0305b51deeedf1ff6565ba31f7b224de0910949 100644 (file)
 /* These are a must*/\r
 #include <jni.h>\r
 #include <vlc/libvlc.h>\r
+#ifdef WIN32\r
+#include <windows.h>\r
+#undef usleep\r
+#define usleep(var) Sleep(var/1000)\r
+#else\r
 #include <unistd.h>\r
+#endif\r
 #include <stdio.h>\r
 \r
 /* JVLC internal imports, generated by gcjh */\r
index 86f2920f80a9604b21a2af8272dcec88a25d3128..15645dc5a996a4a2fcd65d4aebfcb04ed424da46 100644 (file)
@@ -183,7 +183,7 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_Video__1reparent (JNIEnv *env, job
     dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
     drawable = reinterpret_cast<int>(dsi_win->hwnd);
 
-    libvlc_video_set_parent( input, drawable, exception );
+    libvlc_video_set_parent((libvlc_instance_t *) instance, drawable, exception );
 
     CHECK_EXCEPTION_FREE ;
     
@@ -269,7 +269,7 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_Video__1paint (JNIEnv *env, jobjec
     dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
     drawable = reinterpret_cast<int>(dsi_win->hwnd);
 
-    libvlc_video_set_parent( input, drawable, exception );
+    libvlc_video_set_parent( (libvlc_instance_t *) instance, drawable, exception );
 
     CHECK_EXCEPTION_FREE ;