Unexport block_FifoWake()

[vlc] / modules / control / lirc.c

diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index 5688c97ab106c2e64038f3d05faf42d113b62ff3..03e15aee2a59f33739c30e585ed66cfcf0dee49c 100644 (file)
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -25,6 +25,7 @@
  * Preamble
  *****************************************************************************/
 
+#include <errno.h>
 #include <fcntl.h>
 
 #ifdef HAVE_CONFIG_H
@@ -62,7 +63,7 @@ vlc_module_begin ()
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
 
-    add_string( "lirc-file", NULL, NULL,
+    add_string( "lirc-file", NULL,
                 LIRC_TEXT, LIRC_LONGTEXT, true )
 vlc_module_end ()
 
@@ -154,7 +155,12 @@ static void Run( intf_thread_t *p_intf )
         /* Wait for data */
         struct pollfd ufd = { .fd = p_sys->i_fd, .events = POLLIN, .revents = 0 };
         if( poll( &ufd, 1, -1 ) == -1 )
-            break;
+        {
+            if( errno == EINTR )
+                continue;
+            else
+                break;
+        }
 
         /* Process */
         int canc = vlc_savecancel();
@@ -180,7 +186,7 @@ static void Process( intf_thread_t *p_intf )
         {
             if( !strncmp( "key-", c, 4 ) )
             {
-                vlc_key_t i_key = vlc_GetActionId( c );
+                vlc_action_t i_key = vlc_GetActionId( c );
                 if( i_key )
                     var_SetInteger( p_intf->p_libvlc, "key-action", i_key );
                 else