struct access_sys_t
{
- unsigned int i_nb_reads;
char *psz_name;
GnomeVFSHandle *p_handle;
STANDARD_READ_ACCESS_INIT;
p_sys->p_handle = p_handle;
- p_sys->i_nb_reads = 0;
p_sys->b_pace_control = true;
if( strcmp( "gnomevfs", p_access->psz_access ) &&
p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_BLOCK_DEVICE )
{
p_sys->b_seekable = true;
- p_access->info.i_size = (int64_t)(p_sys->p_file_info->size);
}
else if( p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_FIFO
|| p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_SOCKET )
return VLC_EGENERIC;
}
- if( p_sys->b_seekable && !p_access->info.i_size )
+ if( p_sys->b_seekable && !p_sys->p_file_info->size )
{
/* FIXME that's bad because all others access will be probed */
msg_Warn( p_access, "file %s is empty, aborting", psz_name );
gnome_vfs_result_to_string( i_ret ) );
}
}
- else
- {
- p_sys->i_nb_reads++;
- if( p_access->info.i_size != 0 &&
- (p_sys->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 &&
- p_sys->b_local )
- {
- gnome_vfs_file_info_clear( p_sys->p_file_info );
- i_ret = gnome_vfs_get_file_info_from_handle( p_sys->p_handle,
- p_sys->p_file_info, 8 );
- if( i_ret )
- {
- msg_Warn( p_access, "couldn't get file properties again (%s)",
- gnome_vfs_result_to_string( i_ret ) );
- }
- else
- {
- p_access->info.i_size = (int64_t)(p_sys->p_file_info->size);
- }
- }
- }
p_access->info.i_pos += (int64_t)i_read_len;
-
- /* Some Acces (http) never return EOF and loop on the file */
- if( p_access->info.i_pos > p_access->info.i_size )
+ if( p_access->info.i_pos >= p_sys->p_file_info->size
+ && p_sys->p_file_info->size != 0 && p_sys->b_local )
{
- p_access->info.b_eof = true;
- return 0;
+ gnome_vfs_file_info_clear( p_sys->p_file_info );
+ i_ret = gnome_vfs_get_file_info_from_handle( p_sys->p_handle,
+ p_sys->p_file_info, 8 );
+ if( i_ret )
+ msg_Warn( p_access, "couldn't get file properties again (%s)",
+ gnome_vfs_result_to_string( i_ret ) );
}
return (int)i_read_len;
}
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:
+ *va_arg( args, uint64_t * ) = p_sys->p_file_info->size;
+ break;
+
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = DEFAULT_PTS_DELAY; /* FIXME */
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_CONTENT_TYPE:
- return VLC_EGENERIC;
-
default:
- msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
-
}
return VLC_SUCCESS;
}