new rule for remote controls with combined play/pause button (like mine has)

diff --git a/doc/lirc/example.lircrc b/doc/lirc/example.lircrc
index ccd868f25d2e8a3a2cb2f5666a0ec2c2be8a1815..24678674a5c0fac45d9e37ee14a98b094697657f 100644 (file)
--- a/doc/lirc/example.lircrc
+++ b/doc/lirc/example.lircrc
@@ -1,10 +1,26 @@
+# This is an example .lircrc file that shows the different config strings that
+# vlc understand. button names are from an animax remote, and these may change
+# with different remotes
+
 begin
   prog = vlc
   button = PLAY_UP
   config = PLAY
+end
+
+begin
+  prog = vlc
+  button = PAUSE_UP
   config = PAUSE
 end
 
+#use this target if you have a combined play/pause button
+begin
+  prog = vlc
+  button = PLAY_UP
+  config = PLAYPAUSE
+end
+
 begin
   prog = vlc
   button = STOP_UP
@@ -26,7 +42,7 @@ end
 begin
   prog = vlc
   button = SKIP_BACKWARD
-  config = LAST
+  config = PREV
 end
 
 begin

diff --git a/modules/control/lirc/lirc.c b/modules/control/lirc/lirc.c
index 230e5d0db196dbbc3baec78e509a45e659adaf36..53c0907c4e79b8582272f2ff97a248840dec779a 100644 (file)
--- a/modules/control/lirc/lirc.c
+++ b/modules/control/lirc/lirc.c
@@ -2,7 +2,7 @@
  * lirc.c : lirc plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: lirc.c,v 1.1 2002/08/04 17:23:42 sam Exp $
+ * $Id: lirc.c,v 1.2 2003/01/12 01:26:36 sigmunau Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -197,6 +197,29 @@ static void Run( intf_thread_t *p_intf )
                     }
                 }
             }
+            if( !strcmp( c, "PLAYPAUSE" ) )
+            {
+                if( p_intf->p_sys->p_input &&
+                    p_intf->p_sys->p_input->stream.control.i_status != PAUSE_S )
+                {
+                    input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PAUSE );
+                }
+                else
+                {
+                    p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                                  FIND_ANYWHERE );
+                    if( p_playlist )
+                    {
+                        vlc_mutex_lock( &p_playlist->object_lock );
+                        if( p_playlist->i_size )
+                        {
+                            vlc_mutex_unlock( &p_playlist->object_lock );
+                            playlist_Play( p_playlist );
+                            vlc_object_release( p_playlist );
+                        }
+                    }
+                }                    
+            }                
             else if( p_intf->p_sys->p_input )
             {
                 p_input = p_intf->p_sys->p_input;