X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Flirc.c;h=5688c97ab106c2e64038f3d05faf42d113b62ff3;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=46962c931c05ec37d497f0341f8f7c99806b3043;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/control/lirc.c b/modules/control/lirc.c index 46962c931c..5688c97ab1 100644 --- a/modules/control/lirc.c +++ b/modules/control/lirc.c @@ -1,10 +1,10 @@ /***************************************************************************** * lirc.c : lirc module for vlc ***************************************************************************** - * Copyright (C) 2003-2005 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2003-2005 the VideoLAN team * $Id$ * - * Author: Sigmund Augdal + * Author: Sigmund Augdal Helberg * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,47 +18,70 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include #include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include + +#ifdef HAVE_POLL +# include +#endif #include +#define LIRC_TEXT N_("Change the lirc configuration file") +#define LIRC_LONGTEXT N_( \ + "Tell lirc to read this configuration file. By default it " \ + "searches in the users home directory." ) + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +static int Open ( vlc_object_t * ); +static void Close ( vlc_object_t * ); + +vlc_module_begin () + set_shortname( N_("Infrared") ) + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_CONTROL ) + set_description( N_("Infrared remote control interface") ) + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) + + add_string( "lirc-file", NULL, NULL, + LIRC_TEXT, LIRC_LONGTEXT, true ) +vlc_module_end () + /***************************************************************************** * intf_sys_t: description and status of FB interface *****************************************************************************/ struct intf_sys_t { struct lirc_config *config; + + int i_fd; }; /***************************************************************************** * Local prototypes *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); -static void Run ( intf_thread_t * ); +static void Run( intf_thread_t * ); -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_CONTROL ); - set_description( _("Infrared remote control interface") ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); +static void Process( intf_thread_t * ); /***************************************************************************** * Open: initialize interface @@ -66,38 +89,43 @@ vlc_module_end(); static int Open( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; - int i_fd; + intf_sys_t *p_sys; + char *psz_file; /* Allocate instance and initialize some members */ - p_intf->p_sys = malloc( sizeof( intf_sys_t ) ); - if( p_intf->p_sys == NULL ) - { - msg_Err( p_intf, "out of memory" ); - return 1; - } + p_intf->p_sys = p_sys = malloc( sizeof( intf_sys_t ) ); + if( p_sys == NULL ) + return VLC_ENOMEM; p_intf->pf_run = Run; - i_fd = lirc_init( "vlc", 1 ); - if( i_fd == -1 ) + p_sys->i_fd = lirc_init( "vlc", 1 ); + if( p_sys->i_fd == -1 ) { - msg_Err( p_intf, "lirc_init failed" ); - free( p_intf->p_sys ); - return 1; + msg_Err( p_intf, "lirc initialisation failed" ); + goto exit; } /* We want polling */ - fcntl( i_fd, F_SETFL, fcntl( i_fd, F_GETFL ) | O_NONBLOCK ); + fcntl( p_sys->i_fd, F_SETFL, fcntl( p_sys->i_fd, F_GETFL ) | O_NONBLOCK ); - if( lirc_readconfig( NULL, &p_intf->p_sys->config, NULL ) != 0 ) + /* Read the configuration file */ + psz_file = var_CreateGetNonEmptyString( p_intf, "lirc-file" ); + if( lirc_readconfig( psz_file, &p_sys->config, NULL ) != 0 ) { - msg_Err( p_intf, "lirc_readconfig failed" ); - lirc_deinit(); - free( p_intf->p_sys ); - return 1; + msg_Err( p_intf, "failure while reading lirc config" ); + free( psz_file ); + goto exit; } + free( psz_file ); + + return VLC_SUCCESS; - return 0; +exit: + if( p_sys->i_fd != -1 ) + lirc_deinit(); + free( p_sys ); + return VLC_EGENERIC; } /***************************************************************************** @@ -106,11 +134,12 @@ static int Open( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; + intf_sys_t *p_sys = p_intf->p_sys; /* Destroy structure */ - lirc_freeconfig( p_intf->p_sys->config ); + lirc_freeconfig( p_sys->config ); lirc_deinit(); - free( p_intf->p_sys ); + free( p_sys ); } /***************************************************************************** @@ -118,39 +147,78 @@ static void Close( vlc_object_t *p_this ) *****************************************************************************/ static void Run( intf_thread_t *p_intf ) { - char *code, *c; + intf_sys_t *p_sys = p_intf->p_sys; - while( !p_intf->b_die ) + for( ;; ) { - /* Sleep a bit */ - msleep( INTF_IDLE_SLEEP ); - - /* We poll the lircsocket */ - if( lirc_nextcode(&code) != 0 ) - { + /* Wait for data */ + struct pollfd ufd = { .fd = p_sys->i_fd, .events = POLLIN, .revents = 0 }; + if( poll( &ufd, 1, -1 ) == -1 ) break; - } + + /* Process */ + int canc = vlc_savecancel(); + Process( p_intf ); + vlc_restorecancel(canc); + } +} + +static void Process( intf_thread_t *p_intf ) +{ + for( ;; ) + { + char *code, *c; + if( lirc_nextcode( &code ) ) + return; if( code == NULL ) - { - continue; - } + return; - while( !p_intf->b_die - && lirc_code2char( p_intf->p_sys->config, code, &c ) == 0 - && c != NULL ) + 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 ) ) + if( !strncmp( "key-", c, 4 ) ) { - 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" ); + vlc_key_t i_key = vlc_GetActionId( c ); + if( i_key ) + var_SetInteger( p_intf->p_libvlc, "key-action", i_key ); + else + msg_Err( p_intf, "Unknown hotkey '%s'", c ); + } + else if( !strncmp( "menu ", c, 5) ) + { + if( !strncmp( c, "menu on", 7 ) || + !strncmp( c, "menu show", 9 )) + osd_MenuShow( VLC_OBJECT(p_intf) ); + else if( !strncmp( c, "menu off", 8 ) || + !strncmp( c, "menu hide", 9 ) ) + osd_MenuHide( VLC_OBJECT(p_intf) ); + else if( !strncmp( c, "menu up", 7 ) ) + osd_MenuUp( VLC_OBJECT(p_intf) ); + else if( !strncmp( c, "menu down", 9 ) ) + osd_MenuDown( VLC_OBJECT(p_intf) ); + else if( !strncmp( c, "menu left", 9 ) ) + osd_MenuPrev( VLC_OBJECT(p_intf) ); + else if( !strncmp( c, "menu right", 10 ) ) + osd_MenuNext( VLC_OBJECT(p_intf) ); + else if( !strncmp( c, "menu select", 11 ) ) + osd_MenuActivate( VLC_OBJECT(p_intf) ); + else + { + msg_Err( p_intf, "Please provide one of the following parameters:" ); + msg_Err( p_intf, "[on|off|up|down|left|right|select]" ); + break; + } + } + 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" ); break; } - keyval.i_int = config_GetInt( p_intf, c ); - var_Set( p_intf->p_vlc, "key-pressed", keyval ); } free( code ); } } -