From: FrantiÅ¡ek DvoÅák <va...@us...> - 2008-11-18 20:10:01
|
Update of /cvsroot/xine/xine-ui/src/aaui In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2212/src/aaui Modified Files: main.c Log Message: ASCII Art updates. 1) Bug #50: build against libcaca 0.99 There is compatibility test for 0.9 too inspiratied from vlc, but recent xine-lib requires 0.99 anyway. 2) Fix of the two opened windows with CACA Better ui<->lib interaction (patch to caca vo plugin in xine-lib will follow). 3) aalib detection Proper enable aalib when found. Keep in sync aalib.m4 with xine-lib. Index: main.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/aaui/main.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- main.c 16 Nov 2008 17:06:36 -0000 1.67 +++ main.c 18 Nov 2008 20:09:44 -0000 1.68 @@ -593,7 +593,11 @@ while ( !caca_get_event(aaxine.display, CACA_EVENT_KEY_PRESS, &ev, 50000) && aaxine.running ) ; if (!aaxine.running) return 0; +#ifdef CACA_EVENT_OPAQUE return caca_get_event_key_ch(&ev); +#else + return ev.data.key.ch; +#endif #endif } @@ -807,12 +811,12 @@ if(!video_driver_id) video_driver_id = "caca"; + aaxine.canvas = cucul_create_canvas(0, 0); + aaxine.display = caca_create_display(aaxine.canvas); aaxine.vo_port = xine_open_video_driver(__xineui_global_xine_instance, video_driver_id, XINE_VISUAL_TYPE_CACA, - NULL); - aaxine.canvas = cucul_create_canvas(0, 0); - aaxine.display = caca_create_display(aaxine.canvas); + aaxine.display); #endif if (!aaxine.vo_port) { |