Add indirection to find input from wanabee input manager object

[vlc] / src / control / media_player_internal.h

diff --git a/src/control/media_player_internal.h b/src/control/media_player_internal.h
index cf22cc071e6c461ec8042d9221a87fe3d85811f5..987c559a38f72308e0925da51e840317d153f4a4 100644 (file)
--- a/src/control/media_player_internal.h
+++ b/src/control/media_player_internal.h
@@ -33,6 +33,7 @@
 #include <vlc/libvlc_structures.h>
 #include <vlc/libvlc_media.h>
 #include <vlc_input.h>
+#include <vlc_vout.h>
 
 struct libvlc_media_player_t
 {
@@ -41,29 +42,20 @@ struct libvlc_media_player_t
     int                i_refcount;
     vlc_mutex_t        object_lock;
     input_thread_t *   p_input_thread;
-       input_resource_t * p_input_resource;
+    input_resource_t * p_input_resource;
+    vout_thread_t *    p_vout_thread;
     struct libvlc_instance_t * p_libvlc_instance; /* Parent instance */
     libvlc_media_t * p_md; /* current media descriptor */
     libvlc_event_manager_t * p_event_manager;
     libvlc_state_t state;
-    struct
-    {
-        void *hwnd;
-        void *nsobject;
-        uint32_t xid;
-        uint32_t agl;
-    } drawable;
-    unsigned keyboard_events:1;
-    unsigned mouse_events:1;
 };
 
 /* Media player - audio, video */
-input_thread_t *libvlc_get_input_thread(libvlc_media_player_t *, libvlc_exception_t * );
+input_thread_t *libvlc_get_input_thread(libvlc_media_player_t * );
 
 
 libvlc_track_description_t * libvlc_get_track_description(
         libvlc_media_player_t *p_mi,
-        const char *psz_variable,
-        libvlc_exception_t *p_e );
+        const char *psz_variable );
 
 #endif