Commit d601ddbb authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Return 64-bits values for integer object variables

parent 8daf472e
......@@ -292,7 +292,7 @@ int var_SetAddress( vlc_object_t *p_obj, const char *psz_name, void *ptr )
* \param psz_name The name of the variable
*/
LIBVLC_USED
static inline int var_GetInteger( vlc_object_t *p_obj, const char *psz_name )
static inline int64_t var_GetInteger( vlc_object_t *p_obj, const char *psz_name )
{
vlc_value_t val;
if( !var_GetChecked( p_obj, psz_name, VLC_VAR_INTEGER, &val ) )
......@@ -408,7 +408,7 @@ static inline void *var_GetAddress( vlc_object_t *p_obj, const char *psz_name )
* \param p_obj the object that holds the variable
* \param psz_name the name of the variable
*/
static inline int var_IncInteger( vlc_object_t *p_obj, const char *psz_name )
static inline int64_t var_IncInteger( vlc_object_t *p_obj, const char *psz_name )
{
vlc_value_t val;
val.i_int = 1;
......@@ -422,7 +422,7 @@ static inline int var_IncInteger( vlc_object_t *p_obj, const char *psz_name )
* \param p_obj the object that holds the variable
* \param psz_name the name of the variable
*/
static inline int var_DecInteger( vlc_object_t *p_obj, const char *psz_name )
static inline int64_t var_DecInteger( vlc_object_t *p_obj, const char *psz_name )
{
vlc_value_t val;
val.i_int = -1;
......@@ -431,7 +431,7 @@ static inline int var_DecInteger( vlc_object_t *p_obj, const char *psz_name )
}
#define var_DecInteger(a,b) var_DecInteger( VLC_OBJECT(a), b )
static inline unsigned var_OrInteger( vlc_object_t *obj, const char *name,
static inline uint64_t var_OrInteger( vlc_object_t *obj, const char *name,
unsigned v )
{
vlc_value_t val;
......@@ -441,7 +441,7 @@ static inline unsigned var_OrInteger( vlc_object_t *obj, const char *name,
}
#define var_OrInteger(a,b,c) var_OrInteger(VLC_OBJECT(a),b,c)
static inline unsigned var_NAndInteger( vlc_object_t *obj, const char *name,
static inline uint64_t var_NAndInteger( vlc_object_t *obj, const char *name,
unsigned v )
{
vlc_value_t val;
......@@ -458,7 +458,7 @@ static inline unsigned var_NAndInteger( vlc_object_t *obj, const char *name,
* \param psz_name The name of the variable
*/
LIBVLC_USED
static inline int var_CreateGetInteger( vlc_object_t *p_obj, const char *psz_name )
static inline int64_t var_CreateGetInteger( vlc_object_t *p_obj, const char *psz_name )
{
var_Create( p_obj, psz_name, VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
return var_GetInteger( p_obj, psz_name );
......@@ -554,7 +554,7 @@ static inline void *var_CreateGetAddress( vlc_object_t *p_obj,
* \param psz_name The name of the variable
*/
LIBVLC_USED
static inline int var_CreateGetIntegerCommand( vlc_object_t *p_obj, const char *psz_name )
static inline int64_t var_CreateGetIntegerCommand( vlc_object_t *p_obj, const char *psz_name )
{
var_Create( p_obj, psz_name, VLC_VAR_INTEGER | VLC_VAR_DOINHERIT
| VLC_VAR_ISCOMMAND );
......@@ -666,7 +666,7 @@ static inline bool var_InheritBool( vlc_object_t *obj, const char *name )
#define var_InheritBool(o, n) var_InheritBool(VLC_OBJECT(o), n)
LIBVLC_USED
static inline int var_InheritInteger( vlc_object_t *obj, const char *name )
static inline int64_t var_InheritInteger( vlc_object_t *obj, const char *name )
{
vlc_value_t val;
......
......@@ -257,7 +257,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int i_argc,
case CONFIG_ITEM_INTEGER:
var_Create( p_this, psz_name, VLC_VAR_INTEGER );
var_SetInteger( p_this, psz_name,
strtol(state.optarg, NULL, 0));
strtoll(state.optarg, NULL, 0));
break;
case CONFIG_ITEM_FLOAT:
var_Create( p_this, psz_name, VLC_VAR_FLOAT );
......@@ -304,7 +304,7 @@ int config_LoadCmdLine( vlc_object_t *p_this, int i_argc,
else
{
var_SetInteger( p_this, name,
strtol(state.optarg, NULL, 0) );
strtoll(state.optarg, NULL, 0) );
}
break;
case CONFIG_ITEM_BOOL:
......
......@@ -1373,8 +1373,8 @@ static vlm_message_t *vlm_ShowMedia( vlm_media_sys_t *p_media )
APPEND_INPUT_INFO( "time", "%"PRIi64, Time );
APPEND_INPUT_INFO( "length", "%"PRIi64, Time );
APPEND_INPUT_INFO( "rate", "%f", Float );
APPEND_INPUT_INFO( "title", "%d", Integer );
APPEND_INPUT_INFO( "chapter", "%d", Integer );
APPEND_INPUT_INFO( "title", "%"PRId64, Integer );
APPEND_INPUT_INFO( "chapter", "%"PRId64, Integer );
APPEND_INPUT_INFO( "can-seek", "%d", Bool );
}
#undef APPEND_INPUT_INFO
......
......@@ -1054,7 +1054,7 @@ void var_OptionParse( vlc_object_t *p_obj, const char *psz_option,
break;
case VLC_VAR_INTEGER:
val.i_int = strtol( psz_value, NULL, 0 );
val.i_int = strtoll( psz_value, NULL, 0 );
break;
case VLC_VAR_FLOAT:
......
......@@ -399,7 +399,7 @@ void osd_MenuActivate( vlc_object_t *p_this )
var_InheritInteger( p_osd, p_button->psz_action ) );
#if defined(OSD_MENU_DEBUG)
msg_Dbg( p_osd, "select (%d, %s)",
var_InheritInteger( p_osd, p_button->psz_action ),
(int)var_InheritInteger( p_osd, p_button->psz_action ),
p_button->psz_action );
#endif
}
......
......@@ -764,7 +764,7 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
case 'B':
if( p_input )
{
snprintf( buf, 10, "%d",
snprintf( buf, 10, "%"PRId64,
var_GetInteger( p_input, "bit-rate" )/1000 );
}
else
......@@ -774,7 +774,7 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
case 'C':
if( p_input )
{
snprintf( buf, 10, "%d",
snprintf( buf, 10, "%"PRId64,
var_GetInteger( p_input, "chapter" ) );
}
else
......@@ -800,7 +800,7 @@ char *str_format_meta( vlc_object_t *p_object, const char *string )
case 'I':
if( p_input )
{
snprintf( buf, 10, "%d",
snprintf( buf, 10, "%"PRId64,
var_GetInteger( p_input, "title" ) );
}
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment