Added a missing vlc_join() in vout.

[vlc] / src / control / video.c

diff --git a/src/control/video.c b/src/control/video.c
index db90825c92744bdd3e4bbbbe25e959f900f6146b..ebdafa1ea772142f0d7c466d19d4cd40969830d3 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -38,7 +38,6 @@
 #include <vlc_vout.h>
 
 #include "media_player_internal.h"
-#include <vlc_osd.h>
 #include <assert.h>
 
 /*
@@ -158,6 +157,7 @@ libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, unsigned num,
 int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num,
                            unsigned *restrict px, unsigned *restrict py )
 {
+#if 0
     vout_thread_t *p_vout = GetVout (p_mi, num);
     if (p_vout == NULL)
         return -1;
@@ -166,6 +166,9 @@ int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num,
     *py = p_vout->i_window_width;
     vlc_object_release (p_vout);
     return 0;
+#else
+    return -1;
+#endif
 }
 
 int libvlc_video_get_height( libvlc_media_player_t *p_mi )
@@ -187,14 +190,13 @@ int libvlc_video_get_width( libvlc_media_player_t *p_mi )
 }
 
 int libvlc_video_get_cursor( libvlc_media_player_t *mp, unsigned num,
-                             int *px, int *py )
+                             int *restrict px, int *restrict py )
 {
     vout_thread_t *p_vout = GetVout (mp, num);
     if (p_vout == NULL)
         return -1;
 
-    *px = var_GetInteger (p_vout, "mouse-x");
-    *py = var_GetInteger (p_vout, "mouse-y");
+    var_GetCoords (p_vout, "mouse-moved", px, py);
     vlc_object_release (p_vout);
     return 0;
 }