Skip to content

V
vlc-1.1
Commit 4970e57f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Small corrections for stats.

parent ea9654b7
Show whitespace changes
Inline Side-by-side
Showing with 417 additions and 300 deletions
modules/gui/qt4/components/infopanels.cpp
View file @ 4970e57f
......@@ -51,12 +51,12 @@ void InputStatsPanel::update( input_item_t *p_item )
#define UPDATE( widget,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( input_bitrate_text, "%6.0f kb/s",
UPDATE( read_text, "%8.0f", (float)(p_item->p_stats->i_read_bytes)/1000);
UPDATE( input_bitrate_text, "%6.0f",
(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 );
UPDATE( stream_bitrate_text, "%6.0f kb/s",
UPDATE( stream_bitrate_text, "%6.0f",
(float)(p_item->p_stats->f_demux_bitrate * 8000 ));
/* Video */
......@@ -66,9 +66,9 @@ void InputStatsPanel::update( input_item_t *p_item )
/* Sout */
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 );
UPDATE( send_bitrate_text, "%6.0f kb/s",
UPDATE( send_bitrate_text, "%6.0f",
(float)(p_item->p_stats->f_send_bitrate*8)*1000 );
/* Audio*/
......@@ -170,15 +170,14 @@ InfoTab::InfoTab( QWidget *parent, intf_thread_t *_p_intf, bool _stats ) :
// setGeometry(0, 0, 400, 500);
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 )
{
ISP = new InputStatsPanel( NULL, p_intf );
addTab(ISP, qtr("&Stats"));
}
IP = new InfoPanel(NULL, p_intf);
addTab(IP, qtr("&Info"));
}
InfoTab::~InfoTab()
......
modules/gui/qt4/dialogs/streaminfo.cpp
View file @ 4970e57f
......@@ -51,7 +51,7 @@ StreamInfoDialog::StreamInfoDialog( intf_thread_t *_p_intf ) :QVLCFrame( _p_intf
var_AddCallback( THEPL, "item-change", ItemChanged, this );
readSettings( "StreamInfo" , QSize( 470, 450 ) );
readSettings( "StreamInfo" , QSize( 500, 450 ) );
}
StreamInfoDialog::~StreamInfoDialog()
......
modules/gui/qt4/ui/input_stats.ui
View file @ 4970e57f
......@@ -8,24 +8,24 @@
<rect>
<x>0</x>
<y>0</y>
<width>434</width>
<height>294</height>
<width>470</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle" >
<string>_("Form")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
<widget class="QGroupBox" name="groupBox_4" >
<property name="geometry" >
<rect>
<x>240</x>
<y>150</y>
<width>215</width>
<height>135</height>
</rect>
</property>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>_("Input")</string>
<string>_("Audio")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -34,8 +34,8 @@
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QLabel" name="read_text" >
<item row="1" column="1" >
<widget class="QLabel" name="aplayed_text" >
<property name="text" >
<string>0</string>
</property>
......@@ -44,71 +44,60 @@
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QLabel" name="stream_bitrate_text" >
<item row="1" column="0" >
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>0 kb/s</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<string>_("Played buffers")</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="input_bitrate_text" >
<item row="2" column="1" >
<widget class="QLabel" name="alost_text" >
<property name="text" >
<string>0 kb/s</string>
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>_("Input bitrate")</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<item row="2" column="0" >
<widget class="QLabel" name="label_10" >
<property name="text" >
<string>_("Read at media")</string>
<string>_("Lost buffers")</string>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_3" >
<item row="0" column="1" >
<widget class="QLabel" name="adecoded_text" >
<property name="text" >
<string>_("Stream bitrate")</string>
<string>0</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<string>_("Demuxed")</string>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="demuxed_text" >
<item row="0" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>0 kB</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<string>_("Decoded blocks")</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1" >
<widget class="QGroupBox" name="groupBox_2" >
<widget class="QGroupBox" name="groupBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>10</y>
<width>215</width>
<height>135</height>
</rect>
</property>
<property name="title" >
<string>_("Video")</string>
<string>_("Input")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
......@@ -117,15 +106,18 @@
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="0" >
<widget class="QLabel" name="label_6" >
<item row="0" column="1" >
<widget class="QLabel" name="read_text" >
<property name="text" >
<string>_("Lost frames")</string>
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="vlost_frames" >
<item row="1" column="1" >
<widget class="QLabel" name="input_bitrate_text" >
<property name="text" >
<string>0</string>
</property>
......@@ -134,32 +126,40 @@
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_4" >
<item row="3" column="2" >
<widget class="QLabel" name="sent_bytes_text_6" >
<property name="text" >
<string>_("Displayed frames")</string>
<string>kb/s</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
<item row="1" column="2" >
<widget class="QLabel" name="sent_bytes_text_5" >
<property name="text" >
<string>_("Decoded blocks")</string>
<string>kb/s</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="vdecoded_text" >
<item row="2" column="2" >
<widget class="QLabel" name="sent_bytes_text_4" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>0</string>
<string>kB</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="vdisplayed_text" >
<item row="3" column="1" >
<widget class="QLabel" name="stream_bitrate_text" >
<property name="text" >
<string>0</string>
</property>
......@@ -168,23 +168,8 @@
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1" >
<widget class="QGroupBox" name="groupBox_4" >
<property name="title" >
<string>_("Audio")</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="1" >
<widget class="QLabel" name="alost_text" >
<widget class="QLabel" name="demuxed_text" >
<property name="text" >
<string>0</string>
</property>
......@@ -193,52 +178,55 @@
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="aplayed_text" >
<item row="2" column="0" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<string>_("Demuxed")</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="adecoded_text" >
<item row="3" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<string>_("Stream bitrate")</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_10" >
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>_("Lost buffers")</string>
<string>_("Read at media")</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_9" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>_("Played buffers")</string>
<string>_("Input bitrate")</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_8" >
<item row="0" column="2" >
<widget class="QLabel" name="sent_bytes_text_7" >
<property name="text" >
<string>_("Decoded blocks")</string>
<string>kB</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="geometry" >
<rect>
<x>240</x>
<y>10</y>
<width>215</width>
<height>135</height>
</rect>
</property>
<property name="title" >
<string>_("Streaming")</string>
</property>
......@@ -249,20 +237,25 @@
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QLabel" name="sent_text" >
<property name="text" >
<string>0</string>
<item row="2" column="2" >
<widget class="QLabel" name="sent_bytes_text_3" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<property name="text" >
<string>kb/s</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="send_bitrate_text" >
<property name="text" >
<string>0 kb/s</string>
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......@@ -272,13 +265,33 @@
<item row="1" column="1" >
<widget class="QLabel" name="sent_bytes_text" >
<property name="text" >
<string>0 kB</string>
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="sent_text" >
<property name="text" >
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QLabel" name="sent_bytes_text_2" >
<property name="text" >
<string>kB</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_13" >
<property name="text" >
......@@ -300,11 +313,116 @@
</property>
</widget>
</item>
</layout>
<item row="3" column="0" >
<widget class="QLabel" name="label_14" >
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="groupBox_2" >
<property name="geometry" >
<rect>
<x>10</x>
<y>150</y>
<width>215</width>
<height>135</height>
</rect>
</property>
<property name="title" >
<string>_("Video")</string>
</property>
<widget class="QLabel" name="label_4" >
<property name="geometry" >
<rect>
<x>11</x>
<y>62</y>
<width>133</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>_("Displayed frames")</string>
</property>
</widget>
<widget class="QLabel" name="label_6" >
<property name="geometry" >
<rect>
<x>11</x>
<y>96</y>
<width>133</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>_("Lost frames")</string>
</property>
</widget>
<widget class="QLabel" name="label_2" >
<property name="geometry" >
<rect>
<x>11</x>
<y>28</y>
<width>133</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>_("Decoded blocks")</string>
</property>
</widget>
<widget class="QLabel" name="vlost_frames" >
<property name="geometry" >
<rect>
<x>150</x>
<y>96</y>
<width>50</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="vdisplayed_text" >
<property name="geometry" >
<rect>
<x>150</x>
<y>62</y>
<width>50</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="vdecoded_text" >
<property name="geometry" >
<rect>
<x>150</x>
<y>28</y>
<width>50</width>
<height>28</height>
</rect>
</property>
<property name="text" >
<string>0</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</widget>
</widget>
<pixmapfunction></pixmapfunction>
<resources/>
<connections/>
......
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