X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_player_internal.h;h=5b12ff79a67ce4816f72b05e9ea2638a4fa218ae;hb=f99a3970cb4d54ae9e281c9f5c77f43a68d8d3b4;hp=3eeda533aa2601f5a423e8b11a8191134343f89b;hpb=ad77d955a5dc051976d94d6e08ee0f717ec3a938;p=vlc

diff --git a/src/control/media_player_internal.h b/src/control/media_player_internal.h
index 3eeda533aa..5b12ff79a6 100644
--- a/src/control/media_player_internal.h
+++ b/src/control/media_player_internal.h
@@ -32,31 +32,34 @@
 #include <vlc/vlc.h>
 #include <vlc/libvlc_structures.h>
 #include <vlc/libvlc_media.h>
+#include <vlc_input.h>
 
 struct libvlc_media_player_t
 {
+    VLC_COMMON_MEMBERS
+
     int                i_refcount;
     vlc_mutex_t        object_lock;
-    input_thread_t *   p_input_thread;
+
+    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;
-    struct
-    {
-        void *hwnd;
-        void *nsobject;
-        uint32_t xid;
-        uint32_t agl;
-    } drawable;
+    libvlc_state_t state;
 };
 
 /* 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