Migrate atmolight switch patch for actual xineliboutput version

1 files changed, 32 insertions, 37 deletions

diff --git a/patches/xineliboutput-atmolight-switch.patch b/patches/xineliboutput-atmolight-switch.patch
index 2333cd9..b37d7e9 100644
--- a/patches/xineliboutput-atmolight-switch.patch
+++ b/patches/xineliboutput-atmolight-switch.patch
@@ -1,30 +1,8 @@
-Index: xine_frontend_lirc.c
-===================================================================
-RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/xine_frontend_lirc.c,v
-retrieving revision 1.24
-diff -u -r1.24 xine_frontend_lirc.c
---- xine_frontend_lirc.c	3 Jan 2010 09:54:39 -0000	1.24
-+++ xine_frontend_lirc.c	15 Jun 2010 14:57:32 -0000
-@@ -226,6 +226,11 @@
-               fe->send_event(fe, "TOGGLE_DEINTERLACE");
-             continue;
-           }
-+          if (!strcmp(KeyName, "Atmolight")) {
-+            if (!repeat)
-+              fe->send_event(fe, "ATMOLIGHT");
-+            continue;
-+          }
-         }
- 
-         alarm(3);
-Index: xine_frontend.c
-===================================================================
-RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/xine_frontend.c,v
-retrieving revision 1.117
-diff -u -r1.117 xine_frontend.c
---- xine_frontend.c	22 May 2010 11:59:28 -0000	1.117
-+++ xine_frontend.c	15 Jun 2010 14:57:31 -0000
-@@ -1420,6 +1420,41 @@
+diff --git a/xine_frontend.c b/xine_frontend.c
+index 27d1af1..9a95ebf 100644
+--- a/xine_frontend.c
++++ b/xine_frontend.c
+@@ -1424,6 +1424,41 @@ static int fe_send_event(frontend_t *this_gen, const char *data)
    } else if (!strcmp(data, "POWER_OFF")) {
      shutdown_system(this->shutdown_cmd, 1);
  
@@ -66,14 +44,11 @@ diff -u -r1.117 xine_frontend.c
    } else {
  
      LOGDBG("Event: %s", data);
-Index: xine_frontend_main.c
-===================================================================
-RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/xine_frontend_main.c,v
-retrieving revision 1.88
-diff -u -r1.88 xine_frontend_main.c
---- xine_frontend_main.c	26 May 2010 12:10:02 -0000	1.88
-+++ xine_frontend_main.c	15 Jun 2010 14:57:32 -0000
-@@ -214,6 +214,10 @@
+diff --git a/xine_frontend_kbd.c b/xine_frontend_kbd.c
+index c750d08..1f5646d 100644
+--- a/xine_frontend_kbd.c
++++ b/xine_frontend_kbd.c
+@@ -209,6 +209,10 @@ static void *kbd_receiver_thread(void *fe_gen)
          fe->send_event(fe, "TOGGLE_DEINTERLACE");
          continue;
        }
@@ -84,7 +59,7 @@ diff -u -r1.88 xine_frontend_main.c
      }
  
      snprintf(str, sizeof(str), "%016" PRIX64, code);
-@@ -284,6 +288,10 @@
+@@ -282,6 +286,10 @@ static void *slave_receiver_thread(void *fe_gen)
        fe->send_input_event(fe, NULL, str+5, 0, 0);
        continue;
      }
@@ -95,7 +70,27 @@ diff -u -r1.88 xine_frontend_main.c
  
      LOGMSG("Unknown slave mode command: %s", str);
  
-@@ -650,9 +658,11 @@
+diff --git a/xine_frontend_lirc.c b/xine_frontend_lirc.c
+index abf9b62..0bf73bb 100644
+--- a/xine_frontend_lirc.c
++++ b/xine_frontend_lirc.c
+@@ -229,6 +229,11 @@ static void *lirc_receiver_thread(void *fe_gen)
+               fe->send_event(fe, "TOGGLE_DEINTERLACE");
+             continue;
+           }
++          if (!strcmp(KeyName, "Atmolight")) {
++            if (!repeat)
++              fe->send_event(fe, "ATMOLIGHT");
++            continue;
++          }
+         }
+ 
+         alarm(3);
+diff --git a/xine_frontend_main.c b/xine_frontend_main.c
+index 48cc0e3..d20009a 100644
+--- a/xine_frontend_main.c
++++ b/xine_frontend_main.c
+@@ -379,9 +379,11 @@ int main(int argc, char *argv[])
                       "  mapping keyboard f,F     -> fullscreen toggle\n"
                       "          keyboard d,D     -> deinterlace toggle\n"
                       "          keyboard p,P     -> power off\n"