add_integer( CFG_PREFIX "cols", 2, NULL,
COLS_TEXT, COLS_LONGTEXT, false )
- add_bool( CFG_PREFIX "keep-aspect-ratio", 0, NULL,
+ add_bool( CFG_PREFIX "keep-aspect-ratio", false, NULL,
AR_TEXT, AR_LONGTEXT, false )
- add_bool( CFG_PREFIX "keep-picture", 0, NULL,
+ add_bool( CFG_PREFIX "keep-picture", false, NULL,
KEEP_TEXT, KEEP_LONGTEXT, false )
add_string( CFG_PREFIX "order", "", NULL,
{
i_index++;
- p_sys->pi_x_offsets =
- realloc( p_sys->pi_x_offsets, i_index * sizeof(int) );
+ p_sys->pi_x_offsets = xrealloc( p_sys->pi_x_offsets,
+ i_index * sizeof(int) );
p_sys->pi_x_offsets[i_index - 1] = atoi( psz_offsets );
psz_end = strchr( psz_offsets, ',' );
psz_offsets = psz_end + 1;
- p_sys->pi_y_offsets =
- realloc( p_sys->pi_y_offsets, i_index * sizeof(int) );
+ p_sys->pi_y_offsets = xrealloc( p_sys->pi_y_offsets,
+ i_index * sizeof(int) );
p_sys->pi_y_offsets[i_index - 1] = atoi( psz_offsets );
psz_end = strchr( psz_offsets, ',' );
psz_offsets = psz_end + 1;
{
psz_end = strchr( psz_order, ',' );
i_index++;
- p_sys->ppsz_order = realloc( p_sys->ppsz_order,
- i_index * sizeof(char *) );
+ p_sys->ppsz_order = xrealloc( p_sys->ppsz_order,
+ i_index * sizeof(char *) );
p_sys->ppsz_order[i_index - 1] = strndup( psz_order,
psz_end - psz_order );
psz_order = psz_end+1;
{
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing alpha from %d/255 to %d/255",
- p_sys->i_alpha, newval.i_int);
+ p_sys->i_alpha, (int)newval.i_int);
p_sys->i_alpha = __MIN( __MAX( newval.i_int, 0 ), 255 );
vlc_mutex_unlock( &p_sys->lock );
}
{
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing height from %dpx to %dpx",
- p_sys->i_height, newval.i_int );
+ p_sys->i_height, (int)newval.i_int );
p_sys->i_height = __MAX( newval.i_int, 0 );
vlc_mutex_unlock( &p_sys->lock );
}
{
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing width from %dpx to %dpx",
- p_sys->i_width, newval.i_int );
+ p_sys->i_width, (int)newval.i_int );
p_sys->i_width = __MAX( newval.i_int, 0 );
vlc_mutex_unlock( &p_sys->lock );
}
{
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing x offset from %dpx to %dpx",
- p_sys->i_xoffset, newval.i_int );
+ p_sys->i_xoffset, (int)newval.i_int );
p_sys->i_xoffset = __MAX( newval.i_int, 0 );
vlc_mutex_unlock( &p_sys->lock );
}
{
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing y offset from %dpx to %dpx",
- p_sys->i_yoffset, newval.i_int );
+ p_sys->i_yoffset, (int)newval.i_int );
p_sys->i_yoffset = __MAX( newval.i_int, 0 );
vlc_mutex_unlock( &p_sys->lock );
}
while( pi_align_values[i_new] != newval.i_int ) i_new++;
msg_Dbg( p_this, "changing alignment from %d (%s) to %d (%s)",
p_sys->i_align, ppsz_align_descriptions[i_old],
- newval.i_int, ppsz_align_descriptions[i_new] );
+ (int)newval.i_int, ppsz_align_descriptions[i_new] );
p_sys->i_align = newval.i_int;
vlc_mutex_unlock( &p_sys->lock );
}
{
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing border width from %dpx to %dpx",
- p_sys->i_borderw, newval.i_int );
+ p_sys->i_borderw, (int)newval.i_int );
p_sys->i_borderw = __MAX( newval.i_int, 0 );
vlc_mutex_unlock( &p_sys->lock );
}
{
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing border height from %dpx to %dpx",
- p_sys->i_borderh, newval.i_int );
+ p_sys->i_borderh, (int)newval.i_int );
p_sys->i_borderh = __MAX( newval.i_int, 0 );
vlc_mutex_unlock( &p_sys->lock );
}
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing position method from %d (%s) to %d (%s)",
p_sys->i_position, ppsz_pos_descriptions[p_sys->i_position],
- newval.i_int, ppsz_pos_descriptions[newval.i_int]);
+ (int)newval.i_int, ppsz_pos_descriptions[newval.i_int]);
p_sys->i_position = newval.i_int;
vlc_mutex_unlock( &p_sys->lock );
}
{
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing number of rows from %d to %d",
- p_sys->i_rows, newval.i_int );
+ p_sys->i_rows, (int)newval.i_int );
p_sys->i_rows = __MAX( newval.i_int, 1 );
vlc_mutex_unlock( &p_sys->lock );
}
{
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing number of columns from %d to %d",
- p_sys->i_cols, newval.i_int );
+ p_sys->i_cols, (int)newval.i_int );
p_sys->i_cols = __MAX( newval.i_int, 1 );
vlc_mutex_unlock( &p_sys->lock );
}
{
psz_end = strchr( psz_order, ',' );
i_index++;
- p_sys->ppsz_order = realloc( p_sys->ppsz_order,
- i_index * sizeof(char *) );
+ p_sys->ppsz_order = xrealloc( p_sys->ppsz_order,
+ i_index * sizeof(char *) );
p_sys->ppsz_order[i_index - 1] = strndup( psz_order,
psz_end - psz_order );
psz_order = psz_end+1;