Commit 4970e57f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Small corrections for stats.

parent ea9654b7
...@@ -51,12 +51,12 @@ void InputStatsPanel::update( input_item_t *p_item ) ...@@ -51,12 +51,12 @@ void InputStatsPanel::update( input_item_t *p_item )
#define UPDATE( widget,format, calc... ) \ #define UPDATE( widget,format, calc... ) \
{ QString str; ui.widget->setText( str.sprintf( format, ## calc ) ); } { QString str; ui.widget->setText( str.sprintf( format, ## calc ) ); }
UPDATE( read_text, "%8.0f kB", (float)(p_item->p_stats->i_read_bytes)/1000); UPDATE( read_text, "%8.0f", (float)(p_item->p_stats->i_read_bytes)/1000);
UPDATE( input_bitrate_text, "%6.0f kb/s", UPDATE( input_bitrate_text, "%6.0f",
(float)(p_item->p_stats->f_input_bitrate * 8000 )); (float)(p_item->p_stats->f_input_bitrate * 8000 ));
UPDATE( demuxed_text, "%8.0f kB", UPDATE( demuxed_text, "%8.0f",
(float)(p_item->p_stats->i_demux_read_bytes)/1000 ); (float)(p_item->p_stats->i_demux_read_bytes)/1000 );
UPDATE( stream_bitrate_text, "%6.0f kb/s", UPDATE( stream_bitrate_text, "%6.0f",
(float)(p_item->p_stats->f_demux_bitrate * 8000 )); (float)(p_item->p_stats->f_demux_bitrate * 8000 ));
/* Video */ /* Video */
...@@ -66,9 +66,9 @@ void InputStatsPanel::update( input_item_t *p_item ) ...@@ -66,9 +66,9 @@ void InputStatsPanel::update( input_item_t *p_item )
/* Sout */ /* Sout */
UPDATE( sent_text, "%5i", p_item->p_stats->i_sent_packets ); UPDATE( sent_text, "%5i", p_item->p_stats->i_sent_packets );
UPDATE( sent_bytes_text, "%8.0f kB", UPDATE( sent_bytes_text, "%8.0f",
(float)(p_item->p_stats->i_sent_bytes)/1000 ); (float)(p_item->p_stats->i_sent_bytes)/1000 );
UPDATE( send_bitrate_text, "%6.0f kb/s", UPDATE( send_bitrate_text, "%6.0f",
(float)(p_item->p_stats->f_send_bitrate*8)*1000 ); (float)(p_item->p_stats->f_send_bitrate*8)*1000 );
/* Audio*/ /* Audio*/
...@@ -170,15 +170,14 @@ InfoTab::InfoTab( QWidget *parent, intf_thread_t *_p_intf, bool _stats ) : ...@@ -170,15 +170,14 @@ InfoTab::InfoTab( QWidget *parent, intf_thread_t *_p_intf, bool _stats ) :
// setGeometry(0, 0, 400, 500); // setGeometry(0, 0, 400, 500);
MP = new MetaPanel(NULL, p_intf); MP = new MetaPanel(NULL, p_intf);
addTab(MP, qtr("&Meta")); addTab(MP, qtr("&General"));
IP = new InfoPanel(NULL, p_intf);
addTab(IP, qtr("&Details"));
if( stats ) if( stats )
{ {
ISP = new InputStatsPanel( NULL, p_intf ); ISP = new InputStatsPanel( NULL, p_intf );
addTab(ISP, qtr("&Stats")); addTab(ISP, qtr("&Stats"));
} }
IP = new InfoPanel(NULL, p_intf);
addTab(IP, qtr("&Info"));
} }
InfoTab::~InfoTab() InfoTab::~InfoTab()
......
...@@ -51,7 +51,7 @@ StreamInfoDialog::StreamInfoDialog( intf_thread_t *_p_intf ) :QVLCFrame( _p_intf ...@@ -51,7 +51,7 @@ StreamInfoDialog::StreamInfoDialog( intf_thread_t *_p_intf ) :QVLCFrame( _p_intf
var_AddCallback( THEPL, "item-change", ItemChanged, this ); var_AddCallback( THEPL, "item-change", ItemChanged, this );
readSettings( "StreamInfo" , QSize( 470, 450 ) ); readSettings( "StreamInfo" , QSize( 500, 450 ) );
} }
StreamInfoDialog::~StreamInfoDialog() StreamInfoDialog::~StreamInfoDialog()
......
This diff is collapsed.
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