From: Laurent Aimar <fenrir@videolan.org>
Date: Sun, 30 May 2010 12:25:38 +0000 (+0200)
Subject: Revert "SDL: use key thread (partially fix #3661)"
X-Git-Tag: 1.2.0-pre1~6411
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1f7ce77d650ee47ca44d378d324abb81a040731c;p=vlc

Revert "SDL: use key thread (partially fix #3661)"

This reverts commit a0c1d2ccdd62ef333e30f2fc9717fd0bf44ec4a3.
---

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 92f28feefa..b0a5b4b521 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -7,7 +7,7 @@ LIBTOOL=@LIBTOOL@ --tag=CC
 SOURCES_aa = aa.c
 SOURCES_caca = caca.c
 SOURCES_fb = fb.c
-SOURCES_vout_sdl = sdl.c keythread.h keythread.c
+SOURCES_vout_sdl = sdl.c
 SOURCES_snapshot = snapshot.c
 SOURCES_directfb = directfb.c
 SOURCES_vmem = vmem.c
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 84af7d55df..17448a0e76 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -35,7 +35,6 @@
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_picture_pool.h>
-#include "keythread.h"
 
 #include <assert.h>
 
@@ -100,7 +99,6 @@ struct vout_display_sys_t {
 
     /* */
     picture_pool_t       *pool;
-    key_thread_t         *keys;
 };
 
 /**
@@ -334,8 +332,6 @@ static int Open(vlc_object_t *object)
 
     /* */
     vout_display_SendEventDisplaySize(vd, display_width, display_height, vd->cfg->is_fullscreen);
-
-    sys->keys = vlc_CreateKeyThread (vd);
     return VLC_SUCCESS;
 
 error:
@@ -362,8 +358,6 @@ static void Close(vlc_object_t *object)
     vout_display_t *vd = (vout_display_t *)object;
     vout_display_sys_t *sys = vd->sys;
 
-    vlc_DestroyKeyThread(sys->keys);
-
     if (sys->pool)
         picture_pool_Delete(sys->pool);
 
@@ -602,7 +596,7 @@ static void Manage(vout_display_t *vd)
                 key |= KEY_MODIFIER_CTRL;
             if (event.key.keysym.mod & KMOD_ALT)
                 key |= KEY_MODIFIER_ALT;
-            vlc_EmitKey(sys->keys, key);
+            vout_display_SendEventKey(vd, key);
             break;
         }
 
@@ -708,3 +702,4 @@ static int ConvertKey(SDLKey sdl_key)
     }
     return 0;
 }
+