vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sat Aug 5 23:48:14 2017 +0300| [0fb319df46e35d23e6c59aec813dc15e1f6a57f0] | committer: Rémi Denis-Courmont
aa: use new event thread helper > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0fb319df46e35d23e6c59aec813dc15e1f6a57f0 --- modules/video_output/Makefile.am | 2 +- modules/video_output/aa.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index a6f4acfaff..0bc69a8a42 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -407,7 +407,7 @@ vout_LTLIBRARIES += $(LTLIBfb) ### ASCII Art ### libaa_plugin_la_SOURCES = video_output/aa.c -libaa_plugin_la_LIBADD = -laa +libaa_plugin_la_LIBADD = libevent_thread.la -laa if !HAVE_WIN32 libaa_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11 endif diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c index e4ff1391c3..6210aeefc5 100644 --- a/modules/video_output/aa.c +++ b/modules/video_output/aa.c @@ -43,6 +43,8 @@ # include <vlc_xlib.h> #endif +#include "event_thread.h" + /* TODO * - what about RGB palette ? */ @@ -79,6 +81,7 @@ struct vout_display_sys_t { aa_palette palette; picture_pool_t *pool; + vout_display_event_thread_t *et; }; /** @@ -110,6 +113,8 @@ static int Open(vlc_object_t *object) } vout_display_DeleteWindow(vd, NULL); + sys->et = VoutDisplayEventCreateThread(vd); + aa_autoinitkbd(sys->aa_context, 0); aa_autoinitmouse(sys->aa_context, AA_MOUSEALLMASK); @@ -124,7 +129,6 @@ static int Open(vlc_object_t *object) /* Setup vout_display now that everything is fine */ vd->fmt = fmt; vd->info.has_pictures_invalid = true; - vd->info.needs_event_thread = true; vd->pool = Pool; vd->prepare = Prepare; @@ -155,6 +159,7 @@ static void Close(vlc_object_t *object) if (sys->pool) picture_pool_Release(sys->pool); + VoutDisplayEventKillThread(sys->et); aa_close(sys->aa_context); free(sys); } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
