X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Ftcp.c;h=92861acde350eee74a4592dc58348bedb6a8bd32;hb=efac86c9fd5f5cf57c190c5951a4a3eb2e6b0f29;hp=a76359bcf15cae919ca4e9f3cb04f06e7fa4e7e0;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc diff --git a/modules/access/tcp.c b/modules/access/tcp.c index a76359bcf1..92861acde3 100644 --- a/modules/access/tcp.c +++ b/modules/access/tcp.c @@ -1,24 +1,24 @@ /***************************************************************************** * tcp.c: TCP input module ***************************************************************************** - * Copyright (C) 2003-2004 the VideoLAN team + * Copyright (C) 2003-2004 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -29,7 +29,8 @@ # include "config.h" #endif -#include +#include +#include #include #include @@ -37,27 +38,19 @@ /***************************************************************************** * Module descriptor *****************************************************************************/ -#define CACHING_TEXT N_("Caching value in ms") -#define CACHING_LONGTEXT N_( \ - "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_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - - add_integer( "tcp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, true ); +vlc_module_begin () + set_shortname( N_("TCP") ) + set_description( N_("TCP input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) - set_capability( "access2", 0 ); - add_shortcut( "tcp" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "access", 0 ) + add_shortcut( "tcp" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -79,7 +72,7 @@ static int Open( vlc_object_t *p_this ) access_t *p_access = (access_t *)p_this; access_sys_t *p_sys; - char *psz_dup = strdup(p_access->psz_path); + char *psz_dup = strdup(p_access->psz_location); char *psz_parser = psz_dup; /* Parse server:port */ @@ -101,10 +94,14 @@ static int Open( vlc_object_t *p_this ) *psz_parser++ = '\0'; /* Init p_access */ - 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 ) ); + access_InitFields( p_access ); + ACCESS_SET_CALLBACKS( Read, NULL, Control, NULL ); + p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ) ); + if( !p_sys ) + { + free( psz_dup ); + return VLC_ENOMEM; + } p_sys->fd = net_ConnectTCP( p_access, psz_dup, atoi( psz_parser ) ); free( psz_dup ); @@ -115,9 +112,6 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - /* Update default_pts to a suitable value for udp access */ - var_Create( p_access, "tcp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - return VLC_SUCCESS; } @@ -134,7 +128,7 @@ static void Close( vlc_object_t *p_this ) } /***************************************************************************** - * Read: read on a file descriptor, checking b_die periodically + * Read: read on a file descriptor *****************************************************************************/ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { @@ -159,9 +153,8 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - bool *pb_bool; - int *pi_int; - int64_t *pi_64; + bool *pb_bool; + int64_t *pi_64; switch( i_query ) { @@ -180,15 +173,10 @@ static int Control( access_t *p_access, int i_query, va_list args ) *pb_bool = true; /* FIXME */ break; - /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; - break; - 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_C(1000) + * var_InheritInteger( p_access, "network-caching" ); break; /* */