# include <linux/magic.h>
#endif
-#if defined( WIN32 )
+#if defined( _WIN32 )
# include <io.h>
# include <ctype.h>
# include <shlwapi.h>
#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>
{
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)
}
# 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);
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)
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;
}
{
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
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;
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;
- if (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 = st.st_size;
+ p_sys->size = st.st_size;
}
return val;
}
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;
}
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);
case EAGAIN:
return -1;
}
- msg_Err (p_access, "read error: %m");
+ msg_Err (p_access, "read error: %s", vlc_strerror_c(errno));
val = 0;
}
switch( i_query )
{
- /* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
pb_bool = (bool*)va_arg( args, bool* );
*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))
*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;
}