*
* 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 <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_access.h>
+
#include <libgnomevfs/gnome-vfs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include "charset.h"
-#include "network.h"
+#include <vlc_charset.h>
+#include "vlc_url.h"
/*****************************************************************************
* Module descriptor
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
- "Allows you to modify the default caching value for GnomeVFS streams."\
- "This value should be set in millisecond units." )
+ "Caching value for GnomeVFS streams."\
+ "This value should be set in milliseconds." )
vlc_module_begin();
- set_description( _("GnomeVFS filesystem file input") );
- set_shortname( _("GnomeVFS") );
+ 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, VLC_TRUE );
- set_capability( "access2", 10 );
+ 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();
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;
};
/*****************************************************************************
open a file with a valid protocol, try to open at least file:// */
gnome_vfs_open( &p_handle, "file://", 5 );
- 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 ) );
- if( !p_sys )
- return VLC_ENOMEM;
+ STANDARD_READ_ACCESS_INIT;
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')
vlc_UrlParse( &url, psz_unescaped, 0 );
psz_escaped_path = gnome_vfs_escape_path_string( url.psz_path );
- if( psz_escaped_path && strcmp( psz_escaped_path,"/" )
- && strcmp( psz_escaped_path,"//" ) )
+ if( psz_escaped_path )
{
/* Now let's reconstruct a valid URI from all that stuff */
- psz_path_begin = strstr( psz_unescaped, url.psz_path );
- if( psz_path_begin ) *psz_path_begin = '\0';
+ 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 );
{
p_sys->p_file_info = gnome_vfs_file_info_new();
i_ret = gnome_vfs_get_file_info_uri( p_uri,
- p_sys->p_file_info, 8 );
+ p_sys->p_file_info, 8 );
if( i_ret )
{
- msg_Err( p_access, "cannot get file info for uri %s (%s)",
+ msg_Warn( p_access, "cannot get file info for uri %s (%s)",
psz_uri, gnome_vfs_result_to_string( i_ret ) );
gnome_vfs_file_info_unref( p_sys->p_file_info );
gnome_vfs_uri_unref( p_uri);
gnome_vfs_uri_unref( p_uri);
g_free( psz_uri );
- free( p_sys );
+ free( p_sys );
free( psz_name );
return VLC_EGENERIC;
}
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 ||
+ 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
{
if( p_sys->b_seekable && !p_access->info.i_size )
{
/* FIXME that's bad because all others access will be probed */
- msg_Err( p_access, "file %s is empty, aborting", psz_name );
+ 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 );
(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)",
/* 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;
}
}
/* Reset eof */
- p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_eof = false;
/* FIXME */
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,
- "gnomevfs-caching" ) * I64C(1000);
+ "gnomevfs-caching" ) * INT64_C(1000);
break;
/* */
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_META:
+ case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
projects / vlc / blobdiff