Add facilities to report and enrich error messages.

[vlc] / src / input / access.c

diff --git a/src/input/access.c b/src/input/access.c
index 4a4c74a8b918cef7d3b0d6c3041bdd12df77820a..6a0a63453c472d9991ea34716973650838efec41 100644 (file)
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -2,7 +2,7 @@
  * access.c
  *****************************************************************************
  * Copyright (C) 1999-2004 the VideoLAN team
- * $Id: demux.c 7546 2004-04-29 13:53:29Z gbazin $
+ * $Id$
  *
  * Author: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -18,20 +18,19 @@
  *
  * 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>
 
 #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,
+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 );
@@ -54,8 +53,16 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access,
     else
     {
         p_access->psz_path   = strdup( psz_path );
-        p_access->psz_access =
-            b_quick ? strdup( "file" ) : strdup( psz_access );
+        if( b_quick )
+        {
+            if( strstr( psz_path, "file://" ) )
+                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 )
@@ -72,6 +79,7 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access,
     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;
 
@@ -93,6 +101,7 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access,
 
     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 );
@@ -107,8 +116,8 @@ static access_t *access2_InternalNew( vlc_object_t *p_obj, char *psz_access,
 /*****************************************************************************
  * 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 );
@@ -117,7 +126,7 @@ access_t *__access2_New( vlc_object_t *p_obj, char *psz_access,
 /*****************************************************************************
  * 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 );