*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
wxStaticBoxSizer *mrl_sizer = new wxStaticBoxSizer( mrl_box,
wxHORIZONTAL );
wxStaticText *mrl_label = new wxStaticText( panel, -1,
- wxU(_("Destination Target:")));
+ wxU(_("Target:")));
mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
wxPoint(20,25), wxSize(120, -1) );
- mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
- "the full MRL you want to open.\n""Alternatively, the field will be "
- "filled automatically when you use the controls below")) );
+ mrl_combo->SetToolTip( wxU(_("Specifies the MRL. This can be specified "
+ "directly or filled in automatically by adjusting the "
+ "stream settings.")) );
mrl_sizer->Add( mrl_label, 0, wxALL | wxALIGN_CENTER, 5 );
mrl_sizer->Add( mrl_combo, 1, wxALL | wxALIGN_CENTER, 5 );
mrl_sizer_sizer->Add( mrl_sizer, 1, wxEXPAND | wxALL, 5 );
- /* Create the output encapsulation panel */
- encapsulation_panel = EncapsulationPanel( panel );
-
/* Create the access output panel */
access_panel = AccessPanel( panel );
+ /* Create the output encapsulation panel */
+ encapsulation_panel = EncapsulationPanel( panel );
+
/* Create the transcoding panel */
transcoding_panel = TranscodingPanel( panel );
misc_panel = MiscPanel( panel );
/* Create the buttons */
- wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
+ wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("&OK")) );
ok_button->SetDefault();
wxButton *cancel_button = new wxButton( panel, wxID_CANCEL,
- wxU(_("Cancel")) );
+ wxU(_("&Cancel")) );
/* Place everything in sizers */
- wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
- button_sizer->Add( ok_button, 0, wxALL, 5 );
- button_sizer->Add( cancel_button, 0, wxALL, 5 );
- button_sizer->Layout();
+ wxStdDialogButtonSizer *button_sizer = new wxStdDialogButtonSizer;
+ button_sizer->AddButton( ok_button );
+ button_sizer->AddButton( cancel_button );
+ button_sizer->Realize();
wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *panel_sizer = new wxBoxSizer( wxVERTICAL );
panel_sizer->Add( mrl_sizer_sizer, 0, wxEXPAND, 5 );
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( button_sizer, 0, wxALIGN_LEFT | wxALIGN_BOTTOM |
- wxALL, 5 );
+ panel_sizer->Add( button_sizer, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Layout();
panel->SetSizerAndFit( panel_sizer );
main_sizer->Add( panel, 1, wxGROW, 0 );
{
if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
dup_opts += wxT("dst=std{access=file,mux=");
- dup_opts += encapsulation + wxT(",url=\"");
+ dup_opts += encapsulation + wxT(",dst=\"");
dup_opts += file_combo->GetValue() + wxT("\"}");
}
if( access_checkboxes[HTTP_ACCESS_OUT]->IsChecked() )
{
if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
dup_opts += wxT("dst=std{access=http,mux=");
- dup_opts += encapsulation + wxT(",url=");
+ dup_opts += encapsulation + wxT(",dst=");
dup_opts += net_addrs[HTTP_ACCESS_OUT]->GetLineText(0);
dup_opts += wxString::Format( wxT(":%d"),
net_ports[HTTP_ACCESS_OUT]->GetValue() );
dup_opts += wxT("dst=std{access=mmsh,mux=");
dup_opts += encapsulation;
if( i_encapsulation_type == ASF_ENCAPSULATION ) dup_opts += wxT("h");
- dup_opts += wxT(",url=");
+ dup_opts += wxT(",dst=");
dup_opts += net_addrs[MMSH_ACCESS_OUT]->GetLineText(0);
dup_opts += wxString::Format( wxT(":%d"),
net_ports[MMSH_ACCESS_OUT]->GetValue() );
{
if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
dup_opts += wxT("dst=std{access=rtp,mux=");
- dup_opts += encapsulation + wxT(",url=");
+ dup_opts += encapsulation + wxT(",dst=");
wxString rtp_addr = net_addrs[RTP_ACCESS_OUT]->GetLineText(0);
if ((rtp_addr[0u] != '[') && (rtp_addr.Find(':') != -1))
{
if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
dup_opts += wxT("dst=std{access=udp,mux=");
- dup_opts += encapsulation + wxT(",url=");
+ dup_opts += encapsulation + wxT(",dst=");
wxString udp_addr = net_addrs[UDP_ACCESS_OUT]->GetLineText(0);
if ((udp_addr[0u] != '[') && (udp_addr.Find(':') != -1))
wxSize(200, 200) );
wxStaticBox *panel_box = new wxStaticBox( panel, -1,
- wxU(_("Output methods")) );
+ wxU(_("Outputs")) );
wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
wxVERTICAL );
wxSize(200, 200) );
wxStaticBox *panel_box = new wxStaticBox( panel, -1,
- wxU(_("Miscellaneous options")) );
+ wxU(_("Miscellaneous")) );
wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
wxVERTICAL );
wxT(""), wxDefaultPosition,
wxSize( 100, -1 ), wxTE_PROCESS_ENTER);
- wxStaticText *ttl_label = new wxStaticText( misc_subpanels[TTL_MISC_SOUT], -1,
- wxU(_("Time-To-Live (TTL)")) );
- ttl_spin = new wxSpinCtrl( misc_subpanels[TTL_MISC_SOUT], -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
- 0, 1, 255, config_GetInt( p_intf, "ttl" ) );
+ sout_all_checkbox = new wxCheckBox( misc_subpanels[TTL_MISC_SOUT],
+ SoutAll_Event, wxU(_("Select all elementary streams")) );
+
+ wxStaticText *ttl_label = new wxStaticText( misc_subpanels[TTL_MISC_SOUT],
+ -1,
+ wxU(_("Time-To-Live (TTL)")) );
+ ttl_spin = new wxSpinCtrl( misc_subpanels[TTL_MISC_SOUT], -1,
+ wxEmptyString, wxDefaultPosition, wxDefaultSize,
+ 0, 1, 255, config_GetInt( p_intf, "ttl" ) );
subpanel_sizer->Add( sap_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subpanel_sizer->Add( subpanel_sub_sizer, 1, wxEXPAND |
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
- sout_all_checkbox = new wxCheckBox( misc_subpanels[TTL_MISC_SOUT],
- SoutAll_Event, wxU(_("Select all elementary streams")) );
- subpanel2_sizer->Add( sout_all_checkbox, 1,
+ subpanel2_sizer->Add( sout_all_checkbox, 1,
wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxLEFT, 5 );
subpanel2_sizer->Add( ttl_label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subpanel2_sizer->Add( ttl_spin, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
projects / vlc / blobdiff