X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Faccess.c;h=3052f92fc66d06eff9754bf04a31a842a69481be;hb=f94a2f9c4a4c7979d9695bb240686c73b6cf7e00;hp=4a4c74a8b918cef7d3b0d6c3041bdd12df77820a;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc diff --git a/src/input/access.c b/src/input/access.c index 4a4c74a8b9..3052f92fc6 100644 --- a/src/input/access.c +++ b/src/input/access.c @@ -2,7 +2,7 @@ * access.c ***************************************************************************** * Copyright (C) 1999-2004 the VideoLAN team - * $Id: demux.c 7546 2004-04-29 13:53:29Z gbazin $ + * $Id$ * * Author: Laurent Aimar * @@ -18,29 +18,28 @@ * * 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. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include #include "input_internal.h" /***************************************************************************** - * access2_InternalNew: + * access_InternalNew: *****************************************************************************/ -static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access, - char *psz_demux, char *psz_path, - access_t *p_source, vlc_bool_t b_quick ) +static access_t *access_InternalNew( vlc_object_t *p_obj, const char *psz_access, + const char *psz_demux, const char *psz_path, + access_t *p_source ) { access_t *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS ); if( p_access == NULL ) - { - msg_Err( p_obj, "vlc_object_create() failed" ); return NULL; - } /* Parse URL */ p_access->p_source = p_source; @@ -48,20 +47,15 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access, { msg_Dbg( p_obj, "creating access filter '%s'", psz_access ); p_access->psz_access = strdup( p_source->psz_access ); - p_access->psz_path = strdup( p_source->psz_path ); - p_access->psz_demux = strdup( p_source->psz_demux ); } else { + msg_Dbg( p_obj, "creating access '%s' path='%s'", + psz_access, psz_path ); p_access->psz_path = strdup( psz_path ); - p_access->psz_access = - b_quick ? strdup( "file" ) : strdup( psz_access ); - p_access->psz_demux = strdup( psz_demux ); - - if( !b_quick ) - msg_Dbg( p_obj, "creating access '%s' path='%s'", - psz_access, psz_path ); } + p_access->psz_access = strdup( psz_access ); + p_access->psz_demux = strdup( psz_demux ); p_access->pf_read = NULL; p_access->pf_block = NULL; @@ -71,7 +65,8 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access, 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.b_prebuffered = false; p_access->info.i_title = 0; p_access->info.i_seekpoint = 0; @@ -79,25 +74,18 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access, /* Before module_Need (for var_Create...) */ vlc_object_attach( p_access, p_obj ); - if( p_source ) - { - p_access->p_module = - module_Need( p_access, "access_filter", psz_access, VLC_FALSE ); - } - else - { - p_access->p_module = - module_Need( p_access, "access2", p_access->psz_access, - b_quick ? VLC_TRUE : VLC_FALSE ); - } + p_access->p_module = + module_Need( p_access, p_source ? "access_filter" : "access", + psz_access, true ); if( p_access->p_module == NULL ) { + msg_StackAdd( "could not create access" ); vlc_object_detach( p_access ); free( p_access->psz_access ); free( p_access->psz_path ); free( p_access->psz_demux ); - vlc_object_destroy( p_access ); + vlc_object_release( p_access ); return NULL; } @@ -105,28 +93,29 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access, } /***************************************************************************** - * access2_New: + * access_New: *****************************************************************************/ -access_t *__access2_New( vlc_object_t *p_obj, char *psz_access, - char *psz_demux, char *psz_path, vlc_bool_t b_quick ) +access_t *__access_New( vlc_object_t *p_obj, const char *psz_access, + const char *psz_demux, const char *psz_path ) { - return access2_InternalNew( p_obj, psz_access, psz_demux, - psz_path, NULL, b_quick ); + return access_InternalNew( p_obj, psz_access, psz_demux, + psz_path, NULL ); } /***************************************************************************** - * access2_FilterNew: + * access_FilterNew: *****************************************************************************/ -access_t *access2_FilterNew( access_t *p_source, char *psz_access_filter ) +access_t *access_FilterNew( access_t *p_source, const char *psz_access_filter ) { - return access2_InternalNew( VLC_OBJECT(p_source), psz_access_filter, - NULL, NULL, p_source, VLC_FALSE ); + return access_InternalNew( VLC_OBJECT(p_source), psz_access_filter, + p_source->psz_demux, p_source->psz_path, + p_source ); } /***************************************************************************** - * access2_Delete: + * access_Delete: *****************************************************************************/ -void access2_Delete( access_t *p_access ) +void access_Delete( access_t *p_access ) { module_Unneed( p_access, p_access->p_module ); vlc_object_detach( p_access ); @@ -137,9 +126,9 @@ void access2_Delete( access_t *p_access ) if( p_access->p_source ) { - access2_Delete( p_access->p_source ); + access_Delete( p_access->p_source ); } - vlc_object_destroy( p_access ); + vlc_object_release( p_access ); }