* streamout.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: streamout.cpp,v 1.16 2003/06/03 22:18:58 gbazin Exp $
+ * $Id: streamout.cpp,v 1.32 2003/10/17 21:28:21 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
#include <stdio.h>
#include <vlc/vlc.h>
+#include <vlc/intf.h>
-#ifdef WIN32 /* mingw32 hack */
-#undef Yield
-#undef CreateDialog
-#endif
-
-/* Let vlc take care of the i18n stuff */
-#define WXINTL_NO_GETTEXT_MACRO
-
-#include <wx/wxprec.h>
-#include <wx/wx.h>
+#include "wxwindows.h"
#include <wx/notebook.h>
#include <wx/textctrl.h>
#include <wx/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h>
-#include <vlc/intf.h>
-
-#if defined MODULE_NAME_IS_skins
-# include "../skins/src/skin_common.h"
-#endif
-
-#include "wxwindows.h"
-
#ifndef wxRB_SINGLE
# define wxRB_SINGLE 0
#endif
-enum
-{
- PLAY_ACCESS_OUT = 0,
- FILE_ACCESS_OUT,
- HTTP_ACCESS_OUT,
- UDP_ACCESS_OUT,
- RTP_ACCESS_OUT,
- ACCESS_OUT_NUM
-};
-
-enum
-{
- TS_ENCAPSULATION = 0,
- PS_ENCAPSULATION,
- AVI_ENCAPSULATION,
- MP4_ENCAPSULATION,
- OGG_ENCAPSULATION,
- ENCAPS_NUM
-};
-
/*****************************************************************************
* Event Table.
*****************************************************************************/
FileName_Event,
AccessType1_Event, AccessType2_Event, AccessType3_Event,
- AccessType4_Event, AccessType5_Event,
- NetPort1_Event, NetPort2_Event, NetPort3_Event,
- NetAddr1_Event, NetAddr2_Event, NetAddr3_Event,
+ AccessType4_Event, AccessType5_Event, AccessType6_Event,
+ NetPort1_Event, NetPort2_Event, NetPort3_Event, NetPort4_Event,
+ NetAddr1_Event, NetAddr2_Event, NetAddr3_Event, NetAddr4_Event,
EncapsulationRadio1_Event, EncapsulationRadio2_Event,
EncapsulationRadio3_Event, EncapsulationRadio4_Event,
- EncapsulationRadio5_Event,
+ EncapsulationRadio5_Event, EncapsulationRadio6_Event,
+ EncapsulationRadio7_Event, EncapsulationRadio8_Event,
VideoTranscEnable_Event, VideoTranscCodec_Event, VideoTranscBitrate_Event,
AudioTranscEnable_Event, AudioTranscCodec_Event, AudioTranscBitrate_Event,
+ AudioTranscChans_Event,
+
+ SAPMisc_Event, SLPMisc_Event, AnnounceAddr_Event
};
BEGIN_EVENT_TABLE(SoutDialog, wxDialog)
EVT_CHECKBOX(AccessType3_Event, SoutDialog::OnAccessTypeChange)
EVT_CHECKBOX(AccessType4_Event, SoutDialog::OnAccessTypeChange)
EVT_CHECKBOX(AccessType5_Event, SoutDialog::OnAccessTypeChange)
+ EVT_CHECKBOX(AccessType6_Event, SoutDialog::OnAccessTypeChange)
EVT_TEXT(FileName_Event, SoutDialog::OnFileChange)
EVT_BUTTON(FileBrowse_Event, SoutDialog::OnFileBrowse)
EVT_TEXT(NetAddr2_Event, SoutDialog::OnNetChange)
EVT_TEXT(NetPort3_Event, SoutDialog::OnNetChange)
EVT_TEXT(NetAddr3_Event, SoutDialog::OnNetChange)
-
+ EVT_TEXT(NetPort4_Event, SoutDialog::OnNetChange)
+ EVT_TEXT(NetAddr4_Event, SoutDialog::OnNetChange)
+
/* Events generated by the encapsulation panel */
EVT_RADIOBUTTON(EncapsulationRadio1_Event,
SoutDialog::OnEncapsulationChange)
SoutDialog::OnEncapsulationChange)
EVT_RADIOBUTTON(EncapsulationRadio5_Event,
SoutDialog::OnEncapsulationChange)
+ EVT_RADIOBUTTON(EncapsulationRadio6_Event,
+ SoutDialog::OnEncapsulationChange)
+ EVT_RADIOBUTTON(EncapsulationRadio7_Event,
+ SoutDialog::OnEncapsulationChange)
+ EVT_RADIOBUTTON(EncapsulationRadio8_Event,
+ SoutDialog::OnEncapsulationChange)
/* Events generated by the transcoding panel */
EVT_CHECKBOX(VideoTranscEnable_Event, SoutDialog::OnTranscodingEnable)
EVT_CHECKBOX(AudioTranscEnable_Event, SoutDialog::OnTranscodingEnable)
EVT_COMBOBOX(VideoTranscCodec_Event, SoutDialog::OnTranscodingChange)
+ EVT_TEXT(VideoTranscCodec_Event, SoutDialog::OnTranscodingChange)
EVT_COMBOBOX(AudioTranscCodec_Event, SoutDialog::OnTranscodingChange)
+ EVT_TEXT(AudioTranscCodec_Event, SoutDialog::OnTranscodingChange)
EVT_COMBOBOX(VideoTranscBitrate_Event, SoutDialog::OnTranscodingChange)
+ EVT_TEXT(VideoTranscBitrate_Event, SoutDialog::OnTranscodingChange)
EVT_COMBOBOX(AudioTranscBitrate_Event, SoutDialog::OnTranscodingChange)
+ EVT_TEXT(AudioTranscBitrate_Event, SoutDialog::OnTranscodingChange)
+ EVT_COMBOBOX(AudioTranscChans_Event, SoutDialog::OnTranscodingChange)
+ EVT_TEXT(AudioTranscChans_Event, SoutDialog::OnTranscodingChange)
+
+ /* Events generated by the misc panel */
+ EVT_CHECKBOX(SAPMisc_Event, SoutDialog::OnSAPMiscChange)
+ EVT_CHECKBOX(SLPMisc_Event, SoutDialog::OnSLPMiscChange)
+ EVT_TEXT(AnnounceAddr_Event, SoutDialog::OnAnnounceAddrChange)
END_EVENT_TABLE()
/* Create the transcoding panel */
wxPanel *transcoding_panel = TranscodingPanel( panel );
+ /* Create the Misc panel */
+ wxPanel *misc_panel = MiscPanel( panel );
+
/* Separation */
wxStaticLine *static_line = new wxStaticLine( panel, wxID_OK );
panel_sizer->Add( access_panel, 1, wxEXPAND | wxALL, 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( static_line, 0, wxEXPAND | wxALL, 5 );
panel_sizer->Add( button_sizer, 0, wxALIGN_LEFT | wxALIGN_BOTTOM |
wxALL, 5 );
{
}
+wxArrayString SoutDialog::GetOptions()
+{
+ return SeparateEntries( mrl_combo->GetValue() );
+}
+
/*****************************************************************************
* Private methods.
*****************************************************************************/
{
transcode += wxT("acodec=") + audio_codec_combo->GetValue();
transcode += wxT(",ab=") + audio_bitrate_combo->GetValue();
+ transcode += wxT(",channels=") + audio_channels_combo->GetValue();
}
transcode += wxT("}");
}
case PS_ENCAPSULATION:
encapsulation = wxT("ps");
break;
+ case MPEG1_ENCAPSULATION:
+ encapsulation = wxT("mpeg1");
+ break;
case AVI_ENCAPSULATION:
encapsulation = wxT("avi");
break;
case MP4_ENCAPSULATION:
encapsulation = wxT("mp4");
break;
+ case MOV_ENCAPSULATION:
+ encapsulation = wxT("mov");
+ break;
+ case ASF_ENCAPSULATION:
+ encapsulation = wxT("asf");
+ break;
case TS_ENCAPSULATION:
default:
encapsulation = wxT("ts");
{
if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
dup_opts += wxT("dst=std{access=file,mux=");
- dup_opts += encapsulation + wxT(",url=");
- dup_opts += file_combo->GetValue() + wxT("}");
+ dup_opts += encapsulation + wxT(",url=\"");
+ dup_opts += file_combo->GetValue() + wxT("\"}");
}
if( access_checkboxes[HTTP_ACCESS_OUT]->IsChecked() )
{
net_ports[HTTP_ACCESS_OUT]->GetValue() );
dup_opts += wxT("}");
}
+ if( access_checkboxes[MMSH_ACCESS_OUT]->IsChecked() )
+ {
+ if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
+ 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 += net_addrs[HTTP_ACCESS_OUT]->GetLineText(0);
+ dup_opts += wxString::Format( wxT(":%d"),
+ net_ports[MMSH_ACCESS_OUT]->GetValue() );
+ dup_opts += wxT("}");
+ }
if( access_checkboxes[UDP_ACCESS_OUT]->IsChecked() )
{
if( !dup_opts.IsEmpty() ) dup_opts += wxT(",");
dup_opts += net_addrs[UDP_ACCESS_OUT]->GetLineText(0);
dup_opts += wxString::Format( wxT(":%d"),
net_ports[UDP_ACCESS_OUT]->GetValue() );
+
+ /* SAP only if UDP */
+ if( sap_checkbox->IsChecked() )
+ {
+ dup_opts += wxT(",sap=\"");
+ dup_opts += announce_addr->GetLineText(0);
+ dup_opts += wxT("\"");
+ }
+
+ /* SLP only if UDP */
+ if( slp_checkbox->IsChecked() )
+ {
+ dup_opts += wxT(",slp=\"");
+ dup_opts += announce_addr->GetLineText(0);
+ dup_opts += wxT("\"");
+ }
+
dup_opts += wxT("}");
}
if( access_checkboxes[RTP_ACCESS_OUT]->IsChecked() )
}
if( !transcode.IsEmpty() || !duplicate.IsEmpty() )
- mrl_combo->SetValue( wxT("#") + transcode + duplicate );
+ mrl_combo->SetValue( wxT(":sout=#") + transcode + duplicate );
else
mrl_combo->SetValue( wxT("") );
}
wxPanel *panel = new wxPanel( parent, -1, wxDefaultPosition,
wxSize(200, 200) );
- wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 4, 20 );
wxStaticBox *panel_box = new wxStaticBox( panel, -1,
wxU(_("Output Methods")) );
wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
wxVERTICAL );
+ wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 4, 20 );
static const wxString access_output_array[] =
{
wxU(_("Play locally")),
wxU(_("File")),
wxU(_("HTTP")),
+ wxU(_("MMSH")),
wxU(_("UDP")),
wxU(_("RTP"))
};
subpanel_sizer = new wxFlexGridSizer( 1, 1, 20 );
subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
access_subpanels[0]->SetSizerAndFit( subpanel_sizer );
+ access_subpanels[0]->Hide();
/* File row */
subpanel_sizer = new wxFlexGridSizer( 3, 1, 20 );
return panel;
}
+wxPanel *SoutDialog::MiscPanel( wxWindow* parent )
+{
+ wxPanel *panel = new wxPanel( parent, -1, wxDefaultPosition,
+ wxSize(200, 200) );
+
+ wxStaticBox *panel_box = new wxStaticBox( panel, -1,
+ wxU(_("Miscellaneous Options")) );
+ wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
+ wxVERTICAL );
+
+ /* Announce Row */
+ misc_subpanels[ANN_MISC_SOUT] = new wxPanel( panel, -1 );
+ wxFlexGridSizer *subpanel_sizer = new wxFlexGridSizer( 4, 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 = 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);
+
+ subpanel_sizer->Add( sap_checkbox, 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+ subpanel_sizer->Add( slp_checkbox, 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+ subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+ subpanel_sizer->Add( announce_addr, 1, wxEXPAND |
+ wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL );
+
+ misc_subpanels[ANN_MISC_SOUT]->SetSizerAndFit( subpanel_sizer );
+
+ /* Stuff everything into the main panel */
+ panel_sizer->Add( misc_subpanels[ANN_MISC_SOUT], 1,
+ wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 5 );
+
+ panel->SetSizerAndFit( panel_sizer );
+
+ /* Update misc panel */
+ misc_subpanels[ANN_MISC_SOUT]->Disable();
+ announce_addr->Disable();
+
+ return panel;
+}
+
wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent )
{
int i;
{
wxT("MPEG TS"),
wxT("MPEG PS"),
+ wxT("MPEG 1"),
+ wxT("Ogg"),
+ wxT("ASF"),
wxT("AVI"),
- wxT("MP4/MOV"),
- wxT("Ogg")
+ wxT("MP4"),
+ wxT("MOV")
};
/* Stuff everything into the main panel */
new wxRadioButton( panel, EncapsulationRadio1_Event + i,
encapsulation_array[i] );
panel_sizer->Add( encapsulation_radios[i], 0,
- wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL | wxALL, 8 );
+ wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL |
+ wxALL, 4 );
}
panel->SetSizerAndFit( panel_sizer );
/* Create video transcoding checkox */
static const wxString vcodecs_array[] =
{
- wxT("mpgv"),
+ wxT("mp1v"),
+ wxT("mp2v"),
wxT("mp4v"),
wxT("DIV1"),
wxT("DIV2"),
wxT("H263"),
wxT("I263"),
wxT("WMV1"),
+ wxT("WMV2"),
+ wxT("MJPG")
};
static const wxString vbitrates_array[] =
{
video_transc_checkbox =
new wxCheckBox( panel, VideoTranscEnable_Event, wxU(_("Video codec")));
video_codec_combo =
- new wxComboBox( panel, VideoTranscCodec_Event, wxT("mp4v"),
+ new wxComboBox( panel, VideoTranscCodec_Event, wxT(""),
wxPoint(20,25), wxDefaultSize, WXSIZEOF(vcodecs_array),
vcodecs_array, wxCB_READONLY );
+ video_codec_combo->SetSelection(2);
wxStaticText *bitrate_label =
new wxStaticText( panel, -1, wxU(_("Bitrate (kb/s)")));
video_bitrate_combo =
static const wxString acodecs_array[] =
{
wxT("mpga"),
- wxT("a52")
+ wxT("mp3"),
+ wxT("a52"),
+ wxT("vorb")
};
static const wxString abitrates_array[] =
{
wxT("128"),
wxT("96")
};
+ static const wxString achannels_array[] =
+ {
+ wxT("1"),
+ wxT("2"),
+ wxT("4"),
+ wxT("6")
+ };
- wxFlexGridSizer *audio_sizer = new wxFlexGridSizer( 4, 1, 20 );
+ wxFlexGridSizer *audio_sizer = new wxFlexGridSizer( 3, 1, 20 );
audio_transc_checkbox =
new wxCheckBox( panel, AudioTranscEnable_Event, wxU(_("Audio codec")));
audio_codec_combo =
- new wxComboBox( panel, AudioTranscCodec_Event, wxT("mpga"),
- wxPoint(20,25), wxDefaultSize, WXSIZEOF(acodecs_array),
+ new wxComboBox( panel, AudioTranscCodec_Event, wxT(""),
+ wxPoint(10,25), wxDefaultSize, WXSIZEOF(acodecs_array),
acodecs_array, wxCB_READONLY );
+ audio_codec_combo->SetSelection(0);
+#if defined( __WXMSW__ )
+ wxFlexGridSizer *audio_sub_sizer = new wxFlexGridSizer( 4, 5, 20 );
+#else
+ wxFlexGridSizer *audio_sub_sizer = new wxFlexGridSizer( 2, 5, 20 );
+#endif
bitrate_label =
new wxStaticText( panel, -1, wxU(_("Bitrate (kb/s)")));
audio_bitrate_combo =
new wxComboBox( panel, AudioTranscBitrate_Event, wxT("192"),
- wxPoint(20,25), wxDefaultSize,
+ wxPoint(10,25), wxDefaultSize,
WXSIZEOF(abitrates_array), abitrates_array );
+ wxStaticText *channels_label =
+ new wxStaticText( panel, -1, wxU(_("Channels")));
+ audio_channels_combo =
+ new wxComboBox( panel, AudioTranscChans_Event, wxT(""),
+ wxPoint(10,25), wxDefaultSize,
+ WXSIZEOF(achannels_array), achannels_array );
+ audio_channels_combo->SetSelection(1);
+ audio_sub_sizer->Add( bitrate_label, 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+ audio_sub_sizer->Add( audio_bitrate_combo, 1,
+ wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+ audio_sub_sizer->Add( channels_label, 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+ audio_sub_sizer->Add( audio_channels_combo, 1,
+ wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
+
audio_sizer->Add( audio_transc_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
audio_sizer->Add( audio_codec_combo, 1,
wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
- audio_sizer->Add( bitrate_label, 0,
- wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
- audio_sizer->Add( audio_bitrate_combo, 1,
+ audio_sizer->Add( audio_sub_sizer, 1,
wxEXPAND | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
/* Stuff everything into the main panel */
void SoutDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
{
mrl_combo->Append( mrl_combo->GetValue() );
- mrl = mrl_combo->GetValue();
EndModal( wxID_OK );
}
switch( i_access_type )
{
case UDP_ACCESS_OUT:
+ misc_subpanels[ANN_MISC_SOUT]->Enable( event.GetInt() );
+
case RTP_ACCESS_OUT:
for( i = 1; i < ENCAPS_NUM; i++ )
{
}
break;
}
+ UpdateMRL();
+}
+
+/*****************************************************************************
+ * AnnounceMisc panel event methods.
+ *****************************************************************************/
+void SoutDialog::OnSAPMiscChange( wxCommandEvent& event )
+{
+ if( !slp_checkbox->IsChecked() )
+ {
+ announce_addr->Enable( event.GetInt() );
+ }
+ UpdateMRL();
+}
+
+void SoutDialog::OnSLPMiscChange( wxCommandEvent& event )
+{
+ if( !sap_checkbox->IsChecked() )
+ {
+ announce_addr->Enable( event.GetInt() );
+ }
+ UpdateMRL();
+}
+/*****************************************************************************
+ * SAPAddr panel event methods.
+ *****************************************************************************/
+void SoutDialog::OnAnnounceAddrChange( wxCommandEvent& WXUNUSED(event) )
+{
UpdateMRL();
}
void SoutDialog::OnFileBrowse( wxCommandEvent& WXUNUSED(event) )
{
- wxFileDialog dialog( this, wxU(_("Save file")),
- wxT(""), wxT(""), wxT("*"), wxSAVE );
+ wxFileDialog dialog( this, wxU(_("Save file")), wxT(""), wxT(""), wxT("*"),
+ wxSAVE | wxOVERWRITE_PROMPT );
if( dialog.ShowModal() == wxID_OK )
{
case AudioTranscEnable_Event:
audio_codec_combo->Enable( event.GetInt() );
audio_bitrate_combo->Enable( event.GetInt() );
+ audio_channels_combo->Enable( event.GetInt() );
break;
}
projects / vlc / blobdiff