Fix [10fcb9f9c3c73d13340c0bd4153fc4c9c87b7186] (win doesn't have setenv).

[vlc] / src / input / access.c

diff --git a/src/input/access.c b/src/input/access.c
index 281f2230d414ed2db4a676f94bc72fc05dbf10d0..48bd44eb2a94e1f749bc00999630723985671525 100644 (file)
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -25,18 +25,20 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "input_internal.h"
 
 /*****************************************************************************
- * access2_InternalNew:
+ * access_InternalNew:
  *****************************************************************************/
-static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_access,
+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 *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS );
+    static const char typename[] = "access";
+    access_t *p_access = vlc_custom_create( p_obj, sizeof (*p_access),
+                                            VLC_OBJECT_GENERIC, typename );
 
     if( p_access == NULL )
         return NULL;
@@ -46,7 +48,6 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_acces
     if( p_source )
     {
         msg_Dbg( p_obj, "creating access filter '%s'", psz_access );
-        p_access->psz_access = strdup( p_source->psz_access );
     }
     else
     {
@@ -65,8 +66,8 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_acces
     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.b_eof    = false;
+    p_access->info.b_prebuffered = false;
     p_access->info.i_title  = 0;
     p_access->info.i_seekpoint = 0;
 
@@ -75,8 +76,8 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_acces
     vlc_object_attach( p_access, p_obj );
 
     p_access->p_module =
-         module_Need( p_access, p_source ? "access_filter" : "access2",
-                      psz_access, VLC_TRUE );
+         module_Need( p_access, p_source ? "access_filter" : "access",
+                      psz_access, true );
 
     if( p_access->p_module == NULL )
     {
@@ -93,29 +94,29 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, const char *psz_acces
 }
 
 /*****************************************************************************
- * access2_New:
+ * access_New:
  *****************************************************************************/
-access_t *__access2_New( vlc_object_t *p_obj, const char *psz_access,
+access_t *__access_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,
+    return access_InternalNew( p_obj, psz_access, psz_demux,
                                 psz_path, NULL );
 }
 
 /*****************************************************************************
- * access2_FilterNew:
+ * access_FilterNew:
  *****************************************************************************/
-access_t *access2_FilterNew( access_t *p_source, const char *psz_access_filter )
+access_t *access_FilterNew( access_t *p_source, const char *psz_access_filter )
 {
-    return access2_InternalNew( VLC_OBJECT(p_source), psz_access_filter,
+    return access_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 );
@@ -126,7 +127,7 @@ void access2_Delete( access_t *p_access )
 
     if( p_access->p_source )
     {
-        access2_Delete( p_access->p_source );
+        access_Delete( p_access->p_source );
     }
 
     vlc_object_release( p_access );