[vlc-devel] commit: lirc: clean up. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Mon Dec 28 18:14:18 2009 +0100| [ab2c173ab782250af7bd37924f6607fb6f705c1f] | committer: Rémi Duraffort 

lirc: clean up.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab2c173ab782250af7bd37924f6607fb6f705c1f
---

 modules/control/lirc.c |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index d57a6c3..2391874 100644
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -80,7 +80,7 @@ struct intf_sys_t
  *****************************************************************************/
 static void Run( intf_thread_t * );
 
-static int  Process( intf_thread_t * );
+static void Process( intf_thread_t * );
 
 /*****************************************************************************
  * Open: initialize interface
@@ -162,29 +162,25 @@ static void Run( intf_thread_t *p_intf )
     }
 }
 
-static int Process( intf_thread_t *p_intf )
+static void Process( intf_thread_t *p_intf )
 {
     for( ;; )
     {
         char *code, *c;
-        int i_ret = lirc_nextcode( &code );
-
-        if( i_ret )
-            return i_ret;
+        if( lirc_nextcode( &code ) )
+            return;
 
         if( code == NULL )
-            return 0;
+            return;
 
         while( vlc_object_alive( p_intf )
                 && (lirc_code2char( p_intf->p_sys->config, code, &c ) == 0)
                 && (c != NULL) )
         {
-            vlc_value_t keyval;
-
             if( !strncmp( "key-", c, 4 ) )
             {
-                keyval.i_int = config_GetInt( p_intf, c );
-                var_Set( p_intf->p_libvlc, "key-pressed", keyval );
+                int i_keyval = config_GetInt( p_intf, c );
+                var_SetInteger( p_intf->p_libvlc, "key-pressed", i_keyval );
             }
             else if( !strncmp( "menu ", c, 5)  )
             {
@@ -213,7 +209,9 @@ static int Process( intf_thread_t *p_intf )
             }
             else
             {
-                msg_Err( p_intf, "this doesn't appear to be a valid keycombo lirc sent us. Please look at the doc/lirc/example.lirc file in VLC" );
+                msg_Err( p_intf, "this doesn't appear to be a valid keycombo "
+                                 "lirc sent us. Please look at the "
+                                 "doc/lirc/example.lirc file in VLC" );
                 break;
             }
         }