Mercurial > mplayer.hg
changeset 5026:693b917ac916
DirectFB 0.9.9 support - patch by Aubin Paul <aubin@punknews.org>
| author | arpi |
|---|---|
| date | Sun, 10 Mar 2002 15:47:01 +0000 |
| parents | 6d8971d55e40 |
| children | 0c7a6a9d2243 |
| files | configure libvo/vo_directfb.c |
| diffstat | 2 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Mar 10 13:53:38 2002 +0000 +++ b/configure Sun Mar 10 15:47:01 2002 +0000 @@ -1507,6 +1507,23 @@ fi echores "$_directfb" +echocheck "DirectFB >= 0.9.9" +if test "$_directfb" = auto; then + _directfb=no + cat > $TMPC <<EOF +#include <directfb.h> +nt main(void) { IDirectFBEventBuffer *foo; return 0; } +EOF + linux && test -c /dev/fb0 && cc_check -ldirectfb && _directfb=yes +fi +if test "$_directfb" = yes ; then + _def_directfb='#define HAVE_DIRECTFB099 1' +else + _def_directfb='#undef HAVE_DIRECTFB' +fi +echores "$_directfb" + + # Checking for localization ... echocheck "language"
--- a/libvo/vo_directfb.c Sun Mar 10 13:53:38 2002 +0000 +++ b/libvo/vo_directfb.c Sun Mar 10 15:47:01 2002 +0000 @@ -108,7 +108,12 @@ /* * A buffer for input events. */ + +#ifdef HAVE_DIRECTFB099 +static IDirectFBEventBuffer *buffer = NULL; +#else static IDirectFBInputBuffer *buffer = NULL; +#endif /****************************** * vo_directfb * @@ -574,7 +579,11 @@ /* * Create an input buffer for the keyboard. */ +#ifdef HAVE_DIRECTFB099 + DFBCHECK (keyboard->CreateEventBuffer (DICAPS_ALL, &buffer)); +#else DFBCHECK (keyboard->CreateInputBuffer (keyboard, &buffer)); +#endif // yuv2rgb transform init @@ -797,8 +806,11 @@ { DFBInputEvent event; - +#ifdef HAVE_DIRECTFB099 +if (buffer->GetEvent (buffer, DFB_EVENT(&event)) == DFB_OK) { +#else if (buffer->GetEvent (buffer, &event) == DFB_OK) { +#endif if (event.type == DIET_KEYPRESS) { switch (event.keycode) { case DIKC_ESCAPE: