X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fpvr.c;h=c7e3b6edd096a1704f9936ebf53db37df7f44de3;hb=01744abf01e4a5389a19bfdabfa1c613c6c363c1;hp=52c197ce6ee77b2bbe6965686af8bc8089d7b3a6;hpb=552e595131c5f1d66eba8e3c22c2b1c509be5153;p=vlc diff --git a/modules/access/pvr.c b/modules/access/pvr.c index 52c197ce6e..c7e3b6edd0 100644 --- a/modules/access/pvr.c +++ b/modules/access/pvr.c @@ -25,7 +25,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -109,56 +114,56 @@ static void Close( vlc_object_t * ); #define CHAN_LONGTEXT N_( "Channel of the card to use (Usually, 0 = tuner, " \ "1 = composite, 2 = svideo)" ) -static int i_norm_list[] = +static const int i_norm_list[] = { V4L2_STD_UNKNOWN, V4L2_STD_SECAM, V4L2_STD_PAL, V4L2_STD_NTSC }; -static const char *psz_norm_list_text[] = +static const char *const psz_norm_list_text[] = { N_("Automatic"), N_("SECAM"), N_("PAL"), N_("NTSC") }; -static int i_bitrates[] = { 0, 1 }; -static const char *psz_bitrates_list_text[] = { N_("vbr"), N_("cbr") }; +static const int i_bitrates[] = { 0, 1 }; +static const char *const psz_bitrates_list_text[] = { N_("vbr"), N_("cbr") }; -static int pi_radio_range[2] = { 65000, 108000 }; +static const int pi_radio_range[2] = { 65000, 108000 }; vlc_module_begin(); - set_shortname( _("PVR") ); - set_description( _("IVTV MPEG Encoding cards input") ); + set_shortname( N_("PVR") ); + set_description( N_("IVTV MPEG Encoding cards input") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); - set_capability( "access2", 0 ); + set_capability( "access", 0 ); add_shortcut( "pvr" ); add_integer( "pvr-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, VLC_TRUE ); + CACHING_LONGTEXT, true ); add_string( "pvr-device", "/dev/video0", NULL, DEVICE_TEXT, - DEVICE_LONGTEXT, VLC_FALSE ); + DEVICE_LONGTEXT, false ); add_string( "pvr-radio-device", "/dev/radio0", NULL, RADIO_DEVICE_TEXT, - RADIO_DEVICE_LONGTEXT, VLC_FALSE ); + RADIO_DEVICE_LONGTEXT, false ); add_integer( "pvr-norm", V4L2_STD_UNKNOWN , NULL, NORM_TEXT, - NORM_LONGTEXT, VLC_FALSE ); + NORM_LONGTEXT, false ); change_integer_list( i_norm_list, psz_norm_list_text, 0 ); - add_integer( "pvr-width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE ); + add_integer( "pvr-width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ); add_integer( "pvr-height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, - VLC_TRUE ); + true ); add_integer( "pvr-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT, - VLC_FALSE ); + false ); add_integer( "pvr-framerate", -1, NULL, FRAMERATE_TEXT, FRAMERATE_LONGTEXT, - VLC_TRUE ); + true ); add_integer( "pvr-keyint", -1, NULL, KEYINT_TEXT, KEYINT_LONGTEXT, - VLC_TRUE ); + true ); add_integer( "pvr-bframes", -1, NULL, FRAMERATE_TEXT, FRAMERATE_LONGTEXT, - VLC_TRUE ); + true ); add_integer( "pvr-bitrate", -1, NULL, BITRATE_TEXT, BITRATE_LONGTEXT, - VLC_FALSE ); + false ); add_integer( "pvr-bitrate-peak", -1, NULL, BITRATE_PEAK_TEXT, - BITRATE_PEAK_LONGTEXT, VLC_TRUE ); + BITRATE_PEAK_LONGTEXT, true ); add_integer( "pvr-bitrate-mode", -1, NULL, BITRATE_MODE_TEXT, - BITRATE_MODE_LONGTEXT, VLC_TRUE ); + BITRATE_MODE_LONGTEXT, true ); change_integer_list( i_bitrates, psz_bitrates_list_text, 0 ); add_integer( "pvr-audio-bitmask", -1, NULL, BITMASK_TEXT, - BITMASK_LONGTEXT, VLC_TRUE ); + BITMASK_LONGTEXT, true ); add_integer( "pvr-audio-volume", -1, NULL, VOLUME_TEXT, - VOLUME_LONGTEXT, VLC_TRUE ); - add_integer( "pvr-channel", -1, NULL, CHAN_TEXT, CHAN_LONGTEXT, VLC_TRUE ); + VOLUME_LONGTEXT, true ); + add_integer( "pvr-channel", -1, NULL, CHAN_TEXT, CHAN_LONGTEXT, true ); set_callbacks( Open, Close ); vlc_module_end(); @@ -166,7 +171,7 @@ vlc_module_end(); /***************************************************************************** * Prototypes *****************************************************************************/ -static int Read ( access_t *, uint8_t *, int ); +static ssize_t Read ( access_t *, uint8_t *, size_t ); static int Control( access_t *, int, va_list ); /* ivtv specific ioctls */ @@ -218,7 +223,7 @@ struct access_sys_t int i_volume; /* driver version */ - vlc_bool_t b_v4l2_api; + bool b_v4l2_api; }; /***************************************************************************** @@ -556,7 +561,7 @@ static int Open( vlc_object_t * p_this ) p_access->info.i_update = 0; p_access->info.i_size = 0; p_access->info.i_pos = 0; - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; p_access->info.i_title = 0; p_access->info.i_seekpoint = 0; @@ -822,8 +827,7 @@ static int Open( vlc_object_t * p_this ) if( psz_device ) { - if( p_sys->psz_videodev ) - free( p_sys->psz_videodev ); + free( p_sys->psz_videodev ); p_sys->psz_videodev = psz_device; } @@ -841,25 +845,29 @@ static int Open( vlc_object_t * p_this ) result = ioctl( p_sys->i_fd, VIDIOC_QUERYCAP, &device_capability ); if( result < 0 ) { - msg_Err( p_access, "unknown ivtv driver version in use" ); + msg_Err( p_access, "unknown ivtv/pvr driver version in use" ); Close( VLC_OBJECT(p_access) ); return VLC_EGENERIC; } - msg_Dbg( p_access, "ivtv driver version %02x.%02x.%02x", + msg_Dbg( p_access, "%s driver (%s on %s) version %02x.%02x.%02x", + device_capability.driver, + device_capability.card, + device_capability.bus_info, ( device_capability.version >> 16 ) & 0xff, ( device_capability.version >> 8 ) & 0xff, ( device_capability.version ) & 0xff); - if ( device_capability.version >= 0x000800 ) + if ( strncmp( (char *) device_capability.driver, "ivtv", 4 ) + || device_capability.version >= 0x000800 ) { /* Drivers > 0.8.0 use v4l2 API instead of IVTV ioctls */ msg_Dbg( p_access, "this driver uses the v4l2 API" ); - p_sys->b_v4l2_api = VLC_TRUE; + p_sys->b_v4l2_api = true; } else { - p_sys->b_v4l2_api = VLC_FALSE; + p_sys->b_v4l2_api = false; } /* set the input */ @@ -1053,17 +1061,15 @@ static void Close( vlc_object_t * p_this ) close( p_sys->i_fd ); if ( p_sys->i_radio_fd != -1 ) close( p_sys->i_radio_fd ); - if ( p_sys->psz_videodev ) - free( p_sys->psz_videodev ); - if ( p_sys->psz_radiodev ) - free( p_sys->psz_radiodev ); + free( p_sys->psz_videodev ); + free( p_sys->psz_radiodev ); free( p_sys ); } /***************************************************************************** * Read *****************************************************************************/ -static int Read( access_t * p_access, uint8_t * p_buffer, int i_len ) +static ssize_t Read( access_t * p_access, uint8_t * p_buffer, size_t i_len ) { access_sys_t *p_sys = (access_sys_t *) p_access->p_sys; struct pollfd ufd; @@ -1093,7 +1099,7 @@ static int Read( access_t * p_access, uint8_t * p_buffer, int i_len ) i_ret = read( p_sys->i_fd, p_buffer, i_len ); if( i_ret == 0 ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; } else if( i_ret > 0 ) { @@ -1108,7 +1114,7 @@ static int Read( access_t * p_access, uint8_t * p_buffer, int i_len ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - vlc_bool_t *pb_bool; + bool *pb_bool; int *pi_int; int64_t *pi_64; @@ -1117,16 +1123,16 @@ static int Control( access_t *p_access, int i_query, va_list args ) /* */ case ACCESS_CAN_SEEK: case ACCESS_CAN_FASTSEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; break; case ACCESS_CAN_PAUSE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; break; case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; break; /* */ @@ -1149,6 +1155,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: