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

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

This reverts commit 031dec33fbe1cde74e6ef1680638435d335daafe.
---

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 23c780d769..92f28feefa 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -5,7 +5,7 @@ SUBDIRS = msw
 LIBTOOL=@LIBTOOL@ --tag=CC
 
 SOURCES_aa = aa.c
-SOURCES_caca = caca.c keythread.h keythread.c
+SOURCES_caca = caca.c
 SOURCES_fb = fb.c
 SOURCES_vout_sdl = sdl.c keythread.h keythread.c
 SOURCES_snapshot = snapshot.c
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index eaa4c22832..6de1ca19a2 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -34,7 +34,6 @@
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_picture_pool.h>
-#include "keythread.h"
 
 #include <caca.h>
 
@@ -73,7 +72,6 @@ struct vout_display_sys_t {
     cucul_dither_t *dither;
 
     picture_pool_t *pool;
-    key_thread_t   *keys;
 };
 
 /**
@@ -190,7 +188,6 @@ static int Open(vlc_object_t *object)
     vout_display_SendEventFullscreen(vd, false);
     Refresh(vd);
 
-    sys->keys = vlc_CreateKeyThread(vd);
     return VLC_SUCCESS;
 
 error:
@@ -220,7 +217,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);
     if (sys->dither)
@@ -481,7 +477,7 @@ static void Manage(vout_display_t *vd)
                     const int vlc = keys[i].vlc;
 
                     if (vlc >= 0)
-                        vlc_EmitKey(sys->keys, vlc);
+                        vout_display_SendEventKey(vd, vlc);
                     return;
                 }
             }