# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_interface.h>
# include <fcntl.h>
#endif
-#if defined( WIN32 ) && !defined( UNDER_CE )
+#if defined( WIN32 )
# include <io.h>
+# include <ctype.h>
#else
# include <unistd.h>
# include <poll.h>
# endif
# define lseek _lseeki64
#elif defined( UNDER_CE )
-# ifdef read
-# undef read
-# endif
-# define read(a,b,c) fread(b,1,c,a)
-# define close(a) fclose(a)
-# ifdef lseek
-# undef lseek
-# endif
-# define lseek fseek
+/* FIXME the commandline on wince is a mess */
+# define dup(a) -1
#endif
#include <vlc_charset.h>
"Caching value for files. This " \
"value should be set in milliseconds." )
-vlc_module_begin();
- set_description( _("File input") );
- set_shortname( _("File") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
- add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
- add_obsolete_string( "file-cat" );
- set_capability( "access2", 50 );
- add_shortcut( "file" );
- add_shortcut( "stream" );
- add_shortcut( "kfir" );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("File input") )
+ set_shortname( N_("File") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACCESS )
+ add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true )
+ add_obsolete_string( "file-cat" )
+ set_capability( "access", 50 )
+ add_shortcut( "file" )
+ add_shortcut( "stream" )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
struct access_sys_t
{
unsigned int i_nb_reads;
- vlc_bool_t b_kfir;
int fd;
/* */
- vlc_bool_t b_seekable;
- vlc_bool_t b_pace_control;
+ bool b_seekable;
+ bool b_pace_control;
};
/*****************************************************************************
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
- vlc_bool_t b_stdin = !strcmp (p_access->psz_path, "-");
+ bool b_stdin = !strcmp (p_access->psz_path, "-");
/* Update default_pts to a suitable value for file access */
var_Create( p_access, "file-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
STANDARD_READ_ACCESS_INIT;
p_sys->i_nb_reads = 0;
- p_sys->b_kfir = VLC_FALSE;
int fd = p_sys->fd = -1;
if (!strcasecmp (p_access->psz_access, "stream"))
{
- p_sys->b_seekable = VLC_FALSE;
- p_sys->b_pace_control = VLC_FALSE;
- }
- else if (!strcasecmp (p_access->psz_access, "kfir"))
- {
- p_sys->b_seekable = VLC_FALSE;
- p_sys->b_pace_control = VLC_FALSE;
- p_sys->b_kfir = VLC_TRUE;
+ p_sys->b_seekable = false;
+ p_sys->b_pace_control = false;
}
else
{
- p_sys->b_seekable = VLC_TRUE;
- p_sys->b_pace_control = VLC_TRUE;
+ p_sys->b_seekable = true;
+ p_sys->b_pace_control = true;
}
/* Open file */
#ifdef HAVE_SYS_STAT_H
p_access->info.i_size = st.st_size;
- if (!S_ISREG (st.st_mode)
- && !S_ISBLK (st.st_mode)
- && !S_ISCHR (st.st_mode))
- p_sys->b_seekable = VLC_FALSE;
+ if (!S_ISREG (st.st_mode))
+ p_sys->b_seekable = false;
#else
p_sys->b_seekable = !b_stdin;
# warning File size not known!
free (p_sys);
}
+
+#include <vlc_network.h>
+
/*****************************************************************************
* Read: standard read on a file descriptor.
*****************************************************************************/
static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
{
access_sys_t *p_sys = p_access->p_sys;
- ssize_t i_ret;
int fd = p_sys->fd;
+ ssize_t i_ret;
-#if !defined(WIN32) && !defined(UNDER_CE)
- if( !p_sys->b_pace_control )
- {
- if( !p_sys->b_kfir )
- {
- /* Find if some data is available. This won't work under Windows. */
- do
- {
- struct pollfd ufd;
-
- if( p_access->b_die )
- return 0;
-
- memset (&ufd, 0, sizeof (ufd));
- ufd.fd = fd;
- ufd.events = POLLIN;
-
- i_ret = poll (&ufd, 1, 500);
- }
- while (i_ret <= 0);
-
- i_ret = read (fd, p_buffer, i_len);
- }
- else
- {
- /* b_kfir ; work around a buggy poll() driver implementation */
- while (((i_ret = read (fd, p_buffer, i_len)) == 0)
- && !p_access->b_die)
- {
- msleep( INPUT_ERROR_SLEEP );
- }
- }
- }
- else
-#endif /* WIN32 || UNDER_CE */
- /* b_pace_control || WIN32 */
- i_ret = read( fd, p_buffer, i_len );
+#ifndef WIN32
+ i_ret = net_Read (p_access, fd, NULL, p_buffer, i_len, false);
+#else
+ i_ret = read (fd, p_buffer, i_len);
+#endif
if( i_ret < 0 )
{
default:
msg_Err (p_access, "read failed (%m)");
- intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
+ intf_UserFatal (p_access, false, _("File reading failed"),
_("VLC could not read the file."));
+ return 0;
}
-
- /* Delay a bit to avoid consuming all the CPU. This is particularly
- * useful when reading from an unconnected FIFO. */
- msleep( INPUT_ERROR_SLEEP );
}
+ else if( i_ret > 0 )
+ p_access->info.i_pos += i_ret;
+ else
+ p_access->info.b_eof = true;
p_sys->i_nb_reads++;
}
}
#endif
-
- if( i_ret > 0 )
- p_access->info.i_pos += i_ret;
- else if( i_ret == 0 )
- p_access->info.b_eof = VLC_TRUE;
-
return i_ret;
}
static int Seek (access_t *p_access, int64_t i_pos)
{
p_access->info.i_pos = i_pos;
- p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_eof = false;
lseek (p_access->p_sys->fd, i_pos, SEEK_SET);
return VLC_SUCCESS;
static int Control( access_t *p_access, int i_query, va_list args )
{
access_sys_t *p_sys = p_access->p_sys;
- vlc_bool_t *pb_bool;
+ bool *pb_bool;
int *pi_int;
int64_t *pi_64;
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+ pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = p_sys->b_seekable;
break;
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+ pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = p_sys->b_pace_control;
break;
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = var_GetInteger( p_access, "file-caching" ) * I64C(1000);
+ *pi_64 = var_GetInteger( p_access, "file-caching" ) * INT64_C(1000);
break;
/* */
return VLC_SUCCESS;
}
-
-static char *expand_path (const access_t *p_access, const char *path)
-{
- if (strncmp (path, "~/", 2) == 0)
- {
- char *res;
-
- // TODO: we should also support the ~cmassiot/ syntax
- if (asprintf (&res, "%s/%s", p_access->p_libvlc->psz_homedir, path + 2) == -1)
- return NULL;
- return res;
- }
-
-#if defined(WIN32)
- if (!strcasecmp (p_access->psz_access, "file")
- && ('/' == path[0]) && path[1] && (':' == path[2]) && ('/' == path[3]))
- // Explorer can open path such as file:/C:/ or file:///C:/
- // hence remove leading / if found
- return strdup (path + 1);
-#endif
-
- return strdup (path);
-}
-
-
/*****************************************************************************
* open_file: Opens a specific file
*****************************************************************************/
-static int open_file (access_t *p_access, const char *psz_name)
+static int open_file (access_t *p_access, const char *path)
{
- char *path = expand_path (p_access, psz_name);
-
-#ifdef UNDER_CE
- p_sys->fd = utf8_fopen( path, "rb" );
- if ( !p_sys->fd )
- {
- msg_Err( p_access, "cannot open file %s", psz_name );
- intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"),
- _("VLC could not open the file \"%s\"."), psz_name );
- free (path);
- return VLC_EGENERIC;
- }
+#if defined(WIN32)
+ if (!strcasecmp (p_access->psz_access, "file")
+ && ('/' == path[0]) && isalpha (path[1])
+ && (':' == path[2]) && ('/' == path[3]))
+ /* Explorer can open path such as file:/C:/ or file:///C:/
+ * hence remove leading / if found */
+ path++;
+#endif
- fseek( p_sys->fd, 0, SEEK_END );
- p_access->info.i_size = ftell( p_sys->fd );
- p_access->info.i_update |= INPUT_UPDATE_SIZE;
- fseek( p_sys->fd, 0, SEEK_SET );
-#else
int fd = utf8_open (path, O_RDONLY | O_NONBLOCK /* O_LARGEFILE*/, 0666);
- free (path);
if (fd == -1)
{
- msg_Err (p_access, "cannot open file %s (%m)", psz_name);
- intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
- _("VLC could not open the file \"%s\"."), psz_name);
+ msg_Err (p_access, "cannot open file %s (%m)", path);
+ intf_UserFatal (p_access, false, _("File reading failed"),
+ _("VLC could not open the file \"%s\"."), path);
return -1;
}
-# if defined(HAVE_FCNTL_H) && defined(F_FDAHEAD) && defined(F_NOCACHE)
+#if defined(HAVE_FCNTL)
+ fcntl (fd, F_SETFD, fcntl (fd, F_GETFD) | FD_CLOEXEC);
+
/* We'd rather use any available memory for reading ahead
* than for caching what we've already seen/heard */
+# if defined(F_RDAHEAD)
fcntl (fd, F_RDAHEAD, 1);
+# endif
+# if defined(F_NOCACHE)
fcntl (fd, F_NOCACHE, 1);
# endif
#endif
projects / vlc / blobdiff