X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Faccess.c;h=9604751e24f0b3f2f7d1c983ac50426d27d27cba;hb=3a4de92b572fe75b489b4e00661648fddbcebcad;hp=1b5730692bd228aaf4616a5da63f466afb51bfc2;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc

diff --git a/src/input/access.c b/src/input/access.c
index 1b5730692b..9604751e24 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
@@ -25,35 +25,29 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
-
-#include "input_internal.h"
+#include "access.h"
+#include <libvlc.h>
 
 /*****************************************************************************
- * 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 )
+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_path )
 {
-    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 )
         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 );
-    }
-    else
-    {
-        msg_Dbg( p_obj, "creating access '%s' path='%s'",
-                 psz_access, psz_path );
-        p_access->psz_path   = strdup( psz_path );
-    }
+    /* */
+    msg_Dbg( p_obj, "creating access '%s' path='%s'",
+             psz_access, psz_path );
+
+    p_access->p_input = p_parent_input;
+
+    p_access->psz_path   = strdup( psz_path );
     p_access->psz_access = strdup( psz_access );
     p_access->psz_demux  = strdup( psz_demux );
 
@@ -62,26 +56,16 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_acces
     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...) */
+    /* 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" : "access2",
-                      psz_access, true );
+    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 );
@@ -93,42 +77,25 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_acces
 }
 
 /*****************************************************************************
- * access2_New:
- *****************************************************************************/
-access_t *__access2_New( vlc_object_t *p_obj, const char *psz_access,
-                         const char *psz_demux, const char *psz_path )
-{
-    return access2_InternalNew( p_obj, psz_access, psz_demux,
-                                psz_path, NULL );
-}
-
-/*****************************************************************************
- * 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,
-                                p_source->psz_demux, p_source->psz_path,
-                                p_source );
-}
-
-/*****************************************************************************
- * 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_demux );
 
-    if( p_access->p_source )
-    {
-        access2_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;
+}
+