Used uint64_t for access_t::info.i_size/i_pos and access_t::pf_seek().

[vlc] / modules / access / mms / mmsh.c

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 2c2d21083c5587102166e6833f26e59e0e0445c8..b89565ccfd6f8033a47f189ec6a2e18c6a6f8487 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -54,11 +54,11 @@ void MMSHClose ( access_t * );
 
 static block_t *Block( access_t *p_access );
 static ssize_t ReadRedirect( access_t *, uint8_t *, size_t );
-static int  Seek( access_t *, int64_t );
+static int  Seek( access_t *, uint64_t );
 static int  Control( access_t *, int, va_list );
 
 static int  Describe( access_t  *, char **ppsz_location );
-static int  Start( access_t *, int64_t );
+static int  Start( access_t *, uint64_t );
 static void Stop( access_t * );
 
 static int  GetPacket( access_t *, chunk_t * );
@@ -90,39 +90,34 @@ int MMSHOpen( access_t *p_access )
 
     /* Check proxy */
     /* TODO reuse instead http-proxy from http access ? */
-    psz_proxy = var_CreateGetString( p_access, "mmsh-proxy" );
-    if( !*psz_proxy )
+    psz_proxy = var_CreateGetNonEmptyString( p_access, "mmsh-proxy" );
+    if( !psz_proxy )
     {
-        char *psz_http_proxy = config_GetPsz( p_access, "http-proxy" );
-        if( psz_http_proxy && *psz_http_proxy )
+        char *psz_http_proxy = var_InheritString( p_access, "http-proxy" );
+        if( psz_http_proxy )
         {
-            free( psz_proxy );
             psz_proxy = psz_http_proxy;
             var_SetString( p_access, "mmsh-proxy", psz_proxy );
         }
-        else
-        {
-            free( psz_http_proxy );
-        }
     }
 
-    if( *psz_proxy )
+    if( psz_proxy )
     {
         p_sys->b_proxy = true;
         vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
+        free( psz_proxy );
     }
 #ifdef HAVE_GETENV
     else
     {
-        char *psz_proxy = getenv( "http_proxy" );
-        if( psz_proxy && *psz_proxy )
+        const char *http_proxy = getenv( "http_proxy" );
+        if( http_proxy )
         {
             p_sys->b_proxy = true;
-            vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
+            vlc_UrlParse( &p_sys->proxy, http_proxy, 0 );
         }
     }
 #endif
-    free( psz_proxy );
 
     if( p_sys->b_proxy )
     {
@@ -292,12 +287,12 @@ static int Control( access_t *p_access, int i_query, va_list args )
 /*****************************************************************************
  * Seek: try to go at the right place
  *****************************************************************************/
-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;
     chunk_t      ck;
-    off_t        i_offset;
-    off_t        i_packet;
+    uint64_t     i_offset;
+    uint64_t     i_packet;
 
     msg_Dbg( p_access, "seeking to %"PRId64, i_pos );
 
@@ -466,7 +461,7 @@ static int Reset( access_t *p_access )
 
     asf_StreamSelect( &p_sys->asfh,
                        var_CreateGetInteger( p_access, "mms-maxbitrate" ),
-                       var_CreateGetInteger( p_access, "mms-all" ),
+                       var_CreateGetBool( p_access, "mms-all" ),
                        var_CreateGetInteger( p_access, "audio" ),
                        var_CreateGetInteger( p_access, "video" ) );
 
@@ -703,7 +698,7 @@ static int Describe( access_t  *p_access, char **ppsz_location )
 
     asf_StreamSelect( &p_sys->asfh,
                        var_CreateGetInteger( p_access, "mms-maxbitrate" ),
-                       var_CreateGetInteger( p_access, "mms-all" ),
+                       var_CreateGetBool( p_access, "mms-all" ),
                        var_CreateGetInteger( p_access, "audio" ),
                        var_CreateGetInteger( p_access, "video" ) );
     return VLC_SUCCESS;
@@ -746,7 +741,7 @@ static void GetHeader( access_t *p_access )
 /*****************************************************************************
  * Start stream
  ****************************************************************************/
-static int Start( access_t *p_access, int64_t i_pos )
+static int Start( access_t *p_access, uint64_t i_pos )
 {
     access_sys_t *p_sys = p_access->p_sys;
     int  i_streams = 0;