* Preamble
*****************************************************************************/
+#include <errno.h>
#include <fcntl.h>
#ifdef HAVE_CONFIG_H
#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>
#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." )
set_capability( "interface", 0 )
set_callbacks( Open, Close )
- add_string( "lirc-file", NULL, NULL,
- LIRC_TEXT, LIRC_LONGTEXT, true );
+ add_string( "lirc-file", NULL,
+ LIRC_TEXT, LIRC_LONGTEXT, true )
vlc_module_end ()
/*****************************************************************************
*****************************************************************************/
struct intf_sys_t
{
- char *psz_file;
struct lirc_config *config;
-
+ vlc_thread_t thread;
int i_fd;
};
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void Run( intf_thread_t * );
+static void *Run( void * );
-static int Process( intf_thread_t * );
+static void Process( intf_thread_t * );
/*****************************************************************************
* Open: initialize interface
if( p_sys == NULL )
return VLC_ENOMEM;
- p_intf->pf_run = Run;
-
- p_sys->psz_file = var_CreateGetNonEmptyString( p_intf, "lirc-file" );
p_sys->i_fd = lirc_init( "vlc", 1 );
if( p_sys->i_fd == -1 )
{
msg_Err( p_intf, "lirc initialisation failed" );
- goto exit;
+ goto error;
}
/* We want polling */
fcntl( p_sys->i_fd, F_SETFL, fcntl( p_sys->i_fd, F_GETFL ) | O_NONBLOCK );
- /* */
- if( lirc_readconfig( p_sys->psz_file, &p_sys->config, NULL ) != 0 )
+ /* Read the configuration file */
+ char *psz_file = var_InheritString( p_intf, "lirc-file" );
+ int val = lirc_readconfig( psz_file, &p_sys->config, NULL );
+ free( psz_file );
+ if( val != 0 )
{
msg_Err( p_intf, "failure while reading lirc config" );
- goto exit;
+ lirc_deinit();
+ goto error;
+ }
+
+ if( vlc_clone( &p_sys->thread, Run, p_intf, VLC_THREAD_PRIORITY_LOW ) )
+ {
+ lirc_freeconfig( p_sys->config );
+ lirc_deinit();
+ goto error;
}
return VLC_SUCCESS;
-exit:
- if( p_sys->i_fd != -1 )
- lirc_deinit();
- free( p_sys->psz_file );
+error:
free( p_sys );
return VLC_EGENERIC;
}
intf_thread_t *p_intf = (intf_thread_t *)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
+ vlc_cancel( p_sys->thread );
+ vlc_join( p_sys->thread, NULL );
+
/* Destroy structure */
lirc_freeconfig( p_sys->config );
lirc_deinit();
- free( p_sys->psz_file );
free( p_sys );
}
/*****************************************************************************
* Run: main loop
*****************************************************************************/
-static void Run( intf_thread_t *p_intf )
+static void *Run( void *data )
{
+ intf_thread_t *p_intf = data;
intf_sys_t *p_sys = p_intf->p_sys;
+ struct pollfd ufd;
+ ufd.fd = p_sys->i_fd;
+ ufd.events = POLLIN;
+
for( ;; )
{
/* Wait for data */
- struct pollfd ufd = { .fd = p_sys->i_fd, .events = POLLIN, .revents = 0 };
if( poll( &ufd, 1, -1 ) == -1 )
+ {
+ if( errno == EINTR )
+ continue;
break;
+ }
/* Process */
int canc = vlc_savecancel();
Process( p_intf );
vlc_restorecancel(canc);
}
+ return NULL;
}
-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)
+ while( (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 );
- }
- 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) );
+ vlc_action_t i_key = vlc_GetActionId( c );
+ if( i_key )
+ var_SetInteger( p_intf->p_libvlc, "key-action", i_key );
else
- {
- msg_Err( p_intf, "Please provide one of the following parameters:" );
- msg_Err( p_intf, "[on|off|up|down|left|right|select]" );
- break;
- }
+ msg_Err( p_intf, "Unknown hotkey '%s'", c );
}
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