X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_player_internal.h;h=5b12ff79a67ce4816f72b05e9ea2638a4fa218ae;hb=a7f5775ea877b0619a0311a3e966a46b42988240;hp=955491c5e581881f0e13850462a2d6e779027bf7;hpb=bbce7c4cae681298d6f49c7e605ed3775cbc0e1d;p=vlc

diff --git a/src/control/media_player_internal.h b/src/control/media_player_internal.h
index 955491c5e5..5b12ff79a6 100644
--- a/src/control/media_player_internal.h
+++ b/src/control/media_player_internal.h
@@ -36,32 +36,30 @@
 
 struct libvlc_media_player_t
 {
+    VLC_COMMON_MEMBERS
+
     int                i_refcount;
     vlc_mutex_t        object_lock;
-    input_thread_t *   p_input_thread;
-	input_resource_t * p_input_resource;
+
+    struct
+    {
+        input_thread_t   *p_thread;
+        input_resource_t *p_resource;
+        vlc_mutex_t       lock;
+    } input;
+
     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