avio: remove interrupt callback for output

[vlc] / modules / access / file.c

diff --git a/modules/access/file.c b/modules/access/file.c
index b62a00487ef4ee379821ed350aac0af4644d43d7..1b5d435078a0e3f052ba1c4fe89ede54fe7619ad 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -44,7 +44,7 @@
 #   include <linux/magic.h>
 #endif
 
-#if defined( WIN32 )
+#if defined( _WIN32 )
 #   include <io.h>
 #   include <ctype.h>
 #   include <shlwapi.h>
@@ -58,7 +58,7 @@
 #include <vlc_input.h>
 #include <vlc_access.h>
 #include <vlc_dialog.h>
-#ifdef WIN32
+#ifdef _WIN32
 # include <vlc_charset.h>
 #endif
 #include <vlc_fs.h>
@@ -66,15 +66,13 @@
 
 struct access_sys_t
 {
-    unsigned int i_nb_reads;
-
     int fd;
 
-    /* */
     bool b_pace_control;
+    uint64_t size;
 };
 
-#if !defined (WIN32) && !defined (__OS2__)
+#if !defined (_WIN32) && !defined (__OS2__)
 static bool IsRemote (int fd)
 {
 #if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL)
@@ -111,10 +109,10 @@ static bool IsRemote (int fd)
 }
 # define IsRemote(fd,path) IsRemote(fd)
 
-#else /* WIN32 || __OS2__ */
+#else /* _WIN32 || __OS2__ */
 static bool IsRemote (const char *path)
 {
-# if !defined(__OS2__)
+# if !defined(__OS2__) && !VLC_WINSTORE_APP
     wchar_t *wpath = ToWide (path);
     bool is_remote = (wpath != NULL && PathIsNetworkPathW (wpath));
     free (wpath);
@@ -174,9 +172,11 @@ int FileOpen( vlc_object_t *p_this )
         fd = vlc_open (path, O_RDONLY | O_NONBLOCK);
         if (fd == -1)
         {
-            msg_Err (p_access, "cannot open file %s (%m)", path);
+            msg_Err (p_access, "cannot open file %s (%s)", path,
+                     vlc_strerror_c(errno));
             dialog_Fatal (p_access, _("File reading failed"),
-                          _("VLC could not open the file \"%s\" (%m)."), path);
+                          _("VLC could not open the file \"%s\" (%s)."), path,
+                          vlc_strerror(errno));
         }
     }
     if (fd == -1)
@@ -185,7 +185,7 @@ int FileOpen( vlc_object_t *p_this )
     struct stat st;
     if (fstat (fd, &st))
     {
-        msg_Err (p_access, "failed to read (%m)");
+        msg_Err (p_access, "read error: %s", vlc_strerror_c(errno));
         goto error;
     }
 
@@ -222,25 +222,27 @@ int FileOpen( vlc_object_t *p_this )
     p_access->pf_block = NULL;
     p_access->pf_control = FileControl;
     p_access->p_sys = p_sys;
-    p_sys->i_nb_reads = 0;
     p_sys->fd = fd;
 
     if (S_ISREG (st.st_mode) || S_ISBLK (st.st_mode))
     {
         p_access->pf_read = FileRead;
         p_access->pf_seek = FileSeek;
-        p_access->info.i_size = st.st_size;
         p_sys->b_pace_control = true;
+        p_sys->size = st.st_size;
 
         /* Demuxers will need the beginning of the file for probing. */
         posix_fadvise (fd, 0, 4096, POSIX_FADV_WILLNEED);
         /* In most cases, we only read the file once. */
         posix_fadvise (fd, 0, 0, POSIX_FADV_NOREUSE);
-#ifdef F_RDAHEAD
-        fcntl (fd, F_RDAHEAD, 1);
-#endif
 #ifdef F_NOCACHE
         fcntl (fd, F_NOCACHE, 0);
+#endif
+#ifdef F_RDAHEAD
+        if (IsRemote(fd, p_access->psz_filepath))
+            fcntl (fd, F_RDAHEAD, 0);
+        else
+            fcntl (fd, F_RDAHEAD, 1);
 #endif
     }
     else
@@ -248,6 +250,7 @@ int FileOpen( vlc_object_t *p_this )
         p_access->pf_read = StreamRead;
         p_access->pf_seek = NoSeek;
         p_sys->b_pace_control = strcasecmp (p_access->psz_access, "stream");
+        p_sys->size = 0;
     }
 
     return VLC_SUCCESS;
@@ -297,28 +300,21 @@ static ssize_t FileRead (access_t *p_access, uint8_t *p_buffer, size_t i_len)
                 return -1;
         }
 
-        msg_Err (p_access, "read error: %m");
+        msg_Err (p_access, "read error: %s", vlc_strerror_c(errno));
         dialog_Fatal (p_access, _("File reading failed"),
-                      _("VLC could not read the file (%m)."));
+                      _("VLC could not read the file (%s)."),
+                      vlc_strerror(errno));
         val = 0;
     }
 
     p_access->info.i_pos += val;
     p_access->info.b_eof = !val;
-
-    p_sys->i_nb_reads++;
-
-    if (!(p_sys->i_nb_reads % INPUT_FSTAT_NB_READS)
-     || (p_access->info.i_pos > p_access->info.i_size))
+    if (p_access->info.i_pos >= p_sys->size)
     {
         struct stat st;
 
-        if ((fstat (fd, &st) == 0)
-         && (p_access->info.i_size != (uint64_t)st.st_size))
-        {
-            p_access->info.i_size = st.st_size;
-            p_access->info.i_update |= INPUT_UPDATE_SIZE;
-        }
+        if (fstat (fd, &st) == 0)
+            p_sys->size = st.st_size;
     }
     return val;
 }
@@ -332,7 +328,8 @@ static int FileSeek (access_t *p_access, uint64_t i_pos)
     p_access->info.i_pos = i_pos;
     p_access->info.b_eof = false;
 
-    lseek (p_access->p_sys->fd, i_pos, SEEK_SET);
+    if (lseek (p_access->p_sys->fd, i_pos, SEEK_SET) == (off_t)-1)
+        return VLC_EGENERIC;
     return VLC_SUCCESS;
 }
 
@@ -344,7 +341,7 @@ static ssize_t StreamRead (access_t *p_access, uint8_t *p_buffer, size_t i_len)
     access_sys_t *p_sys = p_access->p_sys;
     int fd = p_sys->fd;
 
-#if !defined (WIN32) && !defined (__OS2__)
+#if !defined (_WIN32) && !defined (__OS2__)
     ssize_t val = net_Read (p_access, fd, NULL, p_buffer, i_len, false);
 #else
     ssize_t val = read (fd, p_buffer, i_len);
@@ -358,7 +355,7 @@ static ssize_t StreamRead (access_t *p_access, uint8_t *p_buffer, size_t i_len)
             case EAGAIN:
                 return -1;
         }
-        msg_Err (p_access, "read error: %m");
+        msg_Err (p_access, "read error: %s", vlc_strerror_c(errno));
         val = 0;
     }
 
@@ -385,7 +382,6 @@ static int FileControl( access_t *p_access, int i_query, va_list args )
 
     switch( i_query )
     {
-        /* */
         case ACCESS_CAN_SEEK:
         case ACCESS_CAN_FASTSEEK:
             pb_bool = (bool*)va_arg( args, bool* );
@@ -398,7 +394,16 @@ static int FileControl( access_t *p_access, int i_query, va_list args )
             *pb_bool = p_sys->b_pace_control;
             break;
 
-        /* */
+        case ACCESS_GET_SIZE:
+        {
+            struct stat st;
+
+            if (fstat (p_sys->fd, &st) == 0)
+                p_sys->size = st.st_size;
+            *va_arg( args, uint64_t * ) = p_sys->size;
+            break;
+        }
+
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             if (IsRemote (p_sys->fd, p_access->psz_filepath))
@@ -408,22 +413,11 @@ static int FileControl( access_t *p_access, int i_query, va_list args )
             *pi_64 *= 1000;
             break;
 
-        /* */
         case ACCESS_SET_PAUSE_STATE:
             /* Nothing to do */
             break;
 
-        case ACCESS_GET_TITLE_INFO:
-        case ACCESS_SET_TITLE:
-        case ACCESS_SET_SEEKPOINT:
-        case ACCESS_SET_PRIVATE_ID_STATE:
-        case ACCESS_GET_META:
-        case ACCESS_GET_PRIVATE_ID_STATE:
-        case ACCESS_GET_CONTENT_TYPE:
-            return VLC_EGENERIC;
-
         default:
-            msg_Warn( p_access, "unimplemented query %d in control", i_query );
             return VLC_EGENERIC;
 
     }