X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fgnomevfs.c;h=d39d54d36e6457ea31915dc3d113948655c8735d;hb=3de7f18a4cc4f264a571384437373bc255da0632;hp=399dab65df382c1946f5d49fef50516af4d7c8e1;hpb=81c5ac29fa2e80426c1b1dfcc941a1aabe8bc808;p=vlc diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c index 399dab65df..d39d54d36e 100644 --- a/modules/access/gnomevfs.c +++ b/modules/access/gnomevfs.c @@ -24,16 +24,20 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include -#include -#include #include -#include "vlc_url.h" +#include /***************************************************************************** * Module descriptor @@ -46,24 +50,24 @@ static void Close( vlc_object_t * ); "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, VLC_TRUE ); - set_capability( "access2", 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 ) + 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 () /***************************************************************************** * 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 { @@ -73,11 +77,14 @@ struct access_sys_t GnomeVFSHandle *p_handle; GnomeVFSFileInfo *p_file_info; - vlc_bool_t b_local; - vlc_bool_t b_seekable; - vlc_bool_t b_pace_control; + bool b_local; + bool b_seekable; + 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 *****************************************************************************/ @@ -108,19 +115,17 @@ static int Open( vlc_object_t *p_this ) p_sys->p_handle = p_handle; p_sys->i_nb_reads = 0; - p_sys->b_pace_control = VLC_TRUE; + 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 ); @@ -153,9 +158,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 ); @@ -185,7 +188,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; } @@ -193,7 +196,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; @@ -207,7 +210,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; @@ -215,20 +218,20 @@ static int Open( vlc_object_t *p_this ) if (GNOME_VFS_FILE_INFO_LOCAL( p_sys->p_file_info )) { - p_sys->b_local = VLC_TRUE; + p_sys->b_local = true; } if( p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_REGULAR || p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE || p_sys->p_file_info->type == GNOME_VFS_FILE_TYPE_BLOCK_DEVICE ) { - p_sys->b_seekable = VLC_TRUE; + 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 ) { - p_sys->b_seekable = VLC_FALSE; + p_sys->b_seekable = false; } else { @@ -243,7 +246,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; } @@ -252,7 +255,7 @@ static int Open( vlc_object_t *p_this ) 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; @@ -283,7 +286,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; @@ -293,7 +296,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) (GnomeVFSFileSize)i_len, &i_read_len ); if( i_ret ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; if( i_ret != GNOME_VFS_ERROR_EOF ) { msg_Err( p_access, "read failed (%s)", @@ -327,7 +330,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) /* Some Acces (http) never return EOF and loop on the file */ if( p_access->info.i_pos > p_access->info.i_size ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return 0; } return (int)i_read_len; @@ -336,7 +339,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; @@ -361,7 +364,7 @@ static int Seek( access_t *p_access, int64_t i_pos ) } } /* Reset eof */ - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; /* FIXME */ return VLC_SUCCESS; @@ -373,8 +376,7 @@ static int Seek( access_t *p_access, int64_t i_pos ) 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; - int *pi_int; + bool *pb_bool; int64_t *pi_64; switch( i_query ) @@ -382,26 +384,20 @@ static int Control( access_t *p_access, int i_query, va_list args ) /* */ 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_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, - "gnomevfs-caching" ) * I64C(1000); + "gnomevfs-caching" ) * INT64_C(1000); break; /* */ @@ -414,6 +410,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: case ACCESS_GET_META: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: