The input already does the job.
Signed-off-by: Rémi Denis-Courmont <rem@videolan.org>
*****************************************************************************/
static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_access,
const char *psz_demux, const char *psz_path,
- access_t *p_source, vlc_bool_t b_quick )
+ access_t *p_source )
{
access_t *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS );
}
else
{
+ msg_Dbg( p_obj, "creating access '%s' path='%s'",
+ psz_access, psz_path );
p_access->psz_path = strdup( psz_path );
- if( b_quick )
- {
- if( strncmp( psz_path, "file://", 7 ) == 0 )
- p_access->psz_access = strdup( "" );
- else
- p_access->psz_access = strdup( "file" );
- }
- else
- p_access->psz_access = strdup( psz_access );
-
+ p_access->psz_access = 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->pf_read = NULL;
* access2_New:
*****************************************************************************/
access_t *__access2_New( vlc_object_t *p_obj, const char *psz_access,
- const char *psz_demux, const char *psz_path, vlc_bool_t b_quick )
+ const char *psz_demux, const char *psz_path )
{
return access2_InternalNew( p_obj, psz_access, psz_demux,
- psz_path, NULL, b_quick );
+ psz_path, NULL );
}
/*****************************************************************************
access_t *access2_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 );
+ NULL, NULL, p_source );
}
/*****************************************************************************
input_ChangeState( p_input, OPENING_S );
/* Now try a real access */
- in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path,
- p_input->b_preparsing );
+ in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path );
/* Access failed, URL encoded ? */
if( in->p_access == NULL && strchr( psz_path, '%' ) )
psz_access, psz_demux, psz_path );
in->p_access = access2_New( p_input,
- psz_access, psz_demux, psz_path,
- p_input->b_preparsing );
+ psz_access, psz_demux, psz_path );
}
if( in->p_access == NULL )
{
/* Access */
-#define access2_New( a, b, c, d, e ) __access2_New(VLC_OBJECT(a), b, c, d, e )
+#define access2_New( a, b, c, d ) __access2_New(VLC_OBJECT(a), b, c, d )
access_t * __access2_New( vlc_object_t *p_obj, const char *psz_access,
- const char *psz_demux, const char *psz_path,
- vlc_bool_t b_quick );
+ const char *psz_demux, const char *psz_path );
access_t * access2_FilterNew( access_t *p_source,
const char *psz_access_filter );
void access2_Delete( access_t * );
MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path );
/* Now try a real access */
- p_access = access2_New( p_parent, psz_access, psz_demux, psz_path, 0 );
+ p_access = access2_New( p_parent, psz_access, psz_demux, psz_path );
if( p_access == NULL )
{
if( psz_name )
{
access_t *p_tmp = access2_New( p_access, p_access->psz_access,
- "", psz_name, 0 );
+ "", psz_name );
if( !p_tmp )
{
msg_Dbg( s, "opening input `%s'", psz_name );
- p_list_access = access2_New( s, p_access->psz_access, "", psz_name, 0 );
+ p_list_access = access2_New( s, p_access->psz_access, "", psz_name );
if( !p_list_access ) return 0;
msg_Dbg( s, "opening input `%s'", psz_name );
- p_list_access = access2_New( s, p_access->psz_access, "", psz_name, 0 );
+ p_list_access = access2_New( s, p_access->psz_access, "", psz_name );
if( !p_list_access ) return 0;
if( i != p_sys->i_list_index && i != 0 )
{
p_list_access =
- access2_New( s, p_access->psz_access, "", psz_name, 0 );
+ access2_New( s, p_access->psz_access, "", psz_name );
}
else if( i != p_sys->i_list_index )
{