/*****************************************************************************
* file.c: file input (file: access plug-in)
*****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2006 the VideoLAN team
+ * Copyright © 2006-2007 Rémi Denis-Courmont
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Rémi Denis-Courmont <rem # videolan # org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* 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.
*****************************************************************************/
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <stdlib.h>
-#include <string.h>
+#include <vlc_common.h>
+#include "fs.h"
+#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_dialog.h>
+
+#include <assert.h>
#include <errno.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+#include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
+#ifdef HAVE_FSTATVFS
+# include <sys/statvfs.h>
+# if defined (HAVE_SYS_MOUNT_H)
+# include <sys/param.h>
+# include <sys/mount.h>
+# endif
+#endif
+#ifdef HAVE_LINUX_MAGIC_H
+# include <sys/vfs.h>
+# include <linux/magic.h>
+#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#elif defined( WIN32 ) && !defined( UNDER_CE )
+#if defined( WIN32 )
# include <io.h>
+# include <ctype.h>
+# include <shlwapi.h>
+#else
+# include <unistd.h>
#endif
+#include <dirent.h>
#if defined( WIN32 ) && !defined( UNDER_CE )
-/* stat() support for large files on win32 */
-# define stat _stati64
-# define fstat(a,b) _fstati64(a,b)
# ifdef lseek
# undef lseek
# 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 PathIsNetworkPathW(wpath) (! wcsncmp(wpath, L"\\\\", 2))
#endif
-#include "charset.h"
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
-
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
- "Allows you to modify the default caching value for file streams. This " \
- "value should be set in millisecond units." )
-#define CAT_TEXT N_("Concatenate with additional files")
-#define CAT_LONGTEXT N_( \
- "Allows you to play split files as if they were part of a unique file. " \
- "Specify a comma-separated list of files." )
-
-vlc_module_begin();
- set_description( _("Standard filesystem 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_string( "file-cat", NULL, NULL, CAT_TEXT, CAT_LONGTEXT, VLC_TRUE );
- set_capability( "access2", 50 );
- add_shortcut( "file" );
- add_shortcut( "stream" );
- add_shortcut( "kfir" );
- set_callbacks( Open, Close );
-vlc_module_end();
+#include <vlc_fs.h>
+#include <vlc_url.h>
+struct access_sys_t
+{
+ unsigned int i_nb_reads;
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-static int Seek( access_t *, int64_t );
-static int Read( access_t *, uint8_t *, int );
-static int Control( access_t *, int, va_list );
+ int fd;
-static int _OpenFile( access_t *, const char * );
+ /* */
+ unsigned caching;
+ bool b_pace_control;
+};
-typedef struct
+#ifndef WIN32
+static bool IsRemote (int fd)
{
- char *psz_name;
- int64_t i_size;
+#if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL)
+ struct statvfs stf;
-} file_entry_t;
+ if (fstatvfs (fd, &stf))
+ return false;
+ /* fstatvfs() is in POSIX, but MNT_LOCAL is not */
+ return !(stf.f_flag & MNT_LOCAL);
-struct access_sys_t
-{
- unsigned int i_nb_reads;
- vlc_bool_t b_kfir;
+#elif defined (HAVE_LINUX_MAGIC_H)
+ struct statfs stf;
+
+ if (fstatfs (fd, &stf))
+ return false;
- /* Files list */
- int i_file;
- file_entry_t **file;
+ switch ((unsigned long)stf.f_type)
+ {
+ case AFS_SUPER_MAGIC:
+ case CODA_SUPER_MAGIC:
+ case NCP_SUPER_MAGIC:
+ case NFS_SUPER_MAGIC:
+ case SMB_SUPER_MAGIC:
+ case 0xFF534D42 /*CIFS_MAGIC_NUMBER*/:
+ return true;
+ }
+ return false;
- /* Current file */
- int i_index;
-#ifndef UNDER_CE
- int fd;
- int fd_backup;
#else
- FILE *fd;
- FILE *fd_backup;
+ (void)fd;
+ return false;
+
+#endif
+}
#endif
- /* */
- vlc_bool_t b_seekable;
- vlc_bool_t b_pace_control;
-};
+#ifndef HAVE_POSIX_FADVISE
+# define posix_fadvise(fd, off, len, adv)
+#endif
/*****************************************************************************
* Open: open the file
*****************************************************************************/
-static int Open( vlc_object_t *p_this )
+int Open( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
- access_sys_t *p_sys;
- char *psz_name = p_access->psz_path;
- char *psz;
-
-#ifdef HAVE_SYS_STAT_H
- int i_stat;
- struct stat stat_info;
+#ifdef WIN32
+ bool is_remote = false;
#endif
- vlc_bool_t b_stdin;
-
- file_entry_t * p_file;
-
- b_stdin = psz_name[0] == '-' && psz_name[1] == '\0';
+ /* Open file */
+ int fd = -1;
-#ifdef HAVE_SYS_STAT_H
- if( !b_stdin && (i_stat = stat( psz_name, &stat_info )) == (-1) )
+ if (!strcasecmp (p_access->psz_access, "fd"))
{
- msg_Warn( p_access, "cannot stat() file `%s' (%s)",
- psz_name, strerror(errno));
- return VLC_EGENERIC;
- }
-#endif
+ char *end;
+ int oldfd = strtol (p_access->psz_location, &end, 10);
- p_access->pf_read = Read;
- p_access->pf_block = NULL;
- p_access->pf_seek = Seek;
- p_access->pf_control = Control;
- p_access->info.i_update = 0;
- p_access->info.i_size = 0;
- p_access->info.i_pos = 0;
- p_access->info.b_eof = VLC_FALSE;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
- p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
- p_sys->i_nb_reads = 0;
- p_sys->b_kfir = VLC_FALSE;
- p_sys->file = NULL;
- p_sys->i_file = 0;
- p_sys->i_index = 0;
-#ifndef UNDER_CE
- p_sys->fd = -1;
-#endif
-
- 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;
+ if (*end == '\0')
+ fd = vlc_dup (oldfd);
+ else if (*end == '/' && end > p_access->psz_location)
+ {
+ char *name = decode_URI_duplicate (end - 1);
+ if (name != NULL)
+ {
+ name[0] = '.';
+ fd = vlc_openat (oldfd, name, O_RDONLY | O_NONBLOCK);
+ free (name);
+ }
+ }
}
else
{
- /* file:%s or %s */
- p_sys->b_pace_control = VLC_TRUE;
+ const char *path = p_access->psz_filepath;
- if( b_stdin )
- {
- p_sys->b_seekable = VLC_FALSE;
- }
-#ifdef UNDER_CE
- else if( VLC_TRUE )
+ msg_Dbg (p_access, "opening file `%s'", path);
+ fd = vlc_open (path, O_RDONLY | O_NONBLOCK);
+ if (fd == -1)
{
- /* We'll update i_size after it's been opened */
- p_sys->b_seekable = VLC_TRUE;
- }
-#elif defined( HAVE_SYS_STAT_H )
- else if( S_ISREG(stat_info.st_mode) || S_ISCHR(stat_info.st_mode) ||
- S_ISBLK(stat_info.st_mode) )
- {
- p_sys->b_seekable = VLC_TRUE;
- p_access->info.i_size = stat_info.st_size;
- }
- else if( S_ISFIFO(stat_info.st_mode)
-# if !defined( SYS_BEOS ) && !defined( WIN32 )
- || S_ISSOCK(stat_info.st_mode)
-# endif
- )
- {
- p_sys->b_seekable = VLC_FALSE;
+ msg_Err (p_access, "cannot open file %s (%m)", path);
+ dialog_Fatal (p_access, _("File reading failed"),
+ _("VLC could not open the file \"%s\"."), path);
}
+
+#ifdef WIN32
+ wchar_t wpath[MAX_PATH+1];
+ if (MultiByteToWideChar (CP_UTF8, 0, path, -1,
+ wpath, MAX_PATH)
+ && PathIsNetworkPathW (wpath))
+ is_remote = true;
+# define IsRemote( fd ) ((void)fd, is_remote)
#endif
- else
- {
- msg_Err( p_access, "unknown file type for `%s'", psz_name );
- return VLC_EGENERIC;
- }
}
+ if (fd == -1)
+ return VLC_EGENERIC;
- msg_Dbg( p_access, "opening file `%s'", psz_name );
-
- if( b_stdin )
+ struct stat st;
+ if (fstat (fd, &st))
{
- p_sys->fd = 0;
+ msg_Err (p_access, "failed to read (%m)");
+ goto error;
}
- else if( _OpenFile( p_access, psz_name ) )
+ /* Directories can be opened and read from, but only readdir() knows
+ * how to parse the data. The directory plugin will do it. */
+ if (S_ISDIR (st.st_mode))
{
- free( p_sys );
- return VLC_EGENERIC;
+#ifdef HAVE_FDOPENDIR
+ DIR *handle = fdopendir (fd);
+ if (handle == NULL)
+ goto error; /* Uh? */
+ return DirInit (p_access, handle);
+#else
+ msg_Dbg (p_access, "ignoring directory");
+ goto error;
+#endif
}
- if( p_sys->b_seekable && !p_access->info.i_size )
+ access_sys_t *p_sys = malloc (sizeof (*p_sys));
+ if (unlikely(p_sys == NULL))
+ goto error;
+ access_InitFields (p_access);
+ p_access->pf_read = FileRead;
+ p_access->pf_block = NULL;
+ p_access->pf_control = FileControl;
+ p_access->pf_seek = FileSeek;
+ p_access->p_sys = p_sys;
+ p_sys->i_nb_reads = 0;
+ p_sys->fd = fd;
+ p_sys->caching = var_InheritInteger (p_access, "file-caching");
+ if (IsRemote(fd))
+ p_sys->caching += var_InheritInteger (p_access, "network-caching");
+ p_sys->b_pace_control = true;
+
+ if (S_ISREG (st.st_mode))
+ p_access->info.i_size = st.st_size;
+ else if (!S_ISBLK (st.st_mode))
{
- /* FIXME that's bad because all others access will be probed */
- msg_Err( p_access, "file %s is empty, aborting", psz_name );
- free( p_sys );
- return VLC_EGENERIC;
+ p_access->pf_seek = NoSeek;
+ p_sys->b_pace_control = strcasecmp (p_access->psz_access, "stream");
}
- /* Update default_pts to a suitable value for file access */
- var_Create( p_access, "file-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
- /*
- * Get the additional list of files
- */
- p_file = malloc( sizeof(file_entry_t) );
- p_file->i_size = p_access->info.i_size;
- p_file->psz_name = strdup( psz_name );
- TAB_APPEND( p_sys->i_file, p_sys->file, p_file );
-
- psz = var_CreateGetString( p_access, "file-cat" );
- if( *psz )
+ if (p_access->pf_seek != NoSeek)
{
- char *psz_parser = psz_name = psz;
- int64_t i_size;
-
- while( psz_name && *psz_name )
- {
- psz_parser = strchr( psz_name, ',' );
- if( psz_parser ) *psz_parser = 0;
-
- psz_name = strdup( psz_name );
- if( psz_name )
- {
- msg_Dbg( p_access, "adding file `%s'", psz_name );
- i_size = 0;
-
-#ifdef HAVE_SYS_STAT_H
- if( !stat( psz_name, &stat_info ) )
- {
- p_access->info.i_size += stat_info.st_size;
- i_size = stat_info.st_size;
- }
- else
- {
- msg_Dbg( p_access, "cannot stat() file `%s'", psz_name );
- }
+ /* 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);
+#if defined(HAVE_FCNTL)
+ /* 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
- p_file = malloc( sizeof(file_entry_t) );
- p_file->i_size = i_size;
- p_file->psz_name = psz_name;
-
- TAB_APPEND( p_sys->i_file, p_sys->file, p_file );
- }
-
- psz_name = psz_parser;
- if( psz_name ) psz_name++;
- }
}
- free( psz );
-
return VLC_SUCCESS;
+
+error:
+ close (fd);
+ return VLC_EGENERIC;
}
/*****************************************************************************
* Close: close the target
*****************************************************************************/
-static void Close( vlc_object_t * p_this )
+void Close (vlc_object_t * p_this)
{
access_t *p_access = (access_t*)p_this;
- access_sys_t *p_sys = p_access->p_sys;
- int i;
- close( p_sys->fd );
-
- for( i = 0; i < p_sys->i_file; i++ )
+ if (p_access->pf_read == NULL)
{
- free( p_sys->file[i]->psz_name );
- free( p_sys->file[i] );
+ DirClose (p_this);
+ return;
}
- free( p_sys->file );
- free( p_sys );
+ access_sys_t *p_sys = p_access->p_sys;
+
+ close (p_sys->fd);
+ free (p_sys);
}
+
+#include <vlc_network.h>
+
/*****************************************************************************
* Read: standard read on a file descriptor.
*****************************************************************************/
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
+ssize_t FileRead( access_t *p_access, uint8_t *p_buffer, size_t i_len )
{
access_sys_t *p_sys = p_access->p_sys;
- int 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. */
- struct timeval timeout;
- fd_set fds;
-
- /* Initialize file descriptor set */
- FD_ZERO( &fds );
- FD_SET( p_sys->fd, &fds );
-
- /* We'll wait 0.5 second if nothing happens */
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
-
- /* Find if some data is available */
- while( (i_ret = select( p_sys->fd + 1, &fds, NULL, NULL, &timeout )) == 0
- || (i_ret < 0 && errno == EINTR) )
- {
- FD_ZERO( &fds );
- FD_SET( p_sys->fd, &fds );
- timeout.tv_sec = 0;
- timeout.tv_usec = 500000;
-
- if( p_access->b_die )
- return 0;
- }
+ int fd = p_sys->fd;
+ ssize_t i_ret;
- if( i_ret < 0 )
- {
- msg_Err( p_access, "select error (%s)", strerror(errno) );
- return -1;
- }
-
- i_ret = read( p_sys->fd, p_buffer, i_len );
- }
- else
- {
- /* b_kfir ; work around a buggy poll() driver implementation */
- while ( (i_ret = read( p_sys->fd, p_buffer, i_len )) == 0 &&
- !p_access->b_die )
- {
- msleep( INPUT_ERROR_SLEEP );
- }
- }
- }
+#ifndef WIN32
+ if (p_access->pf_seek == NoSeek)
+ i_ret = net_Read (p_access, fd, NULL, p_buffer, i_len, false);
else
-#endif /* WIN32 || UNDER_CE */
- {
- /* b_pace_control || WIN32 */
- i_ret = read( p_sys->fd, p_buffer, i_len );
- }
+#endif
+ i_ret = read (fd, p_buffer, i_len);
if( i_ret < 0 )
{
- if( errno != EINTR && errno != EAGAIN )
- msg_Err( p_access, "read failed (%s)", strerror(errno) );
+ switch (errno)
+ {
+ case EINTR:
+ case EAGAIN:
+ break;
- /* Delay a bit to avoid consuming all the CPU. This is particularly
- * useful when reading from an unconnected FIFO. */
- msleep( INPUT_ERROR_SLEEP );
+ default:
+ msg_Err (p_access, "failed to read (%m)");
+ dialog_Fatal (p_access, _("File reading failed"), "%s",
+ _("VLC could not read the file."));
+ p_access->info.b_eof = true;
+ return 0;
+ }
}
+ else if( i_ret > 0 )
+ p_access->info.i_pos += i_ret;
+ else
+ p_access->info.b_eof = true;
p_sys->i_nb_reads++;
-#ifdef HAVE_SYS_STAT_H
- if( p_access->info.i_size != 0 &&
- (p_sys->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 )
+
+ if ((p_access->info.i_size && !(p_sys->i_nb_reads % INPUT_FSTAT_NB_READS))
+ || (p_access->info.i_pos > p_access->info.i_size))
{
- struct stat stat_info;
- int i_file = p_sys->i_index;
+#ifdef HAVE_SYS_STAT_H
+ struct stat st;
- if ( fstat( p_sys->fd, &stat_info ) == -1 )
- {
- msg_Warn( p_access, "couldn't stat again the file (%s)", strerror(errno) );
- }
- else if ( p_sys->file[i_file]->i_size != stat_info.st_size )
+ if ((fstat (fd, &st) == 0)
+ && (p_access->info.i_size != (uint64_t)st.st_size))
{
- p_access->info.i_size += (stat_info.st_size - p_sys->file[i_file]->i_size );
- p_sys->file[i_file]->i_size = stat_info.st_size;
+ p_access->info.i_size = st.st_size;
p_access->info.i_update |= INPUT_UPDATE_SIZE;
}
- }
#endif
-
- /* If we reached an EOF then switch to the next file in the list */
- if ( i_ret == 0 && p_sys->i_index + 1 < p_sys->i_file )
- {
- char *psz_name = p_sys->file[++p_sys->i_index]->psz_name;
- p_sys->fd_backup = p_sys->fd;
-
- msg_Dbg( p_access, "opening file `%s'", psz_name );
-
- if ( _OpenFile( p_access, psz_name ) )
- {
- p_sys->fd = p_sys->fd_backup;
- return 0;
- }
-
- close( p_sys->fd_backup );
-
- /* We have to read some data */
- return Read( p_access, p_buffer, i_len );
}
-
- 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;
}
+
/*****************************************************************************
* Seek: seek to a specific location in a file
*****************************************************************************/
-static int Seek( access_t *p_access, int64_t i_pos )
+int FileSeek (access_t *p_access, uint64_t i_pos)
{
- access_sys_t *p_sys = p_access->p_sys;
- int64_t i_size = 0;
-
- /* Check which file we need to access */
- if( p_sys->i_file > 1 )
- {
- int i;
- char *psz_name;
- p_sys->fd_backup = p_sys->fd;
-
- for( i = 0; i < p_sys->i_file - 1; i++ )
- {
- if( i_pos < p_sys->file[i]->i_size + i_size )
- break;
- i_size += p_sys->file[i]->i_size;
- }
- psz_name = p_sys->file[i]->psz_name;
-
- msg_Dbg( p_access, "opening file `%s'", psz_name );
-
- if ( i != p_sys->i_index && !_OpenFile( p_access, psz_name ) )
- {
- /* Close old file */
- close( p_sys->fd_backup );
- p_sys->i_index = i;
- }
- else
- {
- p_sys->fd = p_sys->fd_backup;
- }
- }
-
- lseek( p_sys->fd, i_pos - i_size, SEEK_SET );
-
p_access->info.i_pos = i_pos;
- if( p_access->info.i_size < p_access->info.i_pos )
- {
- msg_Err( p_access, "seeking too far" );
- p_access->info.i_pos = p_access->info.i_size;
- }
- else if( p_access->info.i_pos < 0 )
- {
- msg_Err( p_access, "seeking too early" );
- p_access->info.i_pos = 0;
- }
- /* Reset eof */
- p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_eof = false;
- /* FIXME */
+ lseek (p_access->p_sys->fd, i_pos, SEEK_SET);
return VLC_SUCCESS;
}
+int NoSeek (access_t *p_access, uint64_t i_pos)
+{
+ /* assert(0); ?? */
+ (void) p_access; (void) i_pos;
+ return VLC_EGENERIC;
+}
+
/*****************************************************************************
* Control:
*****************************************************************************/
-static int Control( access_t *p_access, int i_query, va_list args )
+int FileControl( access_t *p_access, int i_query, va_list args )
{
access_sys_t *p_sys = p_access->p_sys;
- vlc_bool_t *pb_bool;
- int *pi_int;
- int64_t *pi_64;
+ bool *pb_bool;
+ int64_t *pi_64;
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = p_sys->b_seekable;
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = (p_access->pf_seek != NoSeek);
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_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = 0;
- 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 = p_sys->caching * INT64_C(1000);
break;
/* */
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 in control" );
+ msg_Warn( p_access, "unimplemented query %d in control", i_query );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
-
-
-/*****************************************************************************
- * OpenFile: Opens a specific file
- *****************************************************************************/
-static int _OpenFile( access_t * p_access, const char * psz_name )
-{
- access_sys_t *p_sys = p_access->p_sys;
- const char *psz_localname;
-
- psz_localname = ToLocale( psz_name );
-
-#ifdef UNDER_CE
- p_sys->fd = fopen( psz_localname, "rb" );
- LocaleFree( psz_localname );
- if ( !p_sys->fd )
- {
- msg_Err( p_access, "cannot open file %s", psz_name );
- return VLC_EGENERIC;
- }
-
- 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
-
- p_sys->fd = open( psz_localname, O_NONBLOCK /*| O_LARGEFILE*/ );
- LocaleFree( psz_localname );
- if ( p_sys->fd == -1 )
- {
- msg_Err( p_access, "cannot open file %s (%s)", psz_name,
- strerror(errno) );
- return VLC_EGENERIC;
- }
-#endif
-
- return VLC_SUCCESS;
-}
projects / vlc / blobdiff