Ticket #2055: mplayer.lirc.multicommand.patch

mplayer-svn2012Jan23-r34588-x86_64

@@ -310 +310 @@
 Jméno spustitelného souboru <application>MPlayer</application>u je - překvapení -
 <filename>mplayer</filename>. Můžete použít jakýkoli příkaz
 <application>MPlayer</application>u a dokonce i více než jeden, pokud je oddělíte
-znakem <literal>\n</literal>.
+znakem <literal>\t</literal>.
 Nezapomeňte zapnout opakovací (repeat) příznak v <filename>.lircrc</filename> tam,
 kde to dává smysl (vyhledávání, hlasitost, atd.).
 Zde je výňatek z demonstračního
@@ -341 +341 @@
 begin
     button = CD_STOP
     prog = mplayer
-    config = seek 0 1\npause
+    config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -294 +294 @@
 <para>
 Der Anwendungsname für <application>MPlayer</application> ist - Überraschung -
 <filename>mplayer</filename>. Du kannst jeden <application>MPlayer</application>-Befehl
-verwenden und sogar mehrere Befehle übergeben, indem du sie mit <literal>\n</literal>
+verwenden und sogar mehrere Befehle übergeben, indem du sie mit <literal>\t</literal>
 trennst. Vergiss nicht, das repeat-Flag in <filename>.lircrc</filename> zu setzen, wenn
 es Sinn macht (spulen, Lautstärke, etc). Hier ist ein Auszug einer Beispieldatei
 <filename>.lircrc</filename>:
@@ -324 +324 @@
 begin
 button = CD_STOP
 prog = mplayer
-config = seek 0 1\npause
+config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -307 +307 @@
 <para>
 The application name for <application>MPlayer</application> is - surprise -
 <filename>mplayer</filename>. You can use any <application>MPlayer</application>
-commands and even pass more than one command by separating them with
-<literal>\n</literal>.
-Do not forget to enable the repeat flag in <filename>.lircrc</filename> when
-it makes sense (seek, volume, etc). Here is an excerpt from a sample
+commands and even pass more than one command per <filename>.lircrc</filename> 
+<systemitem>config</systemitem> entry by separating them with <literal>\t</literal>.
+Also, do enable the <systemitem>repeat</systemitem> flag when it makes sense 
+(seek, volume, etc). Here is an excerpt from a sample
 <filename>.lircrc</filename>:
 </para>
 
@@ -338 +338 @@
 begin
     button = CD_STOP
     prog = mplayer
-    config = seek 0 1\npause
+    config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -355 +355 @@
 El nombre de la aplicación para <application>MPlayer</application> es - oh
 que maravilla - <filename>mplayer</filename>. Puede usar las órdenes de
 <application>MPlayer</application> e incluso pasar más de una órden
-separándolas con <literal>\n</literal>.
+separándolas con <literal>\t</literal>.
 No olvide activar el marcador repeat en <filename>.lircrc</filename> cuando
 tenga sentido (posición, volumen, etc). Aquí hay un extracto de mi
 <filename>.lircrc</filename>:
@@ -385 +385 @@
 begin
     button = CD_STOP
     prog = mplayer
-    config = seek 0 1\npause
+    config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -297 +297 @@
 Le nom de l'application à lancer avec <application>MPlayer</application> est
 - oh surprise - <filename>mplayer</filename>. Vous pouvez utiliser n'importe
 quelle commande <application>MPlayer</application> et même passer plus d'une commande
-en les séparant avec <literal>\n</literal>.
+en les séparant avec <literal>\t</literal>.
 N'oubliez pas d'activer le flag repeat dans <filename>.lircrc</filename> quand cela
 est approprié (déplacement, volume, etc).
 Voici un extrait d'un fichier d'exemple
@@ -328 +328 @@
 begin
     button = CD_STOP
     prog = mplayer
-    config = seek 0 1\npause
+    config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -311 +311 @@
 <para>
 Az <application>MPlayer</application> alkalmazás neve - minő meglepő -
 <filename>mplayer</filename>. Bármelyik mplayer parancsot használhatod
-és egyszerre több parancsot is megadhatsz egy lépésben, ha <literal>\n</literal>
+és egyszerre több parancsot is megadhatsz egy lépésben, ha <literal>\t</literal>
 karakterrel választod el őket. Ne felejtsd el engedélyezni az ismétlés jelzőt
 (repeat flag) a <filename>.lircrc</filename> fájlban, ha van értelme
 (keresés, hangerő, stb.). Itt egy kivonat egy <filename>.lircrc</filename>
@@ -342 +342 @@
 begin
     button = CD_STOP
     prog = mplayer
-    config = seek 0 1\npause
+    config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -319 +319 @@
 Il nome dell'applicazione per <application>MPlayer</application> è
 - sorpresa - <filename>mplayer</filename>.
 Puoi usare qualsiasi comando di <application>MPlayer</application> e anche
-passare più di un comando separandoli con <literal>\n</literal>.
+passare più di un comando separandoli con <literal>\t</literal>.
 Non dimenticarti di abilitare l'opzione repeat in <filename>.lircrc</filename>
 quando ciò abbia senso (ricerca, volume, etc). Qui c'è un estratto di un
 <filename>.lircrc</filename> di esempio:
@@ -349 +349 @@
 begin
     button = CD_STOP
     prog = mplayer
-    config = seek 0 1\npause
+    config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -311 +311 @@
 Nazwa aplikacji dla <application>MPlayer</application> to - niespodzianka -
 <filename>mplayer</filename>. Możesz używać dowolnych komend
 <application>MPlayera</application>, a nawet podać więcej niż jedną
-komendę na raz oddzielając je za pomocą <literal>\n</literal>.
+komendę na raz oddzielając je za pomocą <literal>\t</literal>.
 Nie zapomnij o włączeniu flagi repeat w <filename>.lircrc</filename> jeśli
 ma to sens (skoki, głośność itp). To jest fragment przykładowego
 <filename>.lircrc</filename>:
@@ -341 +341 @@
 begin
     button = CD_STOP
     prog = mplayer
-    config = seek 0 1\npause
+    config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -305 +305 @@
 Имя приложения для <application>MPlayer</application> &mdash; угадайте &mdash;
 <filename>mplayer</filename>.  Вы можете использовать все команды mplayer'а и
 даже можете использовать более одной команды, разделив их символами
-<literal>\n</literal>. Не забудьте включить флаг repeat[повтор] в
+<literal>\t</literal>. Не забудьте включить флаг repeat[повтор] в
 <filename>.lircrc</filename>, когда это имеет смысл (перемещение, громкость
 и т.п.). Вот выдержка из моего <filename>.lircrc</filename>:
 </para>
@@ -334 +334 @@
 begin
     button = CD_STOP
     prog = mplayer
-    config = seek 0 1\npause
+    config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -308 +308 @@
 The application name for <application>MPlayer</application> is - surprise -
 <filename>mplayer</filename>. You can use any <application>MPlayer</application>
 commands and even pass more than one command by separating them with
-<literal>\n</literal>.
+<literal>\t</literal>.
 Do not forget to enable the repeat flag in <filename>.lircrc</filename> when
 it makes sense (seek, volume, etc). Here is an excerpt from a sample
 <filename>.lircrc</filename>:
@@ -338 +338 @@
 begin
     button = CD_STOP
     prog = mplayer
-    config = seek 0 1\npause
+    config = seek 0 1\tpause
 end<!--
 --></programlisting>
 

mplayer-svn2012Jan23-r34588-x86_64

@@ -67 +67 @@
 
 int mp_input_lirc_read(int fd,char* dest, int s) {
   int r,cl = 0;
-  char *code = NULL,*c = NULL;
+  char *ch = NULL,*code = NULL,*c = NULL;
 
   // We have something in the buffer return it
   if(cmd_buf != NULL) {
@@ -101 +101 @@
     cl += l+1;
     cmd_buf[cl-1] = '\n';
     cmd_buf[cl] = '\0';
+    // Replace multi-command delimiter '\t' for '\n'
+    ch = strstr(&cmd_buf[cl-l-1],"\t");
+    while(ch != NULL)
+    {       
+      *ch = '\n';
+      ch = strstr(ch,"\t");
+    }
   }
 
   free(code);