From b9dc215ef92924d7b8ef05408ae9cffa04995300 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Sun, 30 May 2010 16:29:21 +0200 Subject: [PATCH] Fix variables types. --- modules/control/http/http.c | 2 +- modules/demux/ps.c | 2 +- modules/services_discovery/sap.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/control/http/http.c b/modules/control/http/http.c index b73191686b..bd3062c365 100644 --- a/modules/control/http/http.c +++ b/modules/control/http/http.c @@ -261,7 +261,7 @@ static int Open( vlc_object_t *p_this ) free( psz_src ); - if( var_InheritInteger( p_intf, "http-album-art" ) ) + if( var_InheritBool( p_intf, "http-album-art" ) ) { /* FIXME: we're leaking h */ httpd_handler_sys_t *h = malloc( sizeof( httpd_handler_sys_t ) ); diff --git a/modules/demux/ps.c b/modules/demux/ps.c index 7bdb388f86..f21be2de6c 100644 --- a/modules/demux/ps.c +++ b/modules/demux/ps.c @@ -240,7 +240,7 @@ static void FindLength( demux_t *p_demux ) int64_t i_current_pos = -1, i_size = 0, i_end = 0; int i; - if( !var_CreateGetInteger( p_demux, "ps-trust-timestamps" ) ) + if( !var_CreateGetBool( p_demux, "ps-trust-timestamps" ) ) return; if( p_sys->i_length == -1 ) /* First time */ diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index 52c3b83ae2..a6aee7728d 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -319,11 +319,11 @@ static int Open( vlc_object_t *p_this ) p_sys->pi_fd = NULL; p_sys->i_fd = 0; - p_sys->b_strict = var_CreateGetInteger( p_sd, "sap-strict"); - p_sys->b_parse = var_CreateGetInteger( p_sd, "sap-parse" ); + p_sys->b_strict = var_CreateGetBool( p_sd, "sap-strict"); + p_sys->b_parse = var_CreateGetBool( p_sd, "sap-parse" ); #if 0 - if( var_CreateGetInteger( p_sd, "sap-cache" ) ) + if( var_CreateGetBool( p_sd, "sap-cache" ) ) { CacheLoad( p_sd ); } @@ -353,7 +353,7 @@ static int OpenDemux( vlc_object_t *p_this ) int errval = VLC_EGENERIC; size_t i_len; - if( !var_CreateGetInteger( p_demux, "sap-parse" ) ) + if( !var_CreateGetBool( p_demux, "sap-parse" ) ) { /* We want livedotcom module to parse this SDP file */ return VLC_EGENERIC; @@ -495,14 +495,14 @@ static void *Run( void *data ) * Winsock 1.1 from Windows 95, if not Windows 3.1. * Anyway, to avoid a 30 seconds delay for failed IPv6 socket creation, * we have to open sockets in Run() rather than Open(). */ - if( var_CreateGetInteger( p_sd, "sap-ipv4" ) ) + if( var_CreateGetBool( p_sd, "sap-ipv4" ) ) { InitSocket( p_sd, SAP_V4_GLOBAL_ADDRESS, SAP_PORT ); InitSocket( p_sd, SAP_V4_ORG_ADDRESS, SAP_PORT ); InitSocket( p_sd, SAP_V4_LOCAL_ADDRESS, SAP_PORT ); InitSocket( p_sd, SAP_V4_LINK_ADDRESS, SAP_PORT ); } - if( var_CreateGetInteger( p_sd, "sap-ipv6" ) ) + if( var_CreateGetBool( p_sd, "sap-ipv6" ) ) { char psz_address[NI_MAXNUMERICHOST] = "ff02::2:7ffe%"; -- 2.39.2