/*****************************************************************************
* access.c
*****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
- * $Id: demux.c 7546 2004-04-29 13:53:29Z gbazin $
+ * Copyright (C) 1999-2004 the VideoLAN team
+ * $Id$
*
* Author: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* 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 <stdlib.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
#include "input_internal.h"
/*****************************************************************************
* access2_InternalNew:
*****************************************************************************/
-static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access,
- char *psz_demux, char *psz_path,
+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_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS );
else
{
p_access->psz_path = strdup( psz_path );
- p_access->psz_access =
- b_quick ? strdup( "file" ) : strdup( psz_access );
+ 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_demux = strdup( psz_demux );
if( !b_quick )
p_access->info.i_size = 0;
p_access->info.i_pos = 0;
p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_prebuffered = VLC_FALSE;
p_access->info.i_title = 0;
p_access->info.i_seekpoint = 0;
if( p_source )
{
p_access->p_module =
- module_Need( p_access, "access_filter", psz_access, VLC_FALSE );
+ module_Need( p_access, "access_filter", psz_access, VLC_TRUE );
}
else
{
p_access->p_module =
- module_Need( p_access, "access2", p_access->psz_access,
- b_quick ? VLC_TRUE : VLC_FALSE );
+ module_Need( p_access, "access2", p_access->psz_access, VLC_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 );
/*****************************************************************************
* access2_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 *__access2_New( vlc_object_t *p_obj, const char *psz_access,
+ const char *psz_demux, const char *psz_path, vlc_bool_t b_quick )
{
return access2_InternalNew( p_obj, psz_access, psz_demux,
psz_path, NULL, b_quick );
/*****************************************************************************
* access2_FilterNew:
*****************************************************************************/
-access_t *access2_FilterNew( access_t *p_source, char *psz_access_filter )
+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 );