summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xine_frontend_lirc.c6
-rw-r--r--xine_frontend_main.c9
-rw-r--r--xine_sxfe_frontend.c7
3 files changed, 18 insertions, 4 deletions
diff --git a/xine_frontend_lirc.c b/xine_frontend_lirc.c
index 2b2c6427..e23584d3 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.23 2009-12-28 12:06:00 phintuka Exp $
+ * $Id: xine_frontend_lirc.c,v 1.24 2010-01-03 09:54:39 phintuka Exp $
*
*/
/*
@@ -212,6 +212,10 @@ static void *lirc_receiver_thread(void *fe_gen)
fe->send_event(fe, "QUIT");
break;
}
+ if (!strcmp(KeyName, "PowerOff")) {
+ fe->send_event(fe, "POWER_OFF");
+ break;
+ }
if (!strcmp(KeyName, "Fullscreen")) {
if (!repeat)
fe->send_event(fe, "TOGGLE_FULLSCREEN");
diff --git a/xine_frontend_main.c b/xine_frontend_main.c
index e82d667f..6b39d9dc 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.80 2009-08-18 12:23:09 phintuka Exp $
+ * $Id: xine_frontend_main.c,v 1.81 2010-01-03 09:54:39 phintuka Exp $
*
*/
@@ -203,7 +203,12 @@ static void *kbd_receiver_thread(void *fe_gen)
if (code == 'f' || code == 'F') {
fe->send_event(fe, "TOGGLE_FULLSCREEN");
continue;
- } else if (code == 'd' || code == 'D') {
+ }
+ if (code == 'p' || code == 'P') {
+ fe->send_event(fe, "POWER_OFF");
+ continue;
+ }
+ if (code == 'd' || code == 'D') {
fe->send_event(fe, "TOGGLE_DEINTERLACE");
continue;
}
diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c
index 4e502a71..c7e1f925 100644
--- a/xine_sxfe_frontend.c
+++ b/xine_sxfe_frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_sxfe_frontend.c,v 1.116 2009-10-31 19:35:45 phintuka Exp $
+ * $Id: xine_sxfe_frontend.c,v 1.117 2010-01-03 09:54:39 phintuka Exp $
*
*/
@@ -1426,6 +1426,11 @@ static void XKeyEvent_handler(sxfe_t *this, XKeyEvent *kev)
if (this->gui_hotkeys)
fe_event = "TOGGLE_DEINTERLACE";
break;
+ case XK_p:
+ case XK_P:
+ if (this->gui_hotkeys)
+ fe_event = "POWER_OFF";
+ break;
case XK_Escape:
if (!this->x.keypress) /* ESC exits only in remote mode */
fe_event = "QUIT";