X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Faccess.c;h=1132b84d4ad9d10fa9fdb3a2ce0405d7f43d9470;hb=d601ddbb3d7835ebc32f67ad48300ebf8b132e54;hp=d1c13870bea3628d0bbd2133e7d8834770c4f93d;hpb=cbf5a0231ca97d4b5907e8a8db4f2a5c3d5b3f37;p=vlc diff --git a/src/input/access.c b/src/input/access.c index d1c13870be..1132b84d4a 100644 --- a/src/input/access.c +++ b/src/input/access.c @@ -1,10 +1,10 @@ /***************************************************************************** * access.c ***************************************************************************** - * Copyright (C) 1999-2004 VideoLAN - * $Id: demux.c 7546 2004-04-29 13:53:29Z gbazin $ + * Copyright (C) 1999-2008 the VideoLAN team + * $Id$ * - * Author: Laurent Aimar + * Author: 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 @@ -18,97 +18,61 @@ * * 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 -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "ninput.h" +#include "access.h" +#include +#include -int access_vaControl( input_thread_t *p_input, int i_query, va_list args ) +/* Decode URL (which has had its scheme stripped earlier) to a file path. */ +static char *get_path(const char *location) { - if( p_input->pf_access_control ) - { - return p_input->pf_access_control( p_input, i_query, args ); - } - return VLC_EGENERIC; -} - -int access_Control( input_thread_t *p_input, int i_query, ... ) -{ - va_list args; - int i_result; - - va_start( args, i_query ); - i_result = access_vaControl( p_input, i_query, args ); - va_end( args ); + char *url, *path; - return i_result; -} + /* Prepending "file://" is a bit hackish. But then again, we do not want + * to hard-code the list of schemes that use file paths in make_path(). + */ + if (asprintf(&url, "file://%s", location) == -1) + return NULL; -int access_vaControlDefault( input_thread_t *p_input, int i_query, va_list args ) -{ - return VLC_EGENERIC; + path = make_path (url); + free (url); + return path; } /***************************************************************************** - * access2_New: + * access_New: *****************************************************************************/ -access_t *__access2_New( vlc_object_t *p_obj, char *psz_mrl ) +access_t *__access_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, + const char *psz_access, const char *psz_demux, + const char *psz_location ) { - access_t *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS ); - - char *psz_dup = strdup( psz_mrl ? psz_mrl : "" ); - char *psz = strchr( psz_dup, ':' ); + access_t *p_access = vlc_custom_create( p_obj, sizeof (*p_access), + VLC_OBJECT_GENERIC, "access" ); if( p_access == NULL ) - { - free( psz_dup ); return NULL; - } - - /* Parse URL */ - p_access->psz_access = NULL; - p_access->psz_path = NULL; - - if( psz ) - { - *psz++ = '\0'; - - if( psz[0] == '/' && psz[1] == '/' ) - { - psz += 2; - } - p_access->psz_path = strdup( psz ); - - psz = strchr( psz_dup, '/' ); - if( psz ) - { - *psz++ = '\0'; - p_access->psz_access = strdup( psz_dup ); - } - } - else - { - p_access->psz_path = strdup( psz_mrl ); - } - free( psz_dup ); - - - p_access->psz_demux = strdup( "" ); - if( p_access->psz_access == NULL ) - { - p_access->psz_access = strdup( "" ); - } - if( p_access->psz_path == NULL ) - { - p_access->psz_path = strdup( "" ); - } - msg_Dbg( p_obj, "access2_New: '%s' -> access='%s' path='%s'", - psz_mrl, - p_access->psz_access, p_access->psz_path ); + + /* */ + + p_access->p_input = p_parent_input; + + p_access->psz_access = strdup( psz_access ); + p_access->psz_location = strdup( psz_location ); + p_access->psz_filepath = get_path( psz_location ); + p_access->psz_demux = strdup( psz_demux ); + if( p_access->psz_access == NULL || p_access->psz_location == NULL + || p_access->psz_demux == NULL ) + goto error; + + msg_Dbg( p_obj, "creating access '%s' location='%s', path='%s'", + psz_access, psz_location, + p_access->psz_filepath ? p_access->psz_filepath : "(null)" ); p_access->pf_read = NULL; p_access->pf_block = NULL; @@ -116,36 +80,47 @@ access_t *__access2_New( vlc_object_t *p_obj, char *psz_mrl ) p_access->pf_control = NULL; p_access->p_sys = NULL; - /* Before module_Need (for var_Create...) */ - vlc_object_attach( p_access, p_obj ); + access_InitFields( p_access ); - p_access->p_module = - module_Need( p_access, "access2", p_access->psz_access, VLC_FALSE ); + /* Before module_need (for var_Create...) */ + vlc_object_attach( p_access, p_obj ); + p_access->p_module = module_need( p_access, "access", psz_access, true ); if( p_access->p_module == NULL ) - { - 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 ); - return NULL; - } + goto error; return p_access; + +error: + free( p_access->psz_access ); + free( p_access->psz_location ); + free( p_access->psz_filepath ); + free( p_access->psz_demux ); + vlc_object_release( p_access ); + return NULL; } /***************************************************************************** - * demux2_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 ); + module_unneed( p_access, p_access->p_module ); free( p_access->psz_access ); - free( p_access->psz_path ); + free( p_access->psz_location ); + free( p_access->psz_filepath ); free( p_access->psz_demux ); - vlc_object_destroy( p_access ); + vlc_object_release( p_access ); +} + + +/***************************************************************************** + * access_GetParentInput: + *****************************************************************************/ +input_thread_t * access_GetParentInput( access_t *p_access ) +{ + return p_access->p_input ? vlc_object_hold((vlc_object_t *)p_access->p_input) : NULL; } +