memset( psz_title, ' ', mid );
if( p_sys->b_color )
wcolor_set( p_sys->w, C_TITLE, NULL );
- snprintf( &psz_title[mid], i_size, "VLC media player "PACKAGE_VERSION );
+ strlcpy( &psz_title[mid], "VLC media player "PACKAGE_VERSION, i_size );
mvnprintw( y, 0, COLS, "%s", psz_title );
attroff( A_REVERSE );
y += 2;
{
int i_title_count = var_CountChoices( p_input, "title" );
if( i_title_count > 0 )
- mvnprintw( y++, 0, COLS, _(" Title : %d/%d"), val.i_int, i_title_count );
+ mvnprintw( y++, 0, COLS, _(" Title : %"PRId64"/%d"),
+ val.i_int, i_title_count );
}
/* Chapter */
{
int i_chapter_count = var_CountChoices( p_input, "chapter" );
if( i_chapter_count > 0 )
- mvnprintw( y++, 0, COLS, _(" Chapter : %d/%d"), val.i_int, i_chapter_count );
+ mvnprintw( y++, 0, COLS, _(" Chapter : %"PRId64"/%d"),
+ val.i_int, i_chapter_count );
}
}
else
for( i=0; i<VLC_META_TYPE_COUNT; i++ )
{
if( y >= y_end ) break;
- char *psz_meta = vlc_meta_Get( p_item->p_meta, i );
+ const char *psz_meta = vlc_meta_Get( p_item->p_meta, i );
if( psz_meta && *psz_meta )
{
const char *psz_meta_title;
MainBoxWrite( p_intf, l, 1, _("+-[Incoming]"));
SHOW_ACS( 1, ACS_ULCORNER ); SHOW_ACS( 2, ACS_HLINE ); l++;
if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
- MainBoxWrite( p_intf, l, 1, _("| input bytes read : %8.0f kB"),
- (float)(p_item->p_stats->i_read_bytes)/1000 );
+ MainBoxWrite( p_intf, l, 1, _("| input bytes read : %8.0f KiB"),
+ (float)(p_item->p_stats->i_read_bytes)/1024 );
SHOW_ACS( 1, ACS_VLINE ); l++;
MainBoxWrite( p_intf, l, 1, _("| input bitrate : %6.0f kb/s"),
(float)(p_item->p_stats->f_input_bitrate)*8000 );
- MainBoxWrite( p_intf, l, 1, _("| demux bytes read : %8.0f kB"),
- (float)(p_item->p_stats->i_demux_read_bytes)/1000 );
+ MainBoxWrite( p_intf, l, 1, _("| demux bytes read : %8.0f KiB"),
+ (float)(p_item->p_stats->i_demux_read_bytes)/1024 );
SHOW_ACS( 1, ACS_VLINE ); l++;
MainBoxWrite( p_intf, l, 1, _("| demux bitrate : %6.0f kb/s"),
(float)(p_item->p_stats->f_demux_bitrate)*8000 );
MainBoxWrite( p_intf, l, 1, _("+-[Video Decoding]"));
SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++;
if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
- MainBoxWrite( p_intf, l, 1, _("| video decoded : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| video decoded : %"PRId64),
p_item->p_stats->i_decoded_video );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| frames displayed : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| frames displayed : %"PRId64),
p_item->p_stats->i_displayed_pictures );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| frames lost : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| frames lost : %"PRId64),
p_item->p_stats->i_lost_pictures );
SHOW_ACS( 1, ACS_VLINE ); l++;
DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 );
MainBoxWrite( p_intf, l, 1, _("+-[Audio Decoding]"));
SHOW_ACS( 1, ACS_LTEE ); SHOW_ACS( 2, ACS_HLINE ); l++;
if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
- MainBoxWrite( p_intf, l, 1, _("| audio decoded : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| audio decoded : %"PRId64),
p_item->p_stats->i_decoded_audio );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| buffers played : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| buffers played : %"PRId64),
p_item->p_stats->i_played_abuffers );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| buffers lost : %5i"),
+ MainBoxWrite( p_intf, l, 1, _("| buffers lost : %"PRId64),
p_item->p_stats->i_lost_abuffers );
SHOW_ACS( 1, ACS_VLINE ); l++;
DrawEmptyLine( p_sys->w, p_sys->i_box_y + l - p_sys->i_box_start, 1, COLS - 2 );
if( p_sys->b_color ) wcolor_set( p_sys->w, C_DEFAULT, NULL );
MainBoxWrite( p_intf, l, 1, _("| packets sent : %5i"), p_item->p_stats->i_sent_packets );
SHOW_ACS( 1, ACS_VLINE ); l++;
- MainBoxWrite( p_intf, l, 1, _("| bytes sent : %8.0f kB"),
- (float)(p_item->p_stats->i_sent_bytes)/1000 );
+ MainBoxWrite( p_intf, l, 1, _("| bytes sent : %8.0f KiB"),
+ (float)(p_item->p_stats->i_sent_bytes)/1024 );
SHOW_ACS( 1, ACS_VLINE ); l++;
MainBoxWrite( p_intf, l, 1, _("\\ sending bitrate : %6.0f kb/s"),
(float)(p_item->p_stats->f_send_bitrate*8)*1000 );
DrawEmptyLine( p_sys->w, 7, 1, COLS-2 );
if( p_sys->psz_search_chain )
{
- if( strlen( p_sys->psz_search_chain ) == 0 &&
+ if( *p_sys->psz_search_chain == '\0' &&
p_sys->psz_old_search != NULL )
{
/* Searching next entry */