X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Faccess.c;h=850fccd363c516b5a2979d582e2d23522ccdf597;hb=91684229ab9d57be0e5a3e49181ec86ef259d8b6;hp=49c6fd93ddce5fcd71ab5e295f941065befa1665;hpb=d666030b2349e8a710fcba4d2cabb912cc700580;p=vlc diff --git a/src/input/access.c b/src/input/access.c index 49c6fd93dd..850fccd363 100644 --- a/src/input/access.c +++ b/src/input/access.c @@ -1,115 +1,102 @@ /***************************************************************************** * access.c ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2008 VLC authors and VideoLAN * $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 - * 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. *****************************************************************************/ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include "access.h" +#include +#include +#include -#include "input_internal.h" +/* Decode URL (which has had its scheme stripped earlier) to a file path. */ +char *get_path(const char *location) +{ + char *url, *path; + + /* 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; + + path = make_path (url); + free (url); + return path; +} +#undef access_New /***************************************************************************** - * access_InternalNew: + * access_New: *****************************************************************************/ -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 *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 ); + access_t *p_access = vlc_custom_create( p_obj, sizeof (*p_access), + "access" ); if( p_access == NULL ) return NULL; - /* Parse URL */ - p_access->p_source = p_source; - if( p_source ) - { - msg_Dbg( p_obj, "creating access filter '%s'", psz_access ); - p_access->psz_access = strdup( p_source->psz_access ); - } - else - { - msg_Dbg( p_obj, "creating access '%s' path='%s'", - psz_access, psz_path ); - p_access->psz_path = strdup( 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; p_access->pf_seek = NULL; p_access->pf_control = NULL; p_access->p_sys = NULL; - p_access->info.i_update = 0; - p_access->info.i_size = 0; - p_access->info.i_pos = 0; - p_access->info.b_eof = false; - p_access->info.b_prebuffered = false; - p_access->info.i_title = 0; - p_access->info.i_seekpoint = 0; - - /* Before module_Need (for var_Create...) */ - vlc_object_attach( p_access, p_obj ); - - p_access->p_module = - module_Need( p_access, p_source ? "access_filter" : "access", - psz_access, true ); + access_InitFields( p_access ); + p_access->p_module = module_need( p_access, "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_release( p_access ); - return NULL; - } + goto error; return p_access; -} - -/***************************************************************************** - * access_New: - *****************************************************************************/ -access_t *__access_New( vlc_object_t *p_obj, const char *psz_access, - const char *psz_demux, const char *psz_path ) -{ - return access_InternalNew( p_obj, psz_access, psz_demux, - psz_path, NULL ); -} -/***************************************************************************** - * access_FilterNew: - *****************************************************************************/ -access_t *access_FilterNew( access_t *p_source, const char *psz_access_filter ) -{ - return access_InternalNew( VLC_OBJECT(p_source), psz_access_filter, - p_source->psz_demux, p_source->psz_path, - p_source ); +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; } /***************************************************************************** @@ -117,18 +104,22 @@ access_t *access_FilterNew( access_t *p_source, const char *psz_access_filter ) *****************************************************************************/ 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 ); - if( p_access->p_source ) - { - access_Delete( p_access->p_source ); - } - 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; +} +