X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Faccess.c;h=b8080b7ce66c62839ecc48dc73d0abc5ed381ae1;hb=747daa90b8046d4f817b9049b110af7813ce44f5;hp=f32fdc6784709461eece94797ced61b5a38d1987;hpb=02d6384dce7b4c44760f643c7b3d24115910a613;p=vlc

diff --git a/src/input/access.c b/src/input/access.c
index f32fdc6784..b8080b7ce6 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * access.c
  *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
- * $Id: demux.c 7546 2004-04-29 13:53:29Z gbazin $
+ * Copyright (C) 1999-2004 the VideoLAN team
+ * $Id$
  *
  * Author: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -18,28 +18,29 @@
  *
  * 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>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/input.h>
 
 #include "input_internal.h"
 
 /*****************************************************************************
  * access2_InternalNew:
  *****************************************************************************/
-static access_t *access2_InternalNew( vlc_object_t *p_obj,
-                                      char *psz_access, char *psz_demux, char *psz_path,
-                                      access_t *p_source,
-                                      vlc_bool_t b_quick )
+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 *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS );
 
     if( p_access == NULL )
     {
-        msg_Err( p_obj, "vlc_object_create( p_obj, VLC_OBJECT_ACCESS ) failed" );
+        msg_Err( p_obj, "vlc_object_create() failed" );
         return NULL;
     }
 
@@ -50,15 +51,27 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj,
         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 if( !b_quick )
+    else
     {
-        msg_Dbg( p_obj, "creating access '%s' path='%s'",
-                 psz_access, psz_path );
-        p_access->psz_access = b_quick ? strdup( "file" ) : strdup( psz_access );
         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->psz_demux  = strdup( "" );
 
     p_access->pf_read    = NULL;
     p_access->pf_block   = NULL;
@@ -69,6 +82,7 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj,
     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;
 
@@ -79,17 +93,17 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj,
     if( p_source )
     {
         p_access->p_module =
-            module_Need( p_access, "access_filter", psz_access, VLC_FALSE );
+            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 ? VLC_TRUE : VLC_FALSE );
+            module_Need( p_access, "access2", p_access->psz_access, VLC_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 );
@@ -104,21 +118,20 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj,
 /*****************************************************************************
  * access2_New:
  *****************************************************************************/
-access_t *__access2_New( vlc_object_t *p_obj,
-                         char *psz_access, char *psz_demux, char *psz_path,
-                         vlc_bool_t b_quick )
+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 );
+    return access2_InternalNew( p_obj, psz_access, psz_demux,
+                                psz_path, NULL, b_quick );
 }
 
 /*****************************************************************************
  * access2_FilterNew:
  *****************************************************************************/
-access_t *access2_FilterNew( access_t *p_source, char *psz_access_filter )
+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 );
+    return access2_InternalNew( VLC_OBJECT(p_source), psz_access_filter,
+                                NULL, NULL, p_source, VLC_FALSE );
 }
 
 /*****************************************************************************