/*****************************************************************************
* access.c
*****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2008 the VideoLAN team
* $Id$
*
- * Author: Laurent Aimar <fenrir@via.ecp.fr>
+ * Author: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
*
* 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "input_internal.h"
+#include "access.h"
+#include <libvlc.h>
+#include <vlc_url.h>
+#include <vlc_modules.h>
+
+/* Decode URL (which has had its scheme stripped earlier) to a file path. */
+static 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;
+}
/*****************************************************************************
- * access2_InternalNew:
+ * access_New:
*****************************************************************************/
-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 *__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),
+ VLC_OBJECT_GENERIC, "access" );
if( p_access == NULL )
- {
- msg_Err( p_obj, "vlc_object_create() failed" );
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 );
- p_access->psz_path = strdup( p_source->psz_path );
- p_access->psz_demux = strdup( p_source->psz_demux );
- }
- else
- {
- 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_demux = strdup( psz_demux );
-
- if( !b_quick )
- msg_Dbg( p_obj, "creating access '%s' path='%s'",
- psz_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;
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 = VLC_FALSE;
- p_access->info.b_prebuffered = VLC_FALSE;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
+ access_InitFields( p_access );
- /* Before module_Need (for var_Create...) */
+ /* 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_TRUE );
- }
- else
- {
- p_access->p_module =
- module_Need( p_access, "access2", p_access->psz_access, b_quick );
- }
-
+ 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_destroy( p_access );
- return NULL;
- }
+ goto error;
return p_access;
-}
-
-/*****************************************************************************
- * 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 )
-{
- return access2_InternalNew( p_obj, psz_access, psz_demux,
- psz_path, NULL, b_quick );
-}
-/*****************************************************************************
- * access2_FilterNew:
- *****************************************************************************/
-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 );
+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;
}
/*****************************************************************************
- * 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 );
+ 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 )
- {
- access2_Delete( p_access->p_source );
- }
+ vlc_object_release( p_access );
+}
+
- vlc_object_destroy( 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;
}
projects / vlc / blobdiff