diff options
| -rw-r--r-- | xine_frontend_lirc.c | 15 | ||||
| -rw-r--r-- | xine_frontend_main.c | 10 |
2 files changed, 13 insertions, 12 deletions
diff --git a/xine_frontend_lirc.c b/xine_frontend_lirc.c index 967975b5..b7a45505 100644 --- a/xine_frontend_lirc.c +++ b/xine_frontend_lirc.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_lirc.c,v 1.8 2007-04-12 19:27:50 phintuka Exp $ + * $Id: xine_frontend_lirc.c,v 1.9 2007-05-18 14:43:03 phintuka Exp $ * */ /* @@ -20,7 +20,7 @@ * * LIRC support added by Carsten Koch <Carsten.Koch@icem.de> 2000-06-16. * - * $Id: xine_frontend_lirc.c,v 1.8 2007-04-12 19:27:50 phintuka Exp $ + * $Id: xine_frontend_lirc.c,v 1.9 2007-05-18 14:43:03 phintuka Exp $ */ @@ -190,15 +190,16 @@ static void *lirc_receiver_thread(void *fe) } LastTime = time_ms(); - -#ifdef XINELIBOUTPUT_FE_TOGGLE_FULLSCREEN +#if defined(XINELIBOUTPUT_FE_TOGGLE_FULLSCREEN) || defined(INTERPRET_LIRC_KEYS) + if(!strcmp(KeyName, "Quit")) { + terminate_key_pressed = 1; + break; # ifndef IS_FBFE - if(!strcmp(KeyName, "Fullscreen")) { + } else if(!strcmp(KeyName, "Fullscreen")) { if(!repeat) sxfe_toggle_fullscreen((sxfe_t*)fe); - } else # endif - if(!strcmp(KeyName, "Deinterlace")) { + } else if(!strcmp(KeyName, "Deinterlace")) { fe_t *this = (fe_t*)fe; xine_set_param(this->stream, XINE_PARAM_VO_DEINTERLACE, xine_get_param(this->stream, XINE_PARAM_VO_DEINTERLACE) ? 0 : 1); diff --git a/xine_frontend_main.c b/xine_frontend_main.c index 62bb99fb..e44dc383 100644 --- a/xine_frontend_main.c +++ b/xine_frontend_main.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_main.c,v 1.30 2007-05-17 23:24:17 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.31 2007-05-18 14:43:00 phintuka Exp $ * */ @@ -16,9 +16,6 @@ #include "tools/vdrdiscovery.h" -/* include LIRC forwarding code */ -#include "xine_frontend_lirc.c" - #if 0 static void xine_log_cb(void *data, int section) @@ -48,6 +45,9 @@ pthread_t kbd_thread; struct termios tm, saved_tm; volatile int terminate_key_pressed = 0; +/* include LIRC forwarding code */ +#include "xine_frontend_lirc.c" + static int read_key(void) { unsigned char ch; @@ -155,7 +155,7 @@ static void *kbd_receiver_thread(void *fe) terminate_key_pressed = 1; break; } -#ifdef XINELIBOUTPUT_FE_TOGGLE_FULLSCREEN +#if defined(XINELIBOUTPUT_FE_TOGGLE_FULLSCREEN) || defined(INTERPRET_LIRC_KEYS) # ifndef IS_FBFE if(code == 'f' || code == 'F') { sxfe_toggle_fullscreen((sxfe_t*)fe); |