X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Ftcp.c;h=ecfe4a1b8964857ce3aaa7c7fc2096b6ba23a2d1;hb=13ae40b0efc4f1b1ce205d9a057537047fcab3f4;hp=af93a152ff59b860f08123c051f21a34028783f8;hpb=a0ed366e06c858fd9b0878c3986f3e16e91ce4dc;p=vlc diff --git a/modules/access/tcp.c b/modules/access/tcp.c index af93a152ff..ecfe4a1b89 100644 --- a/modules/access/tcp.c +++ b/modules/access/tcp.c @@ -18,40 +18,44 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include +#include +#include -#include "network.h" +#include /***************************************************************************** * Module descriptor *****************************************************************************/ #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for TCP streams. This " \ - "value should be set in millisecond units." ) + "Caching value for TCP streams. This " \ + "value should be set in milliseconds." ) static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_shortname( _("TCP") ); - set_description( _("TCP input") ); + set_shortname( N_("TCP") ); + set_description( N_("TCP input") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); add_integer( "tcp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, VLC_TRUE ); + CACHING_LONGTEXT, true ); - set_capability( "access2", 0 ); + set_capability( "access", 0 ); add_shortcut( "tcp" ); set_callbacks( Open, Close ); vlc_module_end(); @@ -65,7 +69,7 @@ struct access_sys_t }; -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 ); /***************************************************************************** @@ -87,7 +91,7 @@ static int Open( vlc_object_t *p_this ) psz_parser = psz_dup; } psz_parser = strchr( psz_parser, ':' ); - + if( psz_parser == NULL ) { msg_Err( p_access, "missing port number : %s", psz_dup ); @@ -98,19 +102,12 @@ static int Open( vlc_object_t *p_this ) *psz_parser++ = '\0'; /* Init p_access */ - p_access->pf_read = Read; - p_access->pf_block = NULL; - p_access->pf_control = Control; - p_access->pf_seek = NULL; - 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.i_title = 0; - p_access->info.i_seekpoint = 0; - p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); - - p_sys->fd = net_OpenTCP( p_access, psz_dup, atoi( psz_parser ) ); + access_InitFields( p_access ); \ + ACCESS_SET_CALLBACKS( Read, NULL, Control, NULL ); \ + MALLOC_ERR( p_access->p_sys, access_sys_t ); \ + p_sys = p_access->p_sys; memset( p_sys, 0, sizeof( access_sys_t ) ); + + p_sys->fd = net_ConnectTCP( p_access, psz_dup, atoi( psz_parser ) ); free( psz_dup ); if( p_sys->fd < 0 ) @@ -140,7 +137,7 @@ static void Close( vlc_object_t *p_this ) /***************************************************************************** * Read: read on a file descriptor, checking b_die periodically *****************************************************************************/ -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 = p_access->p_sys; int i_read; @@ -149,9 +146,9 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) return 0; i_read = net_Read( p_access, p_sys->fd, NULL, p_buffer, i_len, - VLC_FALSE ); + false ); if( i_read == 0 ) - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; else if( i_read > 0 ) p_access->info.i_pos += i_read; @@ -163,7 +160,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; @@ -172,16 +169,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_TRUE; /* FIXME */ + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; /* FIXME */ break; case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; /* FIXME */ + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; /* FIXME */ break; /* */ @@ -192,7 +189,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = (int64_t)var_GetInteger( p_access, "tcp-caching" ) * I64C(1000); + *pi_64 = (int64_t)var_GetInteger( p_access, "tcp-caching" ) * INT64_C(1000); break; /* */ @@ -204,6 +201,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: