#include "wxwindows.h"
+#include "streamdata.h"
+
#include <wx/statline.h>
class wizHelloPage;
MoreInfoStreaming_Event,
MoreInfoTranscode_Event,
- Open_Event,Choose_Event,
+ Open_Event , Choose_Event ,
ListView_Event,
InputRadio0_Event, InputRadio1_Event,
PartialEnable_Event,
EncapRadio4_Event, EncapRadio5_Event,
EncapRadio6_Event, EncapRadio7_Event,
EncapRadio8_Event, EncapRadio9_Event,
+ EncapRadio10_Event, EncapRadio11_Event,
+
+ VideoEnable_Event, VideoCodec_Event,VideoBitrate_Event,
+ AudioEnable_Event, AudioCodec_Event,AudioBitrate_Event,
- VideoEnable_Event, VideoCodec_Event,
- AudioEnable_Event, AudioCodec_Event,
+ SAP_Event,
};
-#define TEXTWIDTH 60
+#define TEXTWIDTH 55
#define ACTION_STREAM 0
#define ACTION_TRANSCODE 1
-#define MUX_PS 0
-#define MUX_TS 1
-#define MUX_MPEG 2
-#define MUX_OGG 3
-#define MUX_RAW 4
-#define MUX_ASF 5
-#define MUX_AVI 6
-#define MUX_MP4 7
-#define MUX_MOV 8
-
BEGIN_EVENT_TABLE(WizardDialog, wxWizard)
END_EVENT_TABLE()
* Wizard strings
*****************************************************************************/
-#define ERROR _("Error")
+#define ERROR_MSG _("Error")
#define ITEM_NAME _("Streaming/Transcoding Wizard")
/* Hello page */
#define HELLO_TITLE _("Streaming/Transcoding Wizard")
#define HELLO_TEXT _("This wizard helps you to stream, transcode or" \
" save a stream")
-#define HELLO_STREAMING _("Stream")
+#define HELLO_STREAMING _("Stream to network")
#define HELLO_STREAMING_DESC _("Use this to stream on a network")
-#define HELLO_TRANSCODE _("Transcode/Save")
+#define HELLO_TRANSCODE _("Transcode/Save to file")
#define HELLO_TRANSCODE_DESC _("Use this to re-encode a stream and save it to a file")
#define HELLO_NOTICE _("This wizard only gives access to a small subset of VLC's streaming and transcoding capabilities. Use the Open and Stream Output dialogs to get all of them")
-#define MOREINFO_TRANSCODE _("Please notice that VLC is not very suited " \
+#define MOREINFO_STREAM _("Use this to stream on a network")
+
+#define MOREINFO_TRANSCODE _("Use this to save a stream to a file. You have the possibility to reencode the stream. You can save whatever VLC can read.\nPlease notice that VLC is not very suited " \
"for file to file transcoding. You should use its transcoding " \
"features to save network streams, for example" )
#define PARTIAL _("Use this to read only a part of the stream. " \
"You must be able to control the incoming stream " \
"(for example, a file or a disc, but not an UDP " \
- "network stream.")
+ "network stream.\n" \
+ "Enter the starting and ending times (in seconds)")
#define INPUT_BUTTON _("Choose")
/* Transcode 1 */
#define TRANSCODE1_TITLE _("Transcode")
-#define TRANSCODE1_TEXT _("If you want to change the compression format of the audio or video tracks, fill in this page. (If you only want to change the container format, proceed to next page)")
+#define TRANSCODE1_TEXT _("If you want to change the compression format of the audio or video tracks, fill in this page. (If you only want to change the container format, proceed to next page).")
#define TR_VIDEO_TEXT0 _("If your stream has video and you want to " \
"transcode it, enable this")
#define INVALID_MCAST_ADDRESS _("This does not appear to be a valid " \
"multicast address" )
+#define NO_ADDRESS _("You need to enter an address" )
/* Encap */
#define ENCAP_TITLE _("Encapsulation format")
#define ENCAP_TEXT _("In this page, you will select how the stream will be "\
- "encapsulated." )
+ "encapsulated. Depending on the choices you made, all "\
+ "formats won't be available." )
/* Transcode 2 */
#define EXTRATRANSCODE_TEXT _("In this page, you will define a few " \
"additionnal parameters for your transcoding" )
+#define CHOOSE_OUTFILE _("You must choose a file to save to")
+
/* Streaming 2 */
#define EXTRASTREAMING_TITLE _("Additional streaming options")
#define EXTRASTREAMING_TEXT _("In this page, you will define a few " \
"additionnal parameters for your stream" )
+#define TTL _("Define the TTL (Time-To-Live) of the stream. This parameter " \
+ "is the maximum number of routers your stream can go through. " \
+ "If you don't know what it means, or if you want to stream on " \
+ "your local network only, leave this setting to 1." )
-/*****************************************************************************
- * Helper structures
- *****************************************************************************/
-struct codec {
- char *psz_display;
- char *psz_codec;
- char *psz_descr;
- int muxers[9];
-};
-
-struct codec vcodecs_array[] =
-{
- { "MPEG-1 Video" , "mp1v" , "MPEG-1 Video codec",
- {MUX_PS, MUX_TS, MUX_MPEG, MUX_OGG, MUX_AVI, MUX_RAW, -1,-1,-1 } },
- { "MPEG-2 Video" , "mp2v" , "MPEG-2 Video codec",
- {MUX_PS, MUX_TS, MUX_MPEG, MUX_OGG, MUX_AVI, MUX_RAW, -1,-1,-1 } },
- { "MPEG-4 Video" , "mp4v" , "MPEG-4 Video codec",
- {MUX_PS,MUX_TS,MUX_MPEG,MUX_ASF,MUX_MP4,MUX_OGG,MUX_AVI,MUX_RAW, -1} },
- { "DIVX 1" ,"DIV1","Divx first version" ,
- {MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , MUX_AVI , -1,-1,-1,-1 } },
- { "DIVX 2" ,"DIV2","Divx second version" ,
- {MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , MUX_AVI , -1,-1,-1,-1 } },
- { "DIVX 3" ,"DIV3","Divx third version" ,
- {MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , MUX_AVI , -1,-1,-1,-1 } },
- { "H 263" , "H263" , "H263 is ..." ,
- { MUX_TS, MUX_AVI, -1,-1,-1,-1,-1,-1,-1 } },
- { "I 263", "I263", "I263 is ..." ,
- { MUX_TS, MUX_AVI, -1,-1,-1,-1,-1,-1,-1 } },
- { "WMV 1" , "WMV1", "First version of WMV" ,
- {MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , MUX_AVI , -1,-1,-1,-1 } },
- { "WMV 2" , "WMV2", "2 version of WMV" ,
- {MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , MUX_AVI , -1,-1,-1,-1 } },
- { "MJPEG" , "MJPG", "MJPEG consists of a series of JPEG pictures" ,
- {MUX_TS , MUX_MPEG , MUX_ASF , MUX_OGG , MUX_AVI , -1,-1,-1,-1 } },
- { "Theora" , "theo", "Experimental free codec",
- {MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1} },
- { "Dummy", "dummy", "Dummy codec (do not transcode)" ,
- {MUX_PS,MUX_TS,MUX_MPEG,MUX_ASF,MUX_MP4,MUX_OGG,MUX_AVI,MUX_RAW,MUX_MOV}},
- { NULL,NULL,NULL , {-1,-1,-1,-1,-1,-1,-1,-1,-1}} /* Do not remove me */
-};
-
-struct codec acodecs_array[] =
-{
- { "MPEG Audio" , "mpga" , "The standard MPEG audio (1/2) format" ,
- {MUX_PS,MUX_TS,MUX_MPEG,MUX_ASF,MUX_OGG,MUX_AVI,MUX_RAW, -1,-1} },
- { "MP3" , "mp3" , "MPEG Audio Layer 3" ,
- {MUX_PS,MUX_TS,MUX_MPEG,MUX_ASF,MUX_OGG,MUX_AVI,MUX_RAW, -1,-1} },
- { "MPEG 4 Audio" , "mp4a" , "Audio format for MPEG4" ,
- {MUX_TS, MUX_MP4, -1,-1,-1,-1,-1,-1,-1 } },
- { "A/52" , "a52" , "DVD audio format" ,
- {MUX_PS,MUX_TS,MUX_MPEG,MUX_ASF,MUX_OGG,MUX_AVI,MUX_RAW, -1,-1} },
- { "Vorbis" , "vorb" , "This is a free audio codec" ,
- {MUX_OGG, -1,-1,-1,-1,-1,-1,-1,-1} },
- { "FLAC" , "flac" , "This is an audio codec" ,
- {MUX_OGG , MUX_RAW, -1,-1,-1,-1,-1,-1,-1} },
- { "Speex" , "spx" , "An audio codec dedicated to compression of voice" ,
- {MUX_OGG, -1,-1,-1,-1,-1,-1,-1,-1} },
- { "Dummy", "dummy", "Dummy codec (do not transcode)" ,
- {MUX_PS,MUX_TS,MUX_MPEG,MUX_ASF,MUX_MP4,MUX_OGG,MUX_AVI,MUX_RAW,MUX_MOV}},
- { NULL,NULL,NULL , {-1,-1,-1,-1,-1,-1,-1,-1,-1}} /* Do not remove me */
-};
-
-struct method {
- char *psz_access;
- char *psz_method;
- char *psz_descr;
- char *psz_address;
- int muxers[9];
-};
-
-struct method methods_array[] =
-{
- {"udp:","UDP Unicast", "Use this to stream to a single computer",
- "Enter the address of the computer to stream to",
- { MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } },
- {"udp:","UDP Multicast",
- "Use this to stream to a dynamic group of computers on a "
- "multicast-enabled network. This is the most efficient method "
- "to stream to several computers, but it does not work over Internet.",
- "Enter the multicast address to stream to in this field. "
- "This must be an IP address between 224.0.0.0 an 239.255.255.255 "
- "For a private use, enter an address beginning with 239.255.",
- { MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } },
- {"http://","HTTP",
- "Use this to stream to several computers. This method is "
- "less efficient, as the server needs to send several times the "
- "stream.",
- "Enter the local addresses you want to listen to. Do not enter "
- "anything if you want to listen to all adresses or if you don't "
- "understand. This is generally the best thing to do. Other computers "
- "can then access the stream at http://yourip:8080 by default",
- { MUX_TS, MUX_PS, MUX_MPEG, MUX_OGG, MUX_RAW, MUX_ASF, -1,-1,-1} },
- { NULL, NULL,NULL,NULL , {-1,-1,-1,-1,-1,-1,-1,-1,-1}} /* Do not remove me */
-};
-
-struct encap {
- int id;
- char *psz_mux;
- char *psz_encap;
- char *psz_descr;
-};
-
-struct encap encaps_array[] =
-{
- { MUX_PS, "ps","MPEG PS", "MPEG Program Stream" },
- { MUX_TS, "ts","MPEG TS", "MPEG Transport Stream" },
- { MUX_MPEG, "ps", "MPEG 1", "MPEG 1 Format" },
- { MUX_OGG, "ogg," "OGG", "OGG" },
- { MUX_RAW, "raw", "RAW", "RAW" },
- { MUX_ASF, "asf","ASF", "ASF" },
- { MUX_AVI, "avi","AVI", "AVI" },
- { MUX_MP4, "mp4","MP4", "MPEG4" },
- { MUX_MOV, "mov","MOV", "MOV" },
- { -1 , NULL,NULL , NULL } /* Do not remove me */
-};
+#define SAP _("When streaming using UDP, you can announce your streams " \
+ "using the SAP/SDP announcing protocol. This way, the clients " \
+ "won't have to type in the multicast address, it will appear " \
+ "in their playlist if they enable the SAP extra interface.\n" \
+ "If you want to give a name to your stream, enter it here, " \
+ "else, a default name will be used" )
/*****************************************************************************
* All the pages of the wizard, declaration
wizHelloPage( wxWizard *parent);
void OnActionChange(wxEvent& event);
void OnWizardPageChanging(wxWizardEvent& event);
+ void OnMoreInfo( wxCommandEvent& event );
protected:
int i_action;
WizardDialog *p_parent;
BEGIN_EVENT_TABLE(wizHelloPage, wxWizardPageSimple)
EVT_RADIOBUTTON( ActionRadio0_Event, wizHelloPage::OnActionChange)
EVT_RADIOBUTTON( ActionRadio1_Event, wizHelloPage::OnActionChange)
+ EVT_BUTTON( MoreInfoStreaming_Event, wizHelloPage::OnMoreInfo )
+ EVT_BUTTON( MoreInfoTranscode_Event, wizHelloPage::OnMoreInfo )
+
EVT_WIZARD_PAGE_CHANGING(-1, wizHelloPage::OnWizardPageChanging)
END_EVENT_TABLE()
void SetTranscodePage( wxWizardPage *page);
void SetAction( int i_action );
void SetPintf( intf_thread_t *p_intf );
+ void SetUri( char *psz_uri );
+ void SetPartial( int i_from, int i_to );
protected:
bool b_chosen;
intf_thread_t *p_intf;
WizardDialog *p_parent;
wxRadioButton *input_radios[2];
+ wxCheckBox *enable_checkbox;
wxBoxSizer *mainSizer;
wxArrayString mrl;
wxTextCtrl *mrl_text;
protected:
wxCheckBox *video_checkbox;
wxComboBox *video_combo;
+ wxComboBox *vb_combo;
wxStaticText * video_text;
wxCheckBox *audio_checkbox;
wxComboBox *audio_combo;
+ wxComboBox *ab_combo;
wxStaticText * audio_text;
WizardDialog *p_parent;
wxWizardPage *next);
virtual wxWizardPage *GetPrev() const;
virtual wxWizardPage *GetNext() const;
+ void OnWizardPageChanging( wxWizardEvent& event );
protected:
DECLARE_EVENT_TABLE()
void wizTranscodeExtraPage::OnSelectFile(wxCommandEvent&);
+ wxTextCtrl *file_text;
WizardDialog *p_parent;
wxWizardPage *p_prev;
wxWizardPage *p_next;
BEGIN_EVENT_TABLE(wizTranscodeExtraPage, wxWizardPage)
EVT_BUTTON( Open_Event, wizTranscodeExtraPage::OnSelectFile)
+ EVT_WIZARD_PAGE_CHANGING(-1, wizTranscodeExtraPage::OnWizardPageChanging)
END_EVENT_TABLE()
/* Additional settings for streaming */
wxWizardPage *next);
virtual wxWizardPage *GetPrev() const;
virtual wxWizardPage *GetNext() const;
+ void OnWizardPageChanging(wxWizardEvent&);
+ void OnSAP( wxCommandEvent&);
+ wxCheckBox *sap_checkbox;
+ wxTextCtrl *sap_text;
protected:
+ friend class wizEncapPage;
DECLARE_EVENT_TABLE()
WizardDialog *p_parent;
wxWizardPage *p_prev;
wxWizardPage *p_next;
+
+ wxSpinCtrl *ttl_spin;
};
BEGIN_EVENT_TABLE(wizStreamingExtraPage, wxWizardPage)
+ EVT_CHECKBOX( SAP_Event, wizStreamingExtraPage::OnSAP )
+ EVT_WIZARD_PAGE_CHANGING(-1, wizStreamingExtraPage::OnWizardPageChanging)
END_EVENT_TABLE()
/* Local functions */
static int ismult( char *psz_uri );
+static void pageHeader( wxWindow *window, wxBoxSizer *sizer,
+ char *psz_title, char *psz_text);
+
+static void pageHeader( wxWindow *window, wxBoxSizer *sizer,
+ char *psz_title, char *psz_text)
+{
+ wxStaticText *wtitle = new wxStaticText( window, -1, wxU( psz_title ) );
+ wxFont font = wtitle->GetFont();
+ font.SetPointSize(14);
+ wtitle->SetFont(font);
+ sizer->Add( wtitle, 0, wxALL, 5 );
+ sizer->Add( new wxStaticText( window, -1,
+ wxU( vlc_wraptext( psz_text , TEXTWIDTH, false ) ) ),
+ 0, wxALL, 5 );
+}
+
/***************************************************************************
* Implementation of the pages
***************************************************************************/
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
/* Create the texts */
- mainSizer->Add( new wxStaticText(this, -1, wxU( HELLO_TITLE ) ),
- 0, wxALL, 5 );
- mainSizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext(HELLO_TEXT , TEXTWIDTH, false ) ) ),
- 0, wxALL, 5 );
+ pageHeader( this, mainSizer, HELLO_TITLE, HELLO_TEXT );
/* Create the radio buttons with their helps */
action_radios[0] = new wxRadioButton( this, ActionRadio0_Event,
wxU( HELLO_TRANSCODE ) );
i_action = 0;
- wxFlexGridSizer *stream_sizer = new wxFlexGridSizer( 2,2,1 );
+ mainSizer->Add( 0, 0, 1 );
+ wxBoxSizer *stream_sizer = new wxBoxSizer( wxHORIZONTAL );
stream_sizer->Add( action_radios[0], 0, wxALL, 5 );
+ stream_sizer->Add( 0,0,1 );
stream_sizer->Add( new wxButton( this, MoreInfoStreaming_Event,
- wxU( _("More Info")) ), 0, wxALL |
- wxEXPAND | wxALIGN_RIGHT, 5 );
- mainSizer->Add( stream_sizer, 0, wxALL| wxEXPAND, 5 );
- mainSizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext( HELLO_STREAMING_DESC ,TEXTWIDTH, false))),
- 0, wxLEFT, 5 );
-
- wxBoxSizer *transcode_sizer = new wxBoxSizer( wxHORIZONTAL);
+ wxU( _("More Info")) ), 0, 0, 0 );
+ mainSizer->Add( stream_sizer, 0, wxALL | wxEXPAND , 5 );
+ wxBoxSizer *transcode_sizer = new wxBoxSizer( wxHORIZONTAL );
transcode_sizer->Add( action_radios[1], 0, wxALL, 5 );
+ transcode_sizer->Add( 0,0,1);
transcode_sizer->Add( new wxButton( this, MoreInfoTranscode_Event,
- wxU( _("More Info")) ), 0, wxALL |
- wxALIGN_RIGHT, 5 );
+ wxU( _("More Info")) ), 0 , 0 , 0 );
mainSizer->Add( transcode_sizer, 0, wxALL | wxEXPAND, 5 );
- mainSizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext( HELLO_TRANSCODE_DESC ,TEXTWIDTH, false)))
- , 0, wxBOTTOM, 5 );
+
+ mainSizer->Add( 0, 0, 1 );
mainSizer->Add( new wxStaticLine(this, -1 ), 0, wxEXPAND| wxTOP|
wxBOTTOM, 5 );
mainSizer->Fit(this);
}
+void wizHelloPage::OnMoreInfo(wxCommandEvent& event)
+{
+ wxString msg;
+ msg.Printf( wxString( wxU( event.GetId() == MoreInfoStreaming_Event ?
+ MOREINFO_STREAM :
+ MOREINFO_TRANSCODE ) ) );
+ wxMessageBox( msg, wxU(_("More information")),
+ wxOK | wxICON_INFORMATION, this->p_parent );
+}
+
void wizHelloPage::OnActionChange(wxEvent& event)
{
i_action = event.GetId() - ActionRadio0_Event;
p_parent = (WizardDialog *)parent;
b_chosen = false;
p_open_dialog = NULL;
+ pl_panel = NULL;
mainSizer = new wxBoxSizer(wxVERTICAL);
/* Create the texts */
- mainSizer->Add( new wxStaticText(this, -1, wxU( INPUT_TITLE ) ),
- 0, wxALL, 5 );
- mainSizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext(INPUT_TEXT , TEXTWIDTH, false ) ) ),
- 0, wxALL, 5 );
+ pageHeader( this, mainSizer, INPUT_TITLE, INPUT_TEXT );
/* Create the radio buttons */
input_radios[0] = new wxRadioButton( this, InputRadio0_Event ,
mainSizer->Add( open_panel );
+
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
pl_panel = new wxPanel(this, -1);
wxBoxSizer *plSizer = new wxBoxSizer( wxHORIZONTAL );
listview = new wxListView( pl_panel, ListView_Event,
- wxDefaultPosition, wxSize(300,200),
+ wxDefaultPosition, wxSize(300,300),
wxLC_REPORT | wxSUNKEN_BORDER );
listview->InsertColumn( 0, wxU(_("Name")) );
listview->InsertColumn( 1, wxU(_("URI")) );
listview->SetColumnWidth( 0, 250 );
- listview->SetColumnWidth( 1, 50 );
+ listview->SetColumnWidth( 1, 100 );
for( int i=0 ; i < p_playlist->i_size ; i++ )
{
wxString filename = wxL2U( p_playlist->pp_items[i]->input.
pl_panel->SetSizer( plSizer );
plSizer->Layout();
mainSizer->Add( pl_panel, 1, wxALL|wxEXPAND, 5 );
+
pl_panel->Hide();
+ mainSizer->Hide( pl_panel );
mainSizer->Layout();
}
else
}
/* Partial Extract Box */
+ mainSizer->Add( 0, 10, 0 );
wxStaticBox *partial_box = new wxStaticBox( this, -1,
wxU(_("Partial Extract")) );
wxStaticBoxSizer *partial_sizer = new wxStaticBoxSizer( partial_box,
wxVERTICAL );
- wxCheckBox *enable_checkbox = new wxCheckBox( this, PartialEnable_Event,
+ enable_checkbox = new wxCheckBox( this, PartialEnable_Event,
wxU(_("Enable") ) );
enable_checkbox->SetToolTip(wxU(_(PARTIAL) ) ) ;
partial_sizer->Add( enable_checkbox, 0 , wxLEFT , 5 );
- wxFlexGridSizer *partial_sizer2 = new wxFlexGridSizer( 4,1,20 );
- partial_sizer2->Add( new wxStaticText(this, -1, wxU(_("From"))),0,wxLEFT ,5);
+ wxFlexGridSizer *partial_sizer2 = new wxFlexGridSizer( 4 , 1 , 20 );
+ partial_sizer2->Add( new wxStaticText(this, -1, wxU(_( "From" ) ) ),
+ 0 , wxLEFT , 5 );
from_text = new wxTextCtrl( this, -1, wxT(""),
- wxDefaultPosition, wxSize(80,25) );
+ wxDefaultPosition, wxSize( 80,25 ) );
partial_sizer2->Add( from_text, 0 , wxALIGN_RIGHT);
- partial_sizer2->Add( new wxStaticText(this, -1, wxU(_("To"))),0,wxLEFT ,5);
+ partial_sizer2->Add( new wxStaticText(this, -1, wxU(_( "To" ) ) ),
+ 0 , wxLEFT , 5 );
to_text = new wxTextCtrl( this, -1, wxT(""),
- wxDefaultPosition, wxSize(80,25) );
- partial_sizer2->Add( to_text, 0 , wxALIGN_RIGHT);
+ wxDefaultPosition, wxSize( 80 , 25 ) );
+ partial_sizer2->Add( to_text, 0 , wxALIGN_RIGHT );
partial_sizer->Add( partial_sizer2, 0, wxALL, 0 );
- mainSizer->Add( partial_sizer, 0, wxALL, 5 );
+ partial_sizer->Fit( partial_box );
+
+ mainSizer->Add( partial_sizer, 0, 0, 0 );
from_text->Disable();
to_text->Disable();
wizInputPage::~wizInputPage()
{
- if( p_open_dialog )
- {
- fprintf(stderr,"CA CRAINT, %p\n",p_open_dialog);
-// p_open_dialog->EndModal(wxID_CANCEL );
- // delete p_open_dialog;
- }
}
void wizInputPage::OnInputChange(wxEvent& event)
mainSizer->Hide( open_panel );
pl_panel->Show();
mainSizer->Show( pl_panel );
- mainSizer->Layout();
+ mainSizer->Layout();
}
}
void wizInputPage::OnChoose(wxCommandEvent& event)
{
p_open_dialog = new OpenDialog( p_intf, this, -1, -1, OPEN_STREAM );
- if( p_open_dialog->ShowModal() == wxID_OK )
+ if( p_open_dialog->ShowModal() == wxID_OK )
{
mrl_text->SetValue(p_open_dialog->mrl[0] );
}
if( mrl_text->GetValue().IsSameAs( wxT(""), TRUE ) &&
event.GetDirection() )
{
- wxMessageBox( wxU( CHOOSE_STREAM ), wxU( ERROR ),
- wxICON_WARNING | wxOK, this );
+ wxMessageBox( wxU( CHOOSE_STREAM ), wxU( ERROR_MSG ),
+ wxICON_WARNING | wxOK, this->p_parent );
event.Veto();
+ return;
}
else
{
- p_parent->SetMrl( (const char *)mrl_text->GetValue().c_str() );
- if( from_text->IsEnabled() )
- {
- msg_Dbg( p_intf, "Partial streaming enabled");
- int i_from = atoi( from_text->GetValue().mb_str() );
- int i_to = atoi( to_text->GetValue().mb_str() );
- p_parent->SetPartial( i_from, i_to );
- }
+ p_parent->SetMrl( (const char *)mrl_text->GetValue().mb_str() );
}
}
else
listitem.SetId( i );
listitem.SetColumn( 1 );
listview->GetItem( listitem );
- p_parent->SetMrl( (const char*) listitem.GetText().c_str() );
+ p_parent->SetMrl( (const char*) listitem.GetText().mb_str() );
}
}
+ if( enable_checkbox->IsChecked() )
+ {
+ int i_from = atoi( from_text->GetValue().mb_str() );
+ int i_to = atoi( to_text->GetValue().mb_str() );
+ msg_Dbg( p_intf, "Partial streaming enabled, from %i to %i",
+ i_from,i_to);
+ p_parent->SetPartial( i_from, i_to );
+ }
return;
}
this->p_intf = p_intf;
}
+void wizInputPage::SetUri( char *psz_uri )
+{
+ mrl_text->SetValue( wxU( psz_uri ) );
+}
+
+void wizInputPage::SetPartial( int i_from, int i_to )
+{
+ wxString msg;
+ msg.Printf( wxString( wxT( "%i") ), i_from );
+ from_text->Enable( TRUE );
+ from_text->SetValue( msg );
+ msg.Printf( wxString( wxT( "%i") ), i_to );
+ to_text->Enable( TRUE );
+ to_text->SetValue( msg );
+ enable_checkbox->SetValue( TRUE );
+}
+
/***************************************************
* First transcode page: choose codecs *
***************************************************/
wxBoxSizer *main_sizer = new wxBoxSizer(wxVERTICAL);
- /* Add the main texts */
- main_sizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext( TRANSCODE1_TITLE ,TEXTWIDTH, false ) ) ),
- 0, wxALL, 5 );
- main_sizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext(TRANSCODE1_TEXT , TEXTWIDTH, false ) ) ),
- 0, wxALL, 5 );
+ /* Header */
+ pageHeader( this, main_sizer, TRANSCODE1_TITLE, TRANSCODE1_TEXT );
/* Video Box */
wxStaticBox *video_box = new wxStaticBox( this, -1, wxU(_("Video")) );
wxStaticBoxSizer *video_sizer = new wxStaticBoxSizer( video_box,
wxVERTICAL );
/* Line 1 : only the checkbox */
- wxFlexGridSizer *video_sizer1 = new wxFlexGridSizer( 1,1,20 );
+ wxFlexGridSizer *video_sizer1 = new wxFlexGridSizer( 2,3,20 );
video_sizer1->Add( new wxCheckBox( this, VideoEnable_Event,
- wxU(_("Transcode video") ) ), 0 , wxLEFT , 5 );
+ wxU(_("Transcode video") ) ), 0 , 0 , 5 );
+ video_sizer1->Add( 0,0,1);
/* Line 2 : codec */
- wxFlexGridSizer *video_sizer2 = new wxFlexGridSizer( 2,1,20 );
- video_sizer2->Add( new wxStaticText(this, -1, wxU(_("Codec"))),0,wxLEFT ,5);
+ video_sizer1->Add( new wxStaticText(this, -1, wxU(_("Codec"))),0,wxLEFT ,5);
video_combo = new wxComboBox( this, VideoCodec_Event, wxT(""),
wxDefaultPosition, wxSize(200,25) );
for( int i= 0; vcodecs_array[i].psz_display != NULL; i++ )
video_combo->Append( wxU( vcodecs_array[i].psz_display ) ,
(void *)&vcodecs_array[i] );
}
- video_sizer2->Add( video_combo, 0 , wxALIGN_RIGHT);
+ video_sizer1->Add( video_combo, 0 , wxALIGN_LEFT , 0 );
+
+ video_sizer1->Add( new wxStaticText(this, -1, wxU(_("Bitrate (kb/s)"))),0,
+ wxLEFT ,5);
+ vb_combo = new wxComboBox( this, VideoBitrate_Event, wxT("1024"),
+ wxDefaultPosition, wxDefaultSize,
+ WXSIZEOF(vbitrates_array), vbitrates_array );
+ video_sizer1->Add( vb_combo, 0, wxALIGN_LEFT , 0 );
+
/* Line 3 : text */
video_text = new wxStaticText( this, -1,
- wxU( vlc_wraptext( TR_AUDIO_TEXT, TEXTWIDTH, false) ) );
- wxFlexGridSizer *video_sizer3 = new wxFlexGridSizer( 2,1,20 );
- video_sizer3->Add( video_text, 0, wxLEFT, 5 );
+ wxU( vlc_wraptext( TR_VIDEO_TEXT, TEXTWIDTH, false) ) );
/* Fill the main video sizer */
- video_sizer->Add( video_sizer1 , 0, wxEXPAND, 5 );
- video_sizer->Add( video_sizer2, 0, wxALL, 5 );
- video_sizer->Add( video_sizer3, 0, wxEXPAND );
+ video_sizer->Add( video_sizer1 , 0, wxEXPAND , 5 );
+ video_sizer->Add( video_text, 0, wxLEFT|wxTOP , 5 );
+
/* Audio box */
wxStaticBox *audio_box = new wxStaticBox( this, -1, wxU(_("Audio")) );
wxStaticBoxSizer *audio_sizer = new wxStaticBoxSizer( audio_box,
wxVERTICAL );
/* Line1: enabler */
- wxFlexGridSizer *audio_sizer1 = new wxFlexGridSizer( 1,1,20);
+ wxFlexGridSizer *audio_sizer1 = new wxFlexGridSizer( 2,3,20);
audio_sizer1->Add( new wxCheckBox( this, AudioEnable_Event,
wxU(_("Transcode audio") ) ), 0 , wxLEFT, 5 );
+ audio_sizer1->Add( 0, 0, 1 );
+
/* Line 2 : codec */
- wxFlexGridSizer *audio_sizer2 = new wxFlexGridSizer( 2,1,20 );
- audio_sizer2->Add( new wxStaticText(this, -1, wxU(_("Codec"))),0,wxLEFT,5);
+ audio_sizer1->Add( new wxStaticText(this, -1, wxU(_("Codec"))),0,wxLEFT,5);
audio_combo = new wxComboBox( this, AudioCodec_Event, wxT(""),
wxDefaultPosition, wxSize(200,25) );
for( int i= 0; acodecs_array[i].psz_display != NULL; i++ )
audio_combo->Append( wxU( acodecs_array[i].psz_display ) ,
(void *)&acodecs_array[i] );
}
- audio_sizer2->Add( audio_combo, 0 , wxALIGN_RIGHT );
+ audio_sizer1->Add( audio_combo, 0 , wxALIGN_LEFT, 0 );
+
+ audio_sizer1->Add( new wxStaticText(this, -1, wxU(_("Bitrate (kb/s)"))),0,
+ wxLEFT ,5);
+ ab_combo = new wxComboBox( this, AudioBitrate_Event, wxT("192"),
+ wxDefaultPosition, wxDefaultSize,
+ WXSIZEOF(abitrates_array), abitrates_array );
+ audio_sizer1->Add( ab_combo, 0, wxALIGN_LEFT, 0 );
+
/* Line 3 : text */
audio_text = new wxStaticText( this, -1,
- wxU( vlc_wraptext( TR_VIDEO_TEXT, TEXTWIDTH, false) ) );
- wxFlexGridSizer *audio_sizer3 = new wxFlexGridSizer( 2,1,20 );
- audio_sizer3->Add( audio_text, 0, wxLEFT,5 );
+ wxU( vlc_wraptext( TR_AUDIO_TEXT, TEXTWIDTH, false) ) );
audio_sizer->Add(audio_sizer1, 0, wxEXPAND, 5);
- audio_sizer->Add(audio_sizer2, 0, wxALL, 5 );
- audio_sizer->Add(audio_sizer3, 0, wxEXPAND );
+ audio_sizer->Add( audio_text, 0, wxLEFT | wxTOP, 5 );
main_sizer->Add( video_sizer, 1, wxGROW, 0 );
main_sizer->Add( audio_sizer, 1, wxGROW, 0 );
SetSizerAndFit( main_sizer );
/* Default disabled */
- video_combo->Disable(); video_text->Disable();
- audio_combo->Disable(); audio_text->Disable();
+ video_combo->Disable(); video_text->Disable();vb_combo->Disable();
+ audio_combo->Disable(); audio_text->Disable();ab_combo->Disable();
}
void wizTranscodeCodecPage::OnEnableVideo(wxCommandEvent& event)
{
video_combo->Enable( event.IsChecked() );
+ vb_combo->Enable( event.IsChecked() );
video_text->Enable( event.IsChecked() );
}
void wizTranscodeCodecPage::OnEnableAudio(wxCommandEvent& event)
{
audio_combo->Enable( event.IsChecked() );
+ ab_combo->Enable( event.IsChecked() );
audio_text->Enable( event.IsChecked() );
}
for( i = 0 ; i< 9 ; i++ )
{
- //fprintf(stderr,"vcodecs[%i].muxers[%i] = %i\n",i_video_codec,i,vcodecs_array[i_video_codec].muxers[i]);
if( vcodecs_array[i_video_codec].muxers[i] != -1 )
{
for( j = 0 ; j< 9 ; j++ )
{
-// fprintf(stderr," acodecs[%i].muxers[%i] = %i\n",i_audio_codec,j,acodecs_array[i_audio_codec].muxers[j]);
if( acodecs_array[i_audio_codec].muxers[j] ==
vcodecs_array[i_video_codec].muxers[i] )
{
audio_combo->GetSelection() : i_audio_codec ));
acodec = strdup(c->psz_codec);
+ int vb = atoi(vb_combo->GetValue().mb_str() );
+ if( vb == 0 )
+ {
+ vb = 1024;
+ }
+ int ab = atoi(ab_combo->GetValue().mb_str() );
+ if( ab == 0)
+ {
+ ab = 192;
+ }
- /* FIXME: Support bitrate */
- p_parent->SetTranscode( vcodec, 1000, acodec, 200 );
+ p_parent->SetTranscode( vcodec, vb , acodec, ab );
((wizEncapPage*)GetNext())->SetAction( p_parent->GetAction() );
p_parent->SetAction( p_parent->GetAction() );
mainSizer = new wxBoxSizer(wxVERTICAL);
/* Create the texts */
- mainSizer->Add( new wxStaticText(this, -1, wxU(
- vlc_wraptext( STREAMING1_TITLE, TEXTWIDTH, false) ) ),
- 0, wxALL, 5 );
- mainSizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext(STREAMING1_TEXT , TEXTWIDTH, false ) ) ),
- 0, wxALL, 5 );
+ pageHeader( this, mainSizer, STREAMING1_TITLE, STREAMING1_TEXT );
+
+ mainSizer->Add( 0,0,1 );
i_method = 0;
address_sizer = new wxStaticBoxSizer(address_box,
wxVERTICAL );
+ /* Big kludge, we take the longest text to get the size */
address_text = new wxStaticText(this, -1,
- wxU( vlc_wraptext( methods_array[2].psz_address,
- TEXTWIDTH, false ) ), wxDefaultPosition,
- wxSize(200,25) );
+ wxU( vlc_wraptext(methods_array[2].psz_address,
+ TEXTWIDTH, false ) ),
+ wxDefaultPosition, wxDefaultSize );
+
address_txtctrl = new wxTextCtrl( this, -1, wxU(""), wxDefaultPosition,
wxSize(200,25));
address_sizer->Add( address_text, 0, wxALL, 5 );
address_sizer->Add( address_txtctrl, 0, wxALL, 5 );
address_sizer->Layout();
+ /* Set the minimum size */
+ address_sizer->SetMinSize( address_sizer->GetSize() );
+ address_text->SetLabel( wxU(
+ vlc_wraptext( _(methods_array[0].psz_address), TEXTWIDTH, false)));
+
mainSizer->Add( method_sizer, 0, wxALL | wxEXPAND, 5 );
mainSizer->Add( address_sizer, 0, wxALL | wxEXPAND, 5 );
+
+ mainSizer->Add( 0,0,1 );
+
mainSizer->Layout();
SetSizer(mainSizer);
unsigned int i;
if( !event.GetDirection() ) return;
- /* Check valid multicast address */
+ /* Check valid address */
if( i_method == 1 && !ismult((char *) address_txtctrl->GetValue().c_str()) )
{
- wxMessageBox( wxU( INVALID_MCAST_ADDRESS ) , wxU( ERROR ),
- wxICON_WARNING | wxOK, this );
+ wxMessageBox( wxU( INVALID_MCAST_ADDRESS ) , wxU( ERROR_MSG ),
+ wxICON_WARNING | wxOK, this->p_parent );
event.Veto();
}
+ else if( i_method == 0 && address_txtctrl->GetValue().IsEmpty() )
+ {
+ wxMessageBox( wxU( NO_ADDRESS ) , wxU( ERROR_MSG ),
+ wxICON_WARNING | wxOK, this->p_parent );
+ event.Veto();
+
+ }
+
((wizEncapPage *)GetNext())->SetPrev(this);
for( i = 0 ; i< 9 ; i++ )
{
}
p_parent->SetStream( methods_array[i_method].psz_access ,
(char *)address_txtctrl->GetValue().c_str() );
+
+ /* Set the action for the muxer page */
+ ((wizEncapPage*)GetNext())->SetAction( p_parent->GetAction() );
return;
}
i_method = event.GetId() - MethodRadio0_Event;
address_text->SetLabel( wxU(
vlc_wraptext( _(methods_array[i_method].psz_address), TEXTWIDTH, false)));
- address_sizer->Layout();
- mainSizer->Layout();
}
/***************************************************
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
/* Create the texts */
- mainSizer->Add( new wxStaticText(this, -1, wxU(ENCAP_TITLE) ),
- 0, wxALL, 5 );
- mainSizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext(ENCAP_TEXT , TEXTWIDTH, false ) ) ),
- 0, wxALL, 5 );
+ pageHeader( this, mainSizer, ENCAP_TITLE, ENCAP_TEXT );
+
+ mainSizer->Add( 0,0,1 );
for( i = 0 ; i< 9 ; i++ )
{
encap_radios[i] = new wxRadioButton( this, EncapRadio0_Event + i,
wxU( encaps_array[i].psz_encap ) );
encap_radios[i]->SetToolTip( wxU(_( encaps_array[i].psz_descr ) ) );
- mainSizer->Add( encap_radios[i], 0, wxALL, 5 );
+ mainSizer->Add( encap_radios[i], 0, wxLEFT, 5 );
encap_radios[i]->Disable();
}
+ mainSizer->Add( 0,0,1 );
+
SetSizer(mainSizer);
mainSizer->Fit(this);
}
}
}
p_parent->SetMux( encaps_array[i_mux].psz_mux );
+
+ if( p_parent->GetAction() == ACTION_STREAM )
+ {
+ if( strstr( p_parent->method, "udp" ))
+ {
+ ((wizStreamingExtraPage *)GetNext())->sap_checkbox->Enable();
+ ((wizStreamingExtraPage *)GetNext())->sap_text->Enable(false);
+ }
+ else
+ {
+ ((wizStreamingExtraPage *)GetNext())->sap_checkbox->Enable( false );
+ ((wizStreamingExtraPage *)GetNext())->sap_text->Enable( false );
+ }
+ }
+
return;
}
+
void wizEncapPage::OnEncapChange(wxEvent& event)
{
i_mux = event.GetId() - EncapRadio0_Event;
wxWizardPage *wizEncapPage::GetNext() const
{
- fprintf(stderr,"Action is %i (%i %i)",i_action,ACTION_STREAM,ACTION_TRANSCODE);
if( i_action== ACTION_STREAM )
return p_streaming_page;
else
return p_transcode_page;
}
-
void wizEncapPage::SetAction( int i_act ) { i_action = i_act; }
void wizEncapPage::SetPrev( wxWizardPage *page) { p_prev = page; }
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
/* Create the texts */
- mainSizer->Add( new wxStaticText(this, -1, wxU( EXTRATRANSCODE_TITLE )),
+ pageHeader( this, mainSizer, EXTRATRANSCODE_TITLE, EXTRATRANSCODE_TEXT );
+
+ mainSizer->Add( 0, 0, 1 );
+
+ wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 2, 1 );
+ sizer->Add( new wxStaticText( this, -1,
+ wxU(_("Select the file to save to") ) ),
0, wxALL, 5 );
- mainSizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext( EXTRATRANSCODE_TEXT , TEXTWIDTH,
- false ) ) ), 0, wxALL, 5 );
- mainSizer->Add( new wxButton( this, Open_Event, wxU("Open") ) );
+ sizer->Add( 0, 0, 1 );
+
+ file_text = new wxTextCtrl( this, -1, wxU(""), wxDefaultPosition,
+ wxSize( 150, -1 ) );
+
+ sizer->Add( file_text, 0, wxALL, 5 );
+ sizer->Add( new wxButton( this, Open_Event, wxU("Choose") ) );
+
+ mainSizer->Add( sizer, 0, 0, 0) ;
+
+ mainSizer->Add( 0, 0, 1 );
SetSizer(mainSizer);
mainSizer->Fit(this);
}
{
if( file_dialog->GetFilename().mb_str() )
{
- p_parent->SetTranscodeOut( (char*)file_dialog->GetFilename().
- c_str() );
+ file_text->SetValue( file_dialog->GetFilename() );
}
}
+}
+void wizTranscodeExtraPage::OnWizardPageChanging( wxWizardEvent& event )
+{
+ if( event.GetDirection() && file_text->GetValue().IsEmpty() )
+ {
+ wxMessageBox( wxU( CHOOSE_OUTFILE ), wxU( ERROR_MSG ),
+ wxICON_WARNING | wxOK, this->p_parent );
+ event.Veto();
+ }
+ if( event.GetDirection() )
+ {
+ p_parent->SetTranscodeOut( (char *)file_text->GetValue().c_str());
+ }
}
wxWizardPage *wizTranscodeExtraPage::GetPrev() const { return p_prev; }
wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
/* Create the texts */
- mainSizer->Add( new wxStaticText(this, -1, wxU( EXTRASTREAMING_TITLE )),
- 0, wxALL, 5 );
- mainSizer->Add( new wxStaticText(this, -1,
- wxU( vlc_wraptext(EXTRASTREAMING_TEXT , TEXTWIDTH,
- false ) ) ), 0, wxALL, 5 );
+ pageHeader( this, mainSizer, EXTRASTREAMING_TITLE, EXTRASTREAMING_TEXT );
+
+ mainSizer->Add( 0, 0, 1 );
+
+ wxFlexGridSizer *sizer = new wxFlexGridSizer( 2,2,1) ;
+
+ /* TTL */
+ sizer->Add( new wxStaticText( this, -1, wxU(_("Time-To-Live (TTL)"))),
+ 0, wxALL, 5 );
+ ttl_spin = new wxSpinCtrl( this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+ 0, 1, 255, 1 );
+ ttl_spin->SetToolTip(wxU(_(TTL) ) ) ;
+ sizer->Add( ttl_spin, 0, wxALL , 5 );
+
+ /* SAP announce */
+ sap_checkbox = new wxCheckBox( this, SAP_Event, wxU(_("SAP Announce")) );
+ sap_checkbox->SetToolTip( wxU(_( SAP ) ) );
+ sizer->Add( sap_checkbox, 0, 0 , 0 );
+ sap_text = new wxTextCtrl( this, -1, wxU(""), wxDefaultPosition,
+ wxSize(100,25) );
+ sap_text->SetToolTip( wxU(_( SAP ) ) );
+ sizer->Add( sap_text, 0, wxALL , 5 );
+
+ mainSizer->Add(sizer, 0, wxALL, 5 );
+
+ mainSizer->Add( 0, 0, 1 );
+
SetSizer(mainSizer);
mainSizer->Fit(this);
}
+void wizStreamingExtraPage::OnSAP( wxCommandEvent &event )
+{
+ sap_text->Enable( event.IsChecked() );
+}
+
+void wizStreamingExtraPage::OnWizardPageChanging(wxWizardEvent& event)
+{
+ if( sap_checkbox->IsChecked() )
+ {
+ if( sap_text->GetValue().IsEmpty() )
+ {
+ p_parent->SetSAP( true, NULL );
+ }
+ else
+ {
+ p_parent->SetSAP( true,
+ (const char *)sap_text->GetValue().mb_str() );
+ }
+ }
+ else
+ {
+ p_parent->SetSAP( false, NULL );
+ }
+
+ p_parent->SetTTL( ttl_spin->GetValue() );
+}
+
wxWizardPage *wizStreamingExtraPage::GetPrev() const { return p_prev; }
wxWizardPage *wizStreamingExtraPage::GetNext() const {return p_next; }
wizStreamingExtraPage *st_page2;
wizEncapPage *encap_page;
-WizardDialog::WizardDialog(intf_thread_t *_p_intf, wxWindow *_p_parent ) :
+WizardDialog::WizardDialog(intf_thread_t *_p_intf, wxWindow *_p_parent,
+ char *psz_uri, int _i_from, int _i_to ) :
wxWizard( _p_parent, -1, wxU(_("Streaming/Transcoding Wizard")), wxNullBitmap, wxDefaultPosition)
{
/* Initializations */
p_intf = _p_intf;
- SetPageSize(wxSize(400,350));
+ SetPageSize(wxSize(400,420));
/* Initialize structure */
i_action = 0;
- i_from = 0;
- i_to = 0;
+ i_from = _i_from;
+ i_to = _i_to;
+ i_ttl = 1;
vb = 0;
ab = 0;
acodec=NULL;
page1 = new wizHelloPage(this);
page2 = new wizInputPage(this, page1, p_intf);
+
+ if( psz_uri )
+ {
+ page2->SetUri( psz_uri );
+ }
+ if( i_from != 0 || i_to != 0 )
+ {
+ page2->SetPartial( i_from, i_to );
+ }
+
encap_page = new wizEncapPage(this );
tr_page1 = new wizTranscodeCodecPage(this, encap_page );
st_page1 = new wizStreamingMethodPage(this, encap_page);
this->mrl = strdup( mrl );
}
-void WizardDialog::SetPartial( int from, int to )
+void WizardDialog::SetTTL( int i_ttl )
+{
+ this->i_ttl = i_ttl;
+}
+
+void WizardDialog::SetSAP( bool b_enabled, const char *psz_text )
+{
+ this->b_sap = b_enabled;
+ if( b_enabled )
+ {
+ if( psz_text != NULL )
+ {
+ this->psz_sap_name = strdup( psz_text );
+ }
+ else
+ {
+ this->psz_sap_name = NULL;
+ }
+ }
+}
+
+void WizardDialog::SetPartial( int i_from, int i_to )
{
- msg_Dbg(p_intf, "From %i to %i", from, to );
this->i_from = i_from;
this->i_to = i_to;
}
void WizardDialog::Run()
{
+ fprintf(stderr, "p_intf %p %p", p_intf, this->p_intf);
msg_Dbg( p_intf,"starting wizard");
if( RunWizard(page1) )
{
sprintf( psz_opt, ":sout=#%sstandard{mux=%s,url=%s,"
"access=file}",
psz_transcode, mux, address );
- msg_Dbg( p_intf,"");
}
else
{
msg_Dbg( p_intf, "Starting stream of %s to %s using %s, encap %s",
mrl, address, method, mux);
- i_size = 40 + strlen(mux) + strlen(address);
- psz_opt = (char *)malloc( i_size * sizeof(char) );
- sprintf( psz_opt, ":sout=#standard{mux=%s,url=%s,access=%s}",
+ if( b_sap )
+ {
+ char *psz_sap_option = NULL;
+ if( psz_sap_name )
+ {
+ psz_sap_option = (char *) malloc( strlen( psz_sap_name )
+ + 15 );
+ sprintf( psz_sap_option, "sap,name=\"%s\"",psz_sap_name );
+ }
+ else
+ {
+ psz_sap_option = (char *) malloc( 10 );
+ sprintf( psz_sap_option, "sap" );
+ }
+ i_size = 40 + strlen(mux) + strlen(address) +
+ strlen( psz_sap_option);
+ psz_opt = (char *)malloc( i_size * sizeof(char) );
+ sprintf( psz_opt,
+ ":sout=#standard{mux=%s,url=%s,access=%s,%s}",
+ mux, address,method, psz_sap_option);
+ msg_Dbg( p_intf, "Sap enabled: %s", psz_sap_option);
+ if( psz_sap_option ) free( psz_sap_option );
+ }
+ else
+ {
+ i_size = 40 + strlen(mux) + strlen(address);
+ psz_opt = (char *)malloc( i_size * sizeof(char) );
+ sprintf( psz_opt, ":sout=#standard{mux=%s,url=%s,access=%s}",
mux, address,method);
+ }
}
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE);
if( p_playlist )
{
- playlist_item_t *p_item = playlist_ItemNew( p_playlist, mrl, ITEM_NAME );
+ playlist_item_t *p_item = playlist_ItemNew( p_playlist, mrl,
+ ITEM_NAME );
playlist_ItemAddOption( p_item, psz_opt);
if( i_from != 0)
{
sprintf( psz_to, "stop-time=%i", i_to);
playlist_ItemAddOption( p_item, psz_to);
}
+
+ char psz_ttl[20];
+ sprintf( psz_ttl, "ttl=%i",i_ttl );
+ playlist_ItemAddOption( p_item, psz_ttl );
+
playlist_AddItem( p_playlist, p_item, PLAYLIST_GO, PLAYLIST_END );
vlc_object_release(p_playlist);
}
else
{
- wxMessageBox( wxU( NO_PLAYLIST ), wxU( ERROR ),
+ wxMessageBox( wxU( NO_PLAYLIST ), wxU( ERROR_MSG ),
wxICON_WARNING | wxOK, this );
}
}
projects / vlc / blobdiff