[vlc-commits] vgl: make sure the callbacks prototype match the one used to set them

Steve Lhomme git at videolan.org
Tue Jan 29 10:25:43 CET 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jan 29 10:09:32 2019 +0100| [ebc8873fe3d7f2a159bc237a7c5a3bd1a1cdff14] | committer: Steve Lhomme

vgl: make sure the callbacks prototype match the one used to set them

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ebc8873fe3d7f2a159bc237a7c5a3bd1a1cdff14
---

 modules/video_output/vgl.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/vgl.c b/modules/video_output/vgl.c
index 3617a096a0..67de0e5c3b 100644
--- a/modules/video_output/vgl.c
+++ b/modules/video_output/vgl.c
@@ -28,15 +28,20 @@
 #include <vlc_vout_display.h>
 #include <vlc_opengl.h>
 
+#include <vlc/libvlc.h>
+#include <vlc/libvlc_picture.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_renderer_discoverer.h>
+#include <vlc/libvlc_media_player.h>
 
 struct vout_display_sys_t
 {
-    void (*cleanupCb)(void* opaque);
-    bool (*setupCb)(void* opaque);
-    void (*resizeCb)(void* opaque, unsigned, unsigned);
-    void (*swapCb)(void* opaque);
-    bool (*makeCurrentCb)(void* opaque, bool);
-    void* (*getProcAddressCb)(void* opaque, const char *name);
+    libvlc_video_cleanup_cb cleanupCb;
+    libvlc_video_setup_cb setupCb;
+    libvlc_video_update_output_cb resizeCb;
+    libvlc_video_swap_cb swapCb;
+    libvlc_video_makeCurrent_cb makeCurrentCb;
+    libvlc_video_getProcAddress_cb getProcAddressCb;
 
     void* opaque;
     unsigned width;



More information about the vlc-commits mailing list