X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Faccess.c;h=b8a2f031e3652a1df4503113de9c17744052c3dc;hb=c574f41b2880a489f4248f0546c24aabc292caa1;hp=dfca13c7165d23632939d0bdad69f06efcfd1cfb;hpb=68d217865aee3a510ae8e309b384056444212c44;p=vlc

diff --git a/src/input/access.c b/src/input/access.c
index dfca13c716..b8a2f031e3 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * access.c
  *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
- * $Id: demux.c 7546 2004-04-29 13:53:29Z gbazin $
+ * 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
@@ -18,80 +18,110 @@
  *
  * 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>
+#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_New:
+ * access_New:
  *****************************************************************************/
-access_t *__access2_New( vlc_object_t *p_obj,
-                         char *psz_access, char *psz_demux, char *psz_path )
+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( p_obj, VLC_OBJECT_ACCESS ) failed" );
         return NULL;
-    }
 
-    /* Parse URL */
+    /* */
+
+    p_access->p_input = p_parent_input;
+
     p_access->psz_access = strdup( psz_access );
-    p_access->psz_path   = strdup( psz_path );
-    p_access->psz_demux  = strdup( "" );
+    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, "access2_New: access='%s' path='%s'",
-             p_access->psz_access, p_access->psz_path );
+    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.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 );
 
-    p_access->p_module =
-        module_Need( p_access, "access2", p_access->psz_access, VLC_FALSE );
-
+    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_destroy( p_access );
-        return NULL;
-    }
+        goto error;
 
     return p_access;
+
+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;
 }
 
 /*****************************************************************************
- * demux2_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 );
 
-    vlc_object_destroy( p_access );
+    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;
 }
+