Skip to content

V
vlc
Commit 49ef4a01 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Backport [15455].

parent 4513227d
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
modules/gui/wxwidgets/dialogs/infopanels.cpp
View file @ 49ef4a01
...@@ -264,21 +264,21 @@ InputStatsInfoPanel::InputStatsInfoPanel( intf_thread_t *_p_intf, ...@@ -264,21 +264,21 @@ InputStatsInfoPanel::InputStatsInfoPanel( intf_thread_t *_p_intf,
wxU( _("Input") ) ); wxU( _("Input") ) );
input_box->SetAutoLayout( TRUE ); input_box->SetAutoLayout( TRUE );
input_bsizer = new wxStaticBoxSizer( input_box, wxVERTICAL ); input_bsizer = new wxStaticBoxSizer( input_box, wxVERTICAL );
input_sizer = new wxFlexGridSizer( 2,2, 20 ); input_sizer = new wxFlexGridSizer( 4, 3, 2, 20 );
#define INPUT_ADD(txt,widget,dflt) \ #define INPUT_ADD(txt,widget,dflt) \
{ input_sizer->Add ( new wxStaticText( this, -1, wxU(_( txt ) ) ), \ { input_sizer->Add ( new wxStaticText( this, -1, wxU(_( txt ) ) ), \
0, wxEXPAND| wxRIGHT, 5 ); \ 0, wxALIGN_LEFT|wxLEFT, 5 ); \
widget = new wxStaticText( this, -1, wxU( dflt ) ); \ input_sizer->Add( 0, 0, wxEXPAND ); \
input_sizer->Add( widget, 0, wxEXPAND| wxLEFT, 5 ); \ widget = new wxStaticText( this, -1, wxU( dflt ), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); \
input_sizer->Add( widget, 0, wxALIGN_RIGHT|wxRIGHT, 5 ); \
} }
INPUT_ADD( "Read at media", read_bytes_text, "0" ); INPUT_ADD( "Read at media", read_bytes_text, "0" );
INPUT_ADD( "Input bitrate", input_bitrate_text, "0" ); INPUT_ADD( "Input bitrate", input_bitrate_text, " 0" );
INPUT_ADD( "Demuxed", demux_bytes_text ,"0"); INPUT_ADD( "Demuxed", demux_bytes_text ,"0");
/* Hack to get enough size */ INPUT_ADD( "Stream bitrate", demux_bitrate_text, "0" );
INPUT_ADD( "Stream bitrate", demux_bitrate_text, "0 " );
input_sizer->Layout(); input_sizer->Layout();
input_bsizer->Add( input_sizer, 0, wxALL | wxGROW, 5 ); input_bsizer->Add( input_sizer, 0, wxALL | wxGROW, 5 );
...@@ -286,22 +286,20 @@ InputStatsInfoPanel::InputStatsInfoPanel( intf_thread_t *_p_intf, ...@@ -286,22 +286,20 @@ InputStatsInfoPanel::InputStatsInfoPanel( intf_thread_t *_p_intf,
sizer->Add( input_bsizer, 0, wxALL|wxGROW, 5 ); sizer->Add( input_bsizer, 0, wxALL|wxGROW, 5 );
/* Vout */ /* Vout */
wxStaticBox *video_box = new wxStaticBox( this, -1, wxStaticBox *video_box = new wxStaticBox( this, -1, wxU( _("Video" ) ) );
wxU( _("Video" ) ) );
video_box->SetAutoLayout( TRUE ); video_box->SetAutoLayout( TRUE );
video_bsizer = new wxStaticBoxSizer( video_box, video_bsizer = new wxStaticBoxSizer( video_box, wxVERTICAL );
wxVERTICAL ); video_sizer = new wxFlexGridSizer( 3, 3, 2, 20 );
video_sizer = new wxFlexGridSizer( 2,3, 20 );
#define VIDEO_ADD(txt,widget,dflt) \ #define VIDEO_ADD(txt,widget,dflt) \
{ video_sizer->Add ( new wxStaticText( this, -1, wxU(_( txt ) ) ), \ { video_sizer->Add ( new wxStaticText( this, -1, wxU(_( txt ) ) ), \
0, wxEXPAND|wxLEFT , 5 ); \ 0, wxALIGN_LEFT|wxLEFT , 5 ); \
widget = new wxStaticText( this, -1, wxU( dflt ) ); \ video_sizer->Add( 0, 0, wxEXPAND ); \
video_sizer->Add( widget, 0, wxEXPAND|wxRIGHT, 5 ); \ widget = new wxStaticText( this, -1, wxU( dflt ), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); \
video_sizer->Add( widget, 0, wxALIGN_RIGHT|wxRIGHT, 5 ); \
} }
VIDEO_ADD( "Decoded blocks", video_decoded_text, "0" ); VIDEO_ADD( "Decoded blocks", video_decoded_text, "0" );
/* Hack to get enough size */ VIDEO_ADD( "Displayed frames", displayed_text, " 0" );
VIDEO_ADD( "Displayed frames", displayed_text, "0 " );
VIDEO_ADD( "Lost frames", lost_frames_text, "0" ); VIDEO_ADD( "Lost frames", lost_frames_text, "0" );
...@@ -315,17 +313,18 @@ InputStatsInfoPanel::InputStatsInfoPanel( intf_thread_t *_p_intf, ...@@ -315,17 +313,18 @@ InputStatsInfoPanel::InputStatsInfoPanel( intf_thread_t *_p_intf,
wxU( _("Streaming" ) ) ); wxU( _("Streaming" ) ) );
sout_box->SetAutoLayout( TRUE ); sout_box->SetAutoLayout( TRUE );
sout_bsizer = new wxStaticBoxSizer( sout_box, wxVERTICAL ); sout_bsizer = new wxStaticBoxSizer( sout_box, wxVERTICAL );
sout_sizer = new wxFlexGridSizer( 2,3, 20 ); sout_sizer = new wxFlexGridSizer( 3, 3, 2, 20 );
#define SOUT_ADD(txt,widget,dflt) \ #define SOUT_ADD(txt,widget,dflt) \
{ sout_sizer->Add ( new wxStaticText( this, -1, wxU(_( txt ) ) ), \ { sout_sizer->Add ( new wxStaticText( this, -1, wxU(_( txt ) ) ), \
0, wxEXPAND|wxLEFT|wxALIGN_LEFT , 5 ); \ 0, wxALIGN_LEFT|wxLEFT, 5 ); \
widget = new wxStaticText( this, -1, wxU( dflt ) ); \ sout_sizer->Add( 0, 0, wxEXPAND ); \
sout_sizer->Add( widget, 0, wxEXPAND|wxRIGHT|wxALIGN_LEFT, 5 ); \ widget = new wxStaticText( this, -1, wxU( dflt ), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); \
sout_sizer->Add( widget, 0,wxALIGN_RIGHT|wxRIGHT, 5 ); \
} }
SOUT_ADD( "Sent packets", sout_sent_packets_text, "0" ); SOUT_ADD( "Sent packets", sout_sent_packets_text, " 0" );
SOUT_ADD( "Sent bytes", sout_sent_bytes_text, "0 " ); SOUT_ADD( "Sent bytes", sout_sent_bytes_text, "0" );
SOUT_ADD( "Send rate", sout_send_bitrate_text, "0 " ); SOUT_ADD( "Send rate", sout_send_bitrate_text, "0" );
sout_sizer->Layout(); sout_sizer->Layout();
sout_bsizer->Add( sout_sizer, 0, wxALL | wxGROW, 5 ); sout_bsizer->Add( sout_sizer, 0, wxALL | wxGROW, 5 );
sout_bsizer->Layout(); sout_bsizer->Layout();
...@@ -336,18 +335,17 @@ InputStatsInfoPanel::InputStatsInfoPanel( intf_thread_t *_p_intf, ...@@ -336,18 +335,17 @@ InputStatsInfoPanel::InputStatsInfoPanel( intf_thread_t *_p_intf,
wxU( _("Audio" ) ) ); wxU( _("Audio" ) ) );
audio_box->SetAutoLayout( TRUE ); audio_box->SetAutoLayout( TRUE );
audio_bsizer = new wxStaticBoxSizer( audio_box, wxVERTICAL ); audio_bsizer = new wxStaticBoxSizer( audio_box, wxVERTICAL );
audio_sizer = new wxFlexGridSizer( 2,3, 20 ); audio_sizer = new wxFlexGridSizer( 3, 3, 2, 20 );
#define AUDIO_ADD(txt,widget,dflt) \ #define AUDIO_ADD(txt,widget,dflt) \
{ audio_sizer->Add ( new wxStaticText( this, -1, wxU(_( txt ) ) ), \ { audio_sizer->Add ( new wxStaticText( this, -1, wxU(_( txt ) ) ), \
0, wxEXPAND|wxLEFT , 5 ); \ 0, wxALIGN_LEFT|wxLEFT, 5 ); \
widget = new wxStaticText( this, -1, wxU( dflt ) ); \ audio_sizer->Add( 0, 0, wxEXPAND ); \
audio_sizer->Add( widget, 0, wxEXPAND|wxRIGHT, 5 ); \ widget = new wxStaticText( this, -1, wxU( dflt ), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); \
audio_sizer->Add( widget, 0, wxALIGN_RIGHT|wxRIGHT, 5 ); \
} }
AUDIO_ADD( "Decoded blocks", audio_decoded_text, "0" ); AUDIO_ADD( "Decoded blocks", audio_decoded_text, " 0" );
/* Hack to get enough size */ AUDIO_ADD( "Played buffers", played_abuffers_text, "0" );
AUDIO_ADD( "Played buffers", played_abuffers_text,
"0 " );
AUDIO_ADD( "Lost buffers", lost_abuffers_text, "0" ); AUDIO_ADD( "Lost buffers", lost_abuffers_text, "0" );
audio_sizer->Layout(); audio_sizer->Layout();
audio_bsizer->Add( audio_sizer, 0, wxALL | wxGROW, 5 ); audio_bsizer->Add( audio_sizer, 0, wxALL | wxGROW, 5 );
...@@ -401,6 +399,8 @@ void InputStatsInfoPanel::Update( input_item_t *p_item ) ...@@ -401,6 +399,8 @@ void InputStatsInfoPanel::Update( input_item_t *p_item )
input_sizer->Layout(); input_sizer->Layout();
video_sizer->Layout(); video_sizer->Layout();
sout_sizer->Layout();
audio_sizer->Layout();
sizer->Layout(); sizer->Layout();
panel_sizer->Layout(); panel_sizer->Layout();
......
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