vlc_module_begin ()
set_shortname( "EyeTV" )
- set_description( N_("EyeTV access module") )
+ set_description( N_("EyeTV input") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
- add_integer( "eyetv-channel", 0, NULL,
- CHANNEL_TEXT, CHANNEL_LONGTEXT, false );
+ add_integer( "eyetv-channel", 0,
+ CHANNEL_TEXT, CHANNEL_LONGTEXT, false )
set_capability( "access", 0 )
add_shortcut( "eyetv" )
set_callbacks( Open, Close )
- add_integer( "eyetv-caching", DEFAULT_PTS_DELAY / 1000, NULL,
+ add_integer( "eyetv-caching", DEFAULT_PTS_DELAY / 1000,
CACHING_TEXT, CACHING_LONGTEXT, true);
vlc_module_end ()
struct sockaddr_un publicAddr, peerAddr;
int publicSock;
- vlc_value_t val;
-
/* Init p_access */
- access_InitFields( p_access ); \
- ACCESS_SET_CALLBACKS( NULL, BlockRead, Control, NULL ); \
- MALLOC_ERR( p_access->p_sys, access_sys_t ); \
- p_access->info.b_prebuffered = false;
-
- p_sys = p_access->p_sys; memset( p_sys, 0, sizeof( access_sys_t ) );
- p_sys->i_pts_delay = var_CreateGetInteger( p_access, "eyetv-caching" );
+ access_InitFields( p_access );
+ ACCESS_SET_CALLBACKS( NULL, BlockRead, Control, NULL );
+ p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- var_Create( p_access, "eyetv-channel", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "eyetv-channel", &val);
+ p_sys->i_pts_delay = var_InheritInteger( p_access, "eyetv-caching" );
msg_Dbg( p_access, "coming up" );
-
- selectChannel(p_this, val.i_int);
+ selectChannel( p_this, var_InheritInteger( p_access, "eyetv-channel" ) );
/* socket */
memset(&publicAddr, 0, sizeof(publicAddr));
return VLC_EGENERIC;
}
- publicSock = socket(AF_UNIX, SOCK_STREAM, 0);
+ publicSock = socket(PF_UNIX, SOCK_STREAM, 0);
if( publicSock == -1 )
{
msg_Err( p_access, "create local socket failed (errno=%d)", errno );
break;
/* */
- case ACCESS_GET_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = MTU;
- break;
-
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = (int64_t) p_sys->i_pts_delay * 1000;