X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fgnomevfs.c;h=9a07e461a790b5b81af6227948029af88e2aa9ca;hb=c577308f124a9c5b07a9e3653bcb317cfced776f;hp=d446c03fd11b1fb55d2f2139902eee208febee58;hpb=d1d3dc1d109110bf68cb048c429f6f05a3839200;p=vlc diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c index d446c03fd1..9a07e461a7 100644 --- a/modules/access/gnomevfs.c +++ b/modules/access/gnomevfs.c @@ -1,41 +1,41 @@ /***************************************************************************** * gnomevfs.c: GnomeVFS input ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005 VLC authors and VideoLAN * $Id$ * * Authors: Benjamin Pracht * - * 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 - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include +#include #include #include - -#include -#include "vlc_url.h" +#include /***************************************************************************** * Module descriptor @@ -43,33 +43,26 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -#define CACHING_TEXT N_("Caching value in ms") -#define CACHING_LONGTEXT N_( \ - "Caching value for GnomeVFS streams."\ - "This value should be set in milliseconds." ) - -vlc_module_begin(); - set_description( _("GnomeVFS input") ); - set_shortname( "GnomeVFS" ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); - set_capability( "access", 10 ); - add_shortcut( "gnomevfs" ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("GnomeVFS input") ) + set_shortname( "GnomeVFS" ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + set_capability( "access", 10 ) + add_shortcut( "gnomevfs" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * 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 ); +static int Seek( access_t *, uint64_t ); +static ssize_t Read( access_t *, uint8_t *, size_t ); +static int Control( access_t *, int, va_list ); struct access_sys_t { - unsigned int i_nb_reads; char *psz_name; GnomeVFSHandle *p_handle; @@ -80,6 +73,9 @@ struct access_sys_t bool b_pace_control; }; +/* NOTE: we do not handle memory errors in this plugin. + * Underlying glib does not, so there is no point in doing it here either. */ + /***************************************************************************** * Open: open the file *****************************************************************************/ @@ -88,7 +84,6 @@ static int Open( vlc_object_t *p_this ) access_t *p_access = (access_t*)p_this; access_sys_t *p_sys = NULL; char *psz_name = NULL; - char *psz = NULL; char *psz_uri = NULL; char *psz_unescaped = NULL; char *psz_expand_tilde = NULL; @@ -109,24 +104,19 @@ static int Open( vlc_object_t *p_this ) 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_access->psz_access) != '\0') { - psz_name = malloc( strlen( p_access->psz_access ) + - strlen( p_access->psz_path ) + 4 ); - sprintf( psz_name, "%s://%s", p_access->psz_access, - p_access->psz_path ); + asprintf( &psz_name, "%s://%s", p_access->psz_access, + p_access->psz_location ); } else { - psz_name = strdup( p_access->psz_path ); + psz_name = strdup( p_access->psz_location ); } - psz = ToLocale( psz_name ); - psz_expand_tilde = gnome_vfs_expand_initial_tilde( psz ); - LocaleFree( psz ); + psz_expand_tilde = gnome_vfs_expand_initial_tilde( psz_name ); psz_unescaped = gnome_vfs_make_uri_from_shell_arg( psz_expand_tilde ); @@ -155,9 +145,7 @@ static int Open( vlc_object_t *p_this ) psz_path_begin = psz_unescaped + strlen( psz_unescaped ) - strlen( url.psz_path ); *psz_path_begin = '\0'; - psz_uri = malloc( strlen( psz_unescaped ) + - strlen( psz_escaped_path ) + 1 ); - sprintf( psz_uri, "%s%s",psz_unescaped, psz_escaped_path ); + asprintf( &psz_uri, "%s%s", psz_unescaped, psz_escaped_path ); g_free( psz_escaped_path ); g_free( psz_unescaped ); @@ -187,7 +175,7 @@ static int Open( vlc_object_t *p_this ) gnome_vfs_file_info_unref( p_sys->p_file_info ); gnome_vfs_uri_unref( p_uri); free( p_sys ); - g_free( psz_uri ); + free( psz_uri ); free( psz_name ); return VLC_EGENERIC; } @@ -195,7 +183,7 @@ static int Open( vlc_object_t *p_this ) else { msg_Warn( p_access, "cannot parse MRL %s or unsupported protocol", psz_name ); - g_free( psz_uri ); + free( psz_uri ); free( p_sys ); free( psz_name ); return VLC_EGENERIC; @@ -209,7 +197,7 @@ static int Open( vlc_object_t *p_this ) gnome_vfs_result_to_string( i_ret ) ); gnome_vfs_uri_unref( p_uri); - g_free( psz_uri ); + free( psz_uri ); free( p_sys ); free( psz_name ); return VLC_EGENERIC; @@ -225,7 +213,6 @@ static int Open( vlc_object_t *p_this ) 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 ) @@ -238,23 +225,19 @@ static int Open( vlc_object_t *p_this ) 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_file_info_unref( p_sys->p_file_info ); gnome_vfs_uri_unref( p_uri); free( p_sys ); - g_free( psz_uri ); + free( psz_uri ); free( psz_name ); return VLC_EGENERIC; } - /* Update default_pts to a suitable value for file access */ - var_Create( p_access, "gnomevfs-caching", - VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - - g_free( psz_uri ); + free( psz_uri ); p_sys->psz_name = psz_name; gnome_vfs_uri_unref( p_uri); return VLC_SUCCESS; @@ -285,7 +268,7 @@ static void Close( vlc_object_t * p_this ) /***************************************************************************** * Read: standard read on a file descriptor. *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) +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; GnomeVFSFileSize i_read_len; @@ -302,35 +285,17 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 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; } @@ -338,7 +303,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) /***************************************************************************** * Seek: seek to a specific location in a file *****************************************************************************/ -static int Seek( access_t *p_access, int64_t i_pos ) +static int Seek( access_t *p_access, uint64_t i_pos ) { access_sys_t *p_sys = p_access->p_sys; int i_ret; @@ -376,12 +341,10 @@ static int Control( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; bool *pb_bool; - int *pi_int; int64_t *pi_64; switch( i_query ) { - /* */ case ACCESS_CAN_SEEK: case ACCESS_CAN_FASTSEEK: pb_bool = (bool*)va_arg( args, bool* ); @@ -394,35 +357,21 @@ static int Control( access_t *p_access, int i_query, va_list args ) *pb_bool = p_sys->b_pace_control; break; - /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; + 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 = var_GetInteger( p_access, - "gnomevfs-caching" ) * INT64_C(1000); + *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; }