From 86685d0fa8b4cbd051f8196b38c5f595c3ad4b12 Mon Sep 17 00:00:00 2001
From: phintuka <phintuka>
Date: Fri, 25 Aug 2006 08:25:52 +0000
Subject: Moved XKeySym keyboard learning trigger to sxfe (XKeySym remote is
 _not_ available with framebuffer ...) Added KBD remote learning trigger to
 fbfe

---
 xine_fbfe_frontend.c | 6 ++++--
 xine_frontend.c      | 6 +++---
 xine_sxfe_frontend.c | 6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/xine_fbfe_frontend.c b/xine_fbfe_frontend.c
index 68345bfb..e7063f12 100644
--- a/xine_fbfe_frontend.c
+++ b/xine_fbfe_frontend.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_fbfe_frontend.c,v 1.7 2006-08-25 03:55:05 phintuka Exp $
+ * $Id: xine_fbfe_frontend.c,v 1.8 2006-08-25 08:25:52 phintuka Exp $
  *
  */
 
@@ -135,8 +135,10 @@ static int fbfe_display_open(frontend_t *this_gen, int width, int height, int fu
     this->fe.fe_display_close(this_gen);
 
   this->display = 1;
-  if(keyfunc)
+  if(keyfunc) {
     this->keypress = keyfunc;
+    this->keypress("KBD", "");
+  }
 
   LOGDBG("fbfe_display_open(width=%d, height=%d, fullscreen=%d, display=%s)",
 	 width, height, fullscreen, video_port);
diff --git a/xine_frontend.c b/xine_frontend.c
index a99299c5..647604dd 100644
--- a/xine_frontend.c
+++ b/xine_frontend.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_frontend.c,v 1.16 2006-08-25 04:03:11 phintuka Exp $
+ * $Id: xine_frontend.c,v 1.17 2006-08-25 08:25:52 phintuka Exp $
  *
  */
 
@@ -861,10 +861,10 @@ static int fe_xine_play(frontend_t *this_gen)
   input_vdr->f.xine_input_event = this->keypress;
   input_vdr->f.fe_control = fe_control;
   input_vdr->f.fe_handle  = (void*)this;
-
+#if 0
   if(!this->playback_finished && this->keypress)
     this->keypress("XKeySym", "");
-
+#endif
   if(this->playback_finished)
     LOGMSG("Error playing xvdr:// !");
 
diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c
index ca17efe9..03c8f7ba 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.11 2006-08-25 03:55:05 phintuka Exp $
+ * $Id: xine_sxfe_frontend.c,v 1.12 2006-08-25 08:25:52 phintuka Exp $
  *
  */
 
@@ -354,8 +354,10 @@ static int sxfe_display_open(frontend_t *this_gen, int width, int height, int fu
   if(this->display)
     this->fe.fe_display_close(this_gen);
 
-  if(keyfunc)
+  if(keyfunc) {
     this->keypress = keyfunc;
+    this->keypress("XKeySym", ""); /* triggers learning mode */
+  }
 
   LOGDBG("sxfe_display_open(width=%d, height=%d, fullscreen=%d, display=%s)",
 	 width, height, fullscreen, video_port);
-- 
cgit v1.2.3