[vlc-commits] commit: Revert "AA: use key thread (partially fix #3661) - untested" ( Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun May 30 14:25:30 2010 +0200| [8f61520c3ecb3bb774fd0ebb66c022c0e7b5d49a] | committer: Laurent Aimar 

Revert "AA: use key thread (partially fix #3661) - untested"

This reverts commit 4b4350938d98feb676cc0f0573780449ff9125cb.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8f61520c3ecb3bb774fd0ebb66c022c0e7b5d49a
---

 modules/video_output/Modules.am |    2 +-
 modules/video_output/aa.c       |   18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index ffe579a..23c780d 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -4,7 +4,7 @@ SUBDIRS = msw
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
-SOURCES_aa = aa.c keythread.h keythread.c
+SOURCES_aa = aa.c
 SOURCES_caca = caca.c keythread.h keythread.c
 SOURCES_fb = fb.c
 SOURCES_vout_sdl = sdl.c keythread.h keythread.c
diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index f691ba5..5c44628 100644
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -32,7 +32,6 @@
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_picture_pool.h>
-#include "keythread.h"
 
 #include <assert.h>
 #include <aalib.h>
@@ -74,7 +73,6 @@ struct vout_display_sys_t {
 
     vout_display_cfg_t  state;
     picture_pool_t      *pool;
-    key_thread_t        *keys;
 };
 
 /**
@@ -131,7 +129,6 @@ static int Open(vlc_object_t *object)
     vout_display_SendEventFullscreen(vd, false);
     vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
 
-    sys->keys = vlc_CreateKeyThread(vd);
     return VLC_SUCCESS;
 
 error:
@@ -149,7 +146,6 @@ static void Close(vlc_object_t *object)
     vout_display_t *vd = (vout_display_t *)object;
     vout_display_sys_t *sys = vd->sys;
 
-    vlc_DestroyKeyTread(sys->keys);
     if (sys->pool)
         picture_pool_Delete(sys->pool);
     aa_close(sys->aa_context);
@@ -292,26 +288,26 @@ static void Manage(vout_display_t *vd)
 
         /* TODO keys support to complete */
         case AA_UP:
-            vlc_EmitKey(sys->keys, KEY_UP);
+            vout_display_SendEventKey(vd, KEY_UP);
             break;
         case AA_DOWN:
-            vlc_EmitKey(sys->keys, KEY_DOWN);
+            vout_display_SendEventKey(vd, KEY_DOWN);
             break;
         case AA_RIGHT:
-            vlc_EmitKey(sys->keys, KEY_RIGHT);
+            vout_display_SendEventKey(vd, KEY_RIGHT);
             break;
         case AA_LEFT:
-            vlc_EmitKey(sys->keys, KEY_LEFT);
+            vout_display_SendEventKey(vd, KEY_LEFT);
             break;
         case AA_BACKSPACE:
-            vlc_EmitKey(sys->keys, KEY_BACKSPACE);
+            vout_display_SendEventKey(vd, KEY_BACKSPACE);
             break;
         case AA_ESC:
-            vlc_EmitKey(sys->keys, KEY_ESC);
+            vout_display_SendEventKey(vd, KEY_ESC);
             break;
         default:
             if (event >= 0x20 && event <= 0x7f)
-                vlc_EmitKey(sys->keys, event);
+                vout_display_SendEventKey(vd, event);
             break;
         }
     }