posix: drop support for non-UTF-8 operating systems

[vlc] / modules / access / gnomevfs.c

diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c
index b0ce8ecf020550be4be8e29e12f2a0c1e7d59030..b9eebf7070cbd78f38f284545a375e677de7318a 100644 (file)
--- a/modules/access/gnomevfs.c
+++ b/modules/access/gnomevfs.c
@@ -24,6 +24,7 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -34,9 +35,7 @@
 
 #include <libgnomevfs/gnome-vfs.h>
 
-
-#include <vlc_charset.h>
-#include "vlc_url.h"
+#include <vlc_url.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -44,17 +43,11 @@
 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( 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 )
@@ -64,9 +57,9 @@ vlc_module_end ()
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-static int  Seek( access_t *, int64_t );
-static int  Read( access_t *, uint8_t *, size_t );
-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
 {
@@ -92,7 +85,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;
@@ -120,15 +112,13 @@ static int Open( vlc_object_t *p_this )
                                             *(p_access->psz_access) != '\0')
     {
         asprintf( &psz_name, "%s://%s", p_access->psz_access,
-                                                    p_access->psz_path );
+                  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 );
 
@@ -250,10 +240,6 @@ static int Open( vlc_object_t *p_this )
         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 );
-
     free( psz_uri );
     p_sys->psz_name = psz_name;
     gnome_vfs_uri_unref( p_uri);
@@ -285,7 +271,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, size_t 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;
@@ -338,7 +324,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, size_t 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;
@@ -395,8 +381,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
 
         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;
 
         /* */