#include <fcntl.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_osd.h>
+#include <vlc_keys.h>
+
+#ifdef HAVE_POLL
+# include <poll.h>
+#endif
#include <lirc/lirc_client.h>
-#define LIRC_TEXT N_("Change the lirc configuration file.")
+#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
{
- char *psz_file;
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 * );
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin();
- set_shortname( _("Infrared") );
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_CONTROL );
- set_description( _("Infrared remote control interface") );
- set_capability( "interface", 0 );
- set_callbacks( Open, Close );
+static void Run( intf_thread_t * );
- add_string( "lirc-file", NULL, NULL,
- LIRC_TEXT, LIRC_LONGTEXT, VLC_TRUE );
-vlc_module_end();
+static void Process( intf_thread_t * );
/*****************************************************************************
* Open: initialize interface
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;
- p_intf->p_sys->psz_file = var_CreateGetNonEmptyString( p_intf, "lirc-file" );
-
- 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 initialisation failed" );
- free( p_intf->p_sys );
- return 1;
+ 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( p_intf->p_sys->psz_file, &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, "failure while reading lirc config" );
- lirc_deinit();
- free( p_intf->p_sys );
- return 1;
+ free( psz_file );
+ goto exit;
}
+ free( psz_file );
- return 0;
+ return VLC_SUCCESS;
+
+exit:
+ if( p_sys->i_fd != -1 )
+ lirc_deinit();
+ free( p_sys );
+ return VLC_EGENERIC;
}
/*****************************************************************************
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 */
- if( p_intf->p_sys->psz_file )
- free( p_intf->p_sys->psz_file );
- lirc_freeconfig( p_intf->p_sys->config );
+ lirc_freeconfig( p_sys->config );
lirc_deinit();
- free( p_intf->p_sys );
+ free( p_sys );
}
/*****************************************************************************
*****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
- char *code, *c;
+ intf_sys_t *p_sys = p_intf->p_sys;
- while( !intf_ShouldDie( p_intf ) )
+ 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( !intf_ShouldDie( p_intf )
+ 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 );
+ 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) )
{
osd_MenuActivate( VLC_OBJECT(p_intf) );
else
{
- msg_Err( p_intf, _("Please provide one of the following parameters:") );
+ 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" );
+ 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;
}
}
projects / vlc / blobdiff