#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
+#include <vlc_fs.h>
+#include <vlc_url.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include <errno.h>
#include <linux/types.h>
#include <sys/ioctl.h>
#include <sys/poll.h>
add_shortcut( "pvr" )
add_integer( "pvr-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
- CACHING_LONGTEXT, true );
+ CACHING_LONGTEXT, true )
add_string( "pvr-device", "/dev/video0", NULL, DEVICE_TEXT,
- DEVICE_LONGTEXT, false );
+ DEVICE_LONGTEXT, false )
add_string( "pvr-radio-device", "/dev/radio0", NULL, RADIO_DEVICE_TEXT,
- RADIO_DEVICE_LONGTEXT, false );
+ RADIO_DEVICE_LONGTEXT, false )
add_integer( "pvr-norm", V4L2_STD_UNKNOWN , NULL, NORM_TEXT,
- NORM_LONGTEXT, false );
- change_integer_list( i_norm_list, psz_norm_list_text, NULL );
+ NORM_LONGTEXT, false )
+ change_integer_list( i_norm_list, psz_norm_list_text, NULL )
add_integer( "pvr-width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true )
add_integer( "pvr-height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT,
- true );
+ true )
add_integer( "pvr-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT,
- false );
+ false )
add_integer( "pvr-framerate", -1, NULL, FRAMERATE_TEXT, FRAMERATE_LONGTEXT,
- true );
+ true )
add_integer( "pvr-keyint", -1, NULL, KEYINT_TEXT, KEYINT_LONGTEXT,
- true );
+ true )
add_integer( "pvr-bframes", -1, NULL, FRAMERATE_TEXT, FRAMERATE_LONGTEXT,
- true );
+ true )
add_integer( "pvr-bitrate", -1, NULL, BITRATE_TEXT, BITRATE_LONGTEXT,
- false );
+ false )
add_integer( "pvr-bitrate-peak", -1, NULL, BITRATE_PEAK_TEXT,
- BITRATE_PEAK_LONGTEXT, true );
+ BITRATE_PEAK_LONGTEXT, true )
add_integer( "pvr-bitrate-mode", -1, NULL, BITRATE_MODE_TEXT,
- BITRATE_MODE_LONGTEXT, true );
- change_integer_list( i_bitrates, psz_bitrates_list_text, NULL );
+ BITRATE_MODE_LONGTEXT, true )
+ change_integer_list( i_bitrates, psz_bitrates_list_text, NULL )
add_integer( "pvr-audio-bitmask", -1, NULL, BITMASK_TEXT,
- BITMASK_LONGTEXT, true );
+ BITMASK_LONGTEXT, true )
add_integer( "pvr-audio-volume", -1, NULL, VOLUME_TEXT,
- VOLUME_LONGTEXT, true );
+ VOLUME_LONGTEXT, true )
add_integer( "pvr-channel", -1, NULL, CHAN_TEXT, CHAN_LONGTEXT, true )
set_callbacks( Open, Close )
access_sys_t * p_sys;
char * psz_tofree;
char * psz_parser;
- vlc_value_t val;
struct v4l2_capability device_capability;
int result;
/* defaults values */
var_Create( p_access, "pvr-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_access, "pvr-device", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-device" , &val);
- p_sys->psz_videodev = val.psz_string;
-
- var_Create( p_access, "pvr-radio-device", VLC_VAR_STRING |
- VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-radio-device" , &val);
- p_sys->psz_radiodev = val.psz_string;
-
- var_Create( p_access, "pvr-norm", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-norm" , &val);
- p_sys->i_standard = val.i_int;
-
- var_Create( p_access, "pvr-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-width" , &val);
- p_sys->i_width = val.i_int;
-
- var_Create( p_access, "pvr-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-height" , &val);
- p_sys->i_height = val.i_int;
-
- var_Create( p_access, "pvr-frequency", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-frequency" , &val);
- p_sys->i_frequency = val.i_int;
-
- var_Create( p_access, "pvr-framerate", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-framerate" , &val);
- p_sys->i_framerate = val.i_int;
-
- var_Create( p_access, "pvr-keyint", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-keyint" , &val);
- p_sys->i_keyint = val.i_int;
-
- var_Create( p_access, "pvr-bframes", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-bframes" , &val);
- p_sys->i_bframes = val.b_bool;
-
- var_Create( p_access, "pvr-bitrate", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-bitrate" , &val);
- p_sys->i_bitrate = val.i_int;
-
- var_Create( p_access, "pvr-bitrate-peak", VLC_VAR_INTEGER |
- VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-bitrate-peak" , &val);
- p_sys->i_bitrate_peak = val.i_int;
-
- var_Create( p_access, "pvr-bitrate-mode", VLC_VAR_INTEGER |
- VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-bitrate-mode" , &val);
- p_sys->i_bitrate_mode = val.i_int;
-
- var_Create( p_access, "pvr-audio-bitmask", VLC_VAR_INTEGER |
- VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-audio-bitmask" , &val);
- p_sys->i_audio_bitmask = val.i_int;
-
- var_Create( p_access, "pvr-audio-volume", VLC_VAR_INTEGER |
- VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-audio-volume" , &val);
- p_sys->i_volume = val.i_int;
-
- var_Create( p_access, "pvr-channel", VLC_VAR_INTEGER |
- VLC_VAR_DOINHERIT );
- var_Get( p_access, "pvr-channel" , &val);
- p_sys->i_input = val.i_int;
+ p_sys->psz_videodev = var_InheritString( p_access, "pvr-device" );
+ p_sys->psz_radiodev = var_InheritString( p_access, "pvr-radio-device" );
+ p_sys->i_standard = var_InheritInteger( p_access, "pvr-norm" );
+ p_sys->i_width = var_InheritInteger( p_access, "pvr-width" );
+ p_sys->i_height = var_InheritInteger( p_access, "pvr-height" );
+ p_sys->i_frequency = var_InheritInteger( p_access, "pvr-frequency" );
+ p_sys->i_framerate = var_InheritInteger( p_access, "pvr-framerate" );
+ p_sys->i_keyint = var_InheritInteger( p_access, "pvr-keyint" );
+ p_sys->i_bframes = var_InheritInteger( p_access, "pvr-bframes" );
+ p_sys->i_bitrate = var_InheritInteger( p_access, "pvr-bitrate" );
+ p_sys->i_bitrate_peak = var_InheritInteger( p_access, "pvr-bitrate-peak" );
+ p_sys->i_bitrate_mode = var_InheritInteger( p_access, "pvr-bitrate-mode" );
+ p_sys->i_audio_bitmask = var_InheritInteger( p_access, "pvr-audio-bitmask" );
+ p_sys->i_volume = var_InheritInteger( p_access, "pvr-audio-volume" );
+ p_sys->i_input = var_InheritInteger( p_access, "pvr-channel" );
/* parse command line options */
- psz_tofree = strdup( p_access->psz_path );
+ psz_tofree = strdup( p_access->psz_location );
if( !psz_tofree )
- return VLC_ENOMEM; /* <-- FIXME MEMORY LEAK */
+ {
+ free( p_sys->psz_radiodev );
+ free( p_sys->psz_videodev );
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
psz_parser = psz_tofree;
while( *psz_parser )
if( *psz_parser == '/' )
{
free( p_sys->psz_videodev );
- p_sys->psz_videodev = strdup( psz_parser );
+ p_sys->psz_videodev = decode_URI_duplicate( psz_parser );
break;
}
free( psz_tofree );
/* open the device */
- p_sys->i_fd = open( p_sys->psz_videodev, O_RDWR );
+ p_sys->i_fd = vlc_open( p_sys->psz_videodev, O_RDWR );
if( p_sys->i_fd < 0 )
{
msg_Err( p_access, "Cannot open device %s (%m).",
if ( (p_sys->i_frequency >= pi_radio_range[0])
&& (p_sys->i_frequency <= pi_radio_range[1]) )
{
- p_sys->i_radio_fd = open( p_sys->psz_radiodev, O_RDWR );
+ p_sys->i_radio_fd = vlc_open( p_sys->psz_radiodev, O_RDWR );
if( p_sys->i_radio_fd < 0 )
{
msg_Err( p_access, "Cannot open radio device (%m)." );
static int Control( access_t *p_access, int i_query, va_list args )
{
bool *pb_bool;
- int *pi_int;
int64_t *pi_64;
switch( i_query )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "pvr-caching" ) * 1000;
+ *pi_64 = var_GetInteger( p_access, "pvr-caching" ) * 1000;
break;
/* */
projects / vlc / blobdiff