X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Faccess.c;h=1132b84d4ad9d10fa9fdb3a2ce0405d7f43d9470;hb=bfe5bcce4f973f0ff1223cbf177295f7a93bfb15;hp=b6e4201d4ad66dea2940c41c8db057e74affe7ec;hpb=ea83a25e84bca24d045c34713ce7008ea5ce4e8a;p=vlc

diff --git a/src/input/access.c b/src/input/access.c
index b6e4201d4a..1132b84d4a 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * 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
@@ -27,88 +27,77 @@
 
 #include "access.h"
 #include <libvlc.h>
+#include <vlc_url.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;
+}
 
 /*****************************************************************************
- * 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 )
 {
-    static const char typename[] = "access";
     access_t *p_access = vlc_custom_create( p_obj, sizeof (*p_access),
-                                            VLC_OBJECT_GENERIC, typename );
+                                            VLC_OBJECT_GENERIC, "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 );
-    }
-    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;
 
+    access_InitFields( p_access );
 
     /* 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 );
-
+    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_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,17 +106,21 @@ 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 );
 
     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;
+}
+