Apparently, since 'setlocale( LC_NUMERIC, "C" );' was removed from
libvlc initialization 3 years ago, the syntax to set configuration
variables of floating point types has changed and become dependent
on the current locale ("0.5" vs. "0,5" etc). Some places have been
converted to the use of us_atof() which is locale-independent; fix
all the remaining ones too.
#include <vlc_demux.h>
#include <vlc_access.h>
#include <vlc_picture.h>
#include <vlc_demux.h>
#include <vlc_access.h>
#include <vlc_picture.h>
+#include <vlc_charset.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
}
else if( !strncmp( psz_parser, "fps=", strlen( "fps=" ) ) )
{
}
else if( !strncmp( psz_parser, "fps=", strlen( "fps=" ) ) )
{
- p_sys->f_fps = strtof( psz_parser + strlen( "fps=" ),
- &psz_parser );
+ p_sys->f_fps = us_strtof( psz_parser + strlen( "fps=" ),
+ &psz_parser );
}
else if( !strncmp( psz_parser, "adev=", strlen( "adev=" ) )
|| !strncmp( psz_parser, "samplerate=", strlen( "samplerate=" ) )
}
else if( !strncmp( psz_parser, "adev=", strlen( "adev=" ) )
|| !strncmp( psz_parser, "samplerate=", strlen( "samplerate=" ) )
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
+#include <vlc_charset.h>
#include <vlc_demux.h>
#include <vlc_input.h>
#include <vlc_demux.h>
#include <vlc_input.h>
}
else if( !strncmp( psz_parser, "fps=", strlen( "fps=" ) ) )
{
}
else if( !strncmp( psz_parser, "fps=", strlen( "fps=" ) ) )
{
- p_sys->f_fps = strtof( psz_parser + strlen( "fps=" ),
- &psz_parser );
+ p_sys->f_fps = us_strtof( psz_parser + strlen( "fps=" ),
+ &psz_parser );
}
else if( !strncmp( psz_parser, "io=", strlen( "io=" ) ) )
{
}
else if( !strncmp( psz_parser, "io=", strlen( "io=" ) ) )
{
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_codec.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_codec.h>
+#include <vlc_charset.h>
#ifdef PTW32_STATIC_LIB
#include <pthread.h>
#ifdef PTW32_STATIC_LIB
#include <pthread.h>
if( val.psz_string )
{
char *p = strchr( val.psz_string, ':' );
if( val.psz_string )
{
char *p = strchr( val.psz_string, ':' );
- p_sys->param.analyse.f_psy_rd = atof( val.psz_string );
- p_sys->param.analyse.f_psy_trellis = p ? atof( p+1 ) : 0;
+ p_sys->param.analyse.f_psy_rd = us_atof( val.psz_string );
+ p_sys->param.analyse.f_psy_trellis = p ? us_atof( p+1 ) : 0;
free( val.psz_string );
}
free( val.psz_string );
}
var_Get( p_enc, SOUT_CFG_PREFIX "level", &val );
if( val.psz_string )
{
var_Get( p_enc, SOUT_CFG_PREFIX "level", &val );
if( val.psz_string )
{
- if( atof (val.psz_string) < 6 )
- p_sys->param.i_level_idc = (int) ( 10 * atof (val.psz_string) + .5);
+ if( us_atof (val.psz_string) < 6 )
+ p_sys->param.i_level_idc = (int) (10 * us_atof (val.psz_string)
+ + .5);
else
p_sys->param.i_level_idc = atoi (val.psz_string);
free( val.psz_string );
else
p_sys->param.i_level_idc = atoi (val.psz_string);
free( val.psz_string );
#include <vlc_common.h>
#include "libvlc.h"
#include <vlc_common.h>
#include "libvlc.h"
+#include <vlc_charset.h>
#include "vlc_interface.h"
#include "vlc_interface.h"
NULL, 0 );
break;
case VLC_VAR_FLOAT:
NULL, 0 );
break;
case VLC_VAR_FLOAT:
- val.f_float = atof( cfg->psz_value ? cfg->psz_value : "0" );
+ val.f_float = us_atof( cfg->psz_value ? cfg->psz_value : "0" );
break;
case VLC_VAR_STRING:
case VLC_VAR_MODULE:
break;
case VLC_VAR_STRING:
case VLC_VAR_MODULE:
#endif
#include <vlc_common.h>
#endif
#include <vlc_common.h>
+#include <vlc_charset.h>
#include "variables.h"
#include "libvlc.h"
#include "variables.h"
#include "libvlc.h"
break;
case VLC_VAR_FLOAT:
break;
case VLC_VAR_FLOAT:
- val.f_float = atof( psz_value );
+ val.f_float = us_atof( psz_value );
break;
case VLC_VAR_STRING:
break;
case VLC_VAR_STRING:
i_ret = var_SetInteger( p_obj, psz_cmd, atoi( psz_arg ) );
break;
case VLC_VAR_FLOAT:
i_ret = var_SetInteger( p_obj, psz_cmd, atoi( psz_arg ) );
break;
case VLC_VAR_FLOAT:
- i_ret = var_SetFloat( p_obj, psz_cmd, atof( psz_arg ) );
+ i_ret = var_SetFloat( p_obj, psz_cmd, us_atof( psz_arg ) );
break;
case VLC_VAR_STRING:
i_ret = var_SetString( p_obj, psz_cmd, psz_arg );
break;
case VLC_VAR_STRING:
i_ret = var_SetString( p_obj, psz_cmd, psz_arg );
- i_aspect = atof( val.psz_string );
+ i_aspect = us_atof( val.psz_string );
vlc_ureduce( &i_aspect_num, &i_aspect_den,
i_aspect *VOUT_ASPECT_FACTOR, VOUT_ASPECT_FACTOR, 0 );
}
vlc_ureduce( &i_aspect_num, &i_aspect_den,
i_aspect *VOUT_ASPECT_FACTOR, VOUT_ASPECT_FACTOR, 0 );
}