Commit 8f61520c authored by Laurent Aimar's avatar Laurent Aimar

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

This reverts commit 4b435093.
parent 4b435093
...@@ -4,7 +4,7 @@ SUBDIRS = msw ...@@ -4,7 +4,7 @@ SUBDIRS = msw
# obviously does not. Here is a fix for that. # obviously does not. Here is a fix for that.
LIBTOOL=@LIBTOOL@ --tag=CC 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_caca = caca.c keythread.h keythread.c
SOURCES_fb = fb.c SOURCES_fb = fb.c
SOURCES_vout_sdl = sdl.c keythread.h keythread.c SOURCES_vout_sdl = sdl.c keythread.h keythread.c
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_vout_display.h> #include <vlc_vout_display.h>
#include <vlc_picture_pool.h> #include <vlc_picture_pool.h>
#include "keythread.h"
#include <assert.h> #include <assert.h>
#include <aalib.h> #include <aalib.h>
...@@ -74,7 +73,6 @@ struct vout_display_sys_t { ...@@ -74,7 +73,6 @@ struct vout_display_sys_t {
vout_display_cfg_t state; vout_display_cfg_t state;
picture_pool_t *pool; picture_pool_t *pool;
key_thread_t *keys;
}; };
/** /**
...@@ -131,7 +129,6 @@ static int Open(vlc_object_t *object) ...@@ -131,7 +129,6 @@ static int Open(vlc_object_t *object)
vout_display_SendEventFullscreen(vd, false); vout_display_SendEventFullscreen(vd, false);
vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false); vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
sys->keys = vlc_CreateKeyThread(vd);
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
...@@ -149,7 +146,6 @@ static void Close(vlc_object_t *object) ...@@ -149,7 +146,6 @@ static void Close(vlc_object_t *object)
vout_display_t *vd = (vout_display_t *)object; vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
vlc_DestroyKeyTread(sys->keys);
if (sys->pool) if (sys->pool)
picture_pool_Delete(sys->pool); picture_pool_Delete(sys->pool);
aa_close(sys->aa_context); aa_close(sys->aa_context);
...@@ -292,26 +288,26 @@ static void Manage(vout_display_t *vd) ...@@ -292,26 +288,26 @@ static void Manage(vout_display_t *vd)
/* TODO keys support to complete */ /* TODO keys support to complete */
case AA_UP: case AA_UP:
vlc_EmitKey(sys->keys, KEY_UP); vout_display_SendEventKey(vd, KEY_UP);
break; break;
case AA_DOWN: case AA_DOWN:
vlc_EmitKey(sys->keys, KEY_DOWN); vout_display_SendEventKey(vd, KEY_DOWN);
break; break;
case AA_RIGHT: case AA_RIGHT:
vlc_EmitKey(sys->keys, KEY_RIGHT); vout_display_SendEventKey(vd, KEY_RIGHT);
break; break;
case AA_LEFT: case AA_LEFT:
vlc_EmitKey(sys->keys, KEY_LEFT); vout_display_SendEventKey(vd, KEY_LEFT);
break; break;
case AA_BACKSPACE: case AA_BACKSPACE:
vlc_EmitKey(sys->keys, KEY_BACKSPACE); vout_display_SendEventKey(vd, KEY_BACKSPACE);
break; break;
case AA_ESC: case AA_ESC:
vlc_EmitKey(sys->keys, KEY_ESC); vout_display_SendEventKey(vd, KEY_ESC);
break; break;
default: default:
if (event >= 0x20 && event <= 0x7f) if (event >= 0x20 && event <= 0x7f)
vlc_EmitKey(sys->keys, event); vout_display_SendEventKey(vd, event);
break; break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment