Commit ba00fa31 authored by gbazin's avatar gbazin
Browse files

* modules/gui/wxwidgets/streamout.cpp: stream output dialog re-arrangement...

* modules/gui/wxwidgets/streamout.cpp: stream output dialog re-arrangement patch by CUTMAN ~CW~ (cutmancw at hotmail) + changes by me to remove the SLP announce options.
parent f8c5996f
......@@ -74,7 +74,7 @@ enum
SubtitlesTranscEnable_Event, SubtitlesTranscCodec_Event,
SubtitlesOverlayEnable_Event,
SAPMisc_Event, SLPMisc_Event, AnnounceGroup_Event, AnnounceAddr_Event,
SAPMisc_Event, AnnounceGroup_Event, AnnounceAddr_Event,
SoutAll_Event
};
......@@ -145,7 +145,6 @@ BEGIN_EVENT_TABLE(SoutDialog, wxDialog)
/* Events generated by the misc panel */
EVT_CHECKBOX(SAPMisc_Event, SoutDialog::OnSAPMiscChange)
EVT_CHECKBOX(SLPMisc_Event, SoutDialog::OnSLPMiscChange)
EVT_TEXT(AnnounceGroup_Event, SoutDialog::OnAnnounceGroupChange)
EVT_TEXT(AnnounceAddr_Event, SoutDialog::OnAnnounceAddrChange)
EVT_CHECKBOX(SoutAll_Event, SoutDialog::OnAnnounceGroupChange)
......@@ -198,9 +197,6 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
/* Create the Misc panel */
misc_panel = MiscPanel( panel );
/* Separation */
wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
/* Create the buttons */
wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
ok_button->SetDefault();
......@@ -219,7 +215,6 @@ SoutDialog::SoutDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
panel_sizer->Add( encapsulation_panel, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Add( transcoding_panel, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Add( misc_panel, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Add( static_line, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Add( button_sizer, 0, wxALIGN_LEFT | wxALIGN_BOTTOM |
wxALL, 5 );
panel_sizer->Layout();
......@@ -402,19 +397,6 @@ void SoutDialog::UpdateMRL()
}
}
/* SLP only if UDP */
if( slp_checkbox->IsChecked() )
{
dup_opts += wxT(",slp");
if( ! sap_checkbox->IsChecked() &&
! announce_addr->GetLineText(0).IsEmpty() )
{
dup_opts += wxT(",name=\"");
dup_opts += announce_addr->GetLineText(0);
dup_opts += wxT("\"");
}
}
dup_opts += wxT("}");
}
......@@ -449,7 +431,8 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent )
wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
wxVERTICAL );
wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 4, 20 );
/*wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 4, 20 );*/
wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 0, 20 );
static const wxString access_output_array[] =
{
wxU(_("Play locally")),
......@@ -476,7 +459,8 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent )
access_subpanels[0]->Hide();
/* File row */
subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 );
/*subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 );*/
subpanel_sizer = new wxFlexGridSizer( 4, 1, 10);
label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) );
file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""),
wxPoint(20,25), wxSize(200, -1) );
......@@ -487,8 +471,8 @@ wxPanel *SoutDialog::AccessPanel( wxWindow* parent )
wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subpanel_sizer->Add( browse_button, 0,
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
subpanel_sizer->Add( new wxPanel(access_subpanels[1], -1), 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
/*subpanel_sizer->Add( new wxPanel(access_subpanels[1], -1), 0,*/
/* wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );*/
dump_checkbox = new wxCheckBox( access_subpanels[1], FileDump_Event,
wxU(_("Dump raw input")) );
subpanel_sizer->Add( dump_checkbox, 0,
......@@ -566,27 +550,24 @@ wxPanel *SoutDialog::MiscPanel( wxWindow* parent )
misc_subpanels[ANN_MISC_SOUT] = new wxPanel( panel, -1 );
misc_subpanels[TTL_MISC_SOUT] = new wxPanel( panel, -1 );
wxFlexGridSizer *subpanel_sizer = new wxFlexGridSizer( 3, 4, 20 );
wxFlexGridSizer *subpanel_sub_sizer = new wxFlexGridSizer( 2, 4, 20 );
wxFlexGridSizer *subpanel_sub_sizer = new wxFlexGridSizer( 5, 4, 20 );
wxFlexGridSizer *subpanel2_sizer = new wxFlexGridSizer( 3, 4, 20 );
sap_checkbox = new wxCheckBox( misc_subpanels[ANN_MISC_SOUT],SAPMisc_Event,
wxU(_("SAP announce")) );
slp_checkbox = new wxCheckBox( misc_subpanels[ANN_MISC_SOUT],SLPMisc_Event,
wxU(_("SLP announce")) );
wxStaticText *label_g = new wxStaticText( misc_subpanels[ANN_MISC_SOUT], -1,
wxU(_("Group name")) );
announce_group = new wxTextCtrl( misc_subpanels[ANN_MISC_SOUT],
AnnounceGroup_Event,
wxT(""), wxDefaultPosition,
wxSize( 200, -1 ), wxTE_PROCESS_ENTER);
wxSize( 100, -1 ), wxTE_PROCESS_ENTER);
wxStaticText *label = new wxStaticText( misc_subpanels[ANN_MISC_SOUT], -1,
wxU(_("Channel name")) );
announce_addr = new wxTextCtrl( misc_subpanels[ANN_MISC_SOUT],
AnnounceAddr_Event,
wxT(""), wxDefaultPosition,
wxSize( 200, -1 ), wxTE_PROCESS_ENTER);
wxSize( 100, -1 ), wxTE_PROCESS_ENTER);
wxStaticText *ttl_label = new wxStaticText( misc_subpanels[TTL_MISC_SOUT], -1,
wxU(_("Time-To-Live (TTL)")) );
......@@ -595,8 +576,6 @@ wxPanel *SoutDialog::MiscPanel( wxWindow* parent )
subpanel_sizer->Add( sap_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subpanel_sizer->Add( slp_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subpanel_sub_sizer->Add( label_g, 0, wxALIGN_RIGHT |
wxALIGN_CENTER_VERTICAL );
subpanel_sub_sizer->Add( announce_group, 1, wxEXPAND |
......@@ -964,23 +943,11 @@ void SoutDialog::OnAccessTypeChange( wxCommandEvent& event )
*****************************************************************************/
void SoutDialog::OnSAPMiscChange( wxCommandEvent& event )
{
if( !slp_checkbox->IsChecked() )
{
announce_addr->Enable( event.GetInt() );
}
announce_addr->Enable( event.GetInt() );
announce_group->Enable( event.GetInt() );
UpdateMRL();
}
void SoutDialog::OnSLPMiscChange( wxCommandEvent& event )
{
if( !sap_checkbox->IsChecked() )
{
announce_addr->Enable( event.GetInt() );
}
UpdateMRL();
}
/*****************************************************************************
* SAPAddr panel event methods.
*****************************************************************************/
......
......@@ -654,7 +654,6 @@ private:
/* Event handlers for the misc panel */
void OnSAPMiscChange( wxCommandEvent& event );
void OnSLPMiscChange( wxCommandEvent& event );
DECLARE_EVENT_TABLE();
......@@ -679,7 +678,6 @@ private:
wxPanel *misc_panel;
wxPanel *misc_subpanels[MISC_SOUT_NUM];
wxCheckBox *sap_checkbox;
wxCheckBox *slp_checkbox;
wxTextCtrl *announce_group;
wxTextCtrl *announce_addr;
wxSpinCtrl *ttl_spin;
......
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