Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / wxwidgets / dialogs / wizard.cpp

diff --git a/modules/gui/wxwidgets/dialogs/wizard.cpp b/modules/gui/wxwidgets/dialogs/wizard.cpp
index 03bba2420717a139f64a4be95122df7de8c5620c..6ee53449be73db1a640e85771353a0ad6a038dbf 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/wizard.cpp
+++ b/modules/gui/wxwidgets/dialogs/wizard.cpp
@@ -208,7 +208,7 @@ class wizInputPage : public wxWizardPage
 {
     public:
         wizInputPage( wxWizard *, wxWizardPage *, intf_thread_t *);
-        wizInputPage::~wizInputPage();
+        ~wizInputPage();
         void OnWizardPageChanging(wxWizardEvent& event);
         void OnInputChange( wxCommandEvent& event );
         void OnEnablePartial(wxCommandEvent& event);
@@ -262,7 +262,7 @@ class wizTranscodeCodecPage : public wxWizardPage
 public:
     wizTranscodeCodecPage( wxWizard *parent, wxWizardPage *next);
     ~wizTranscodeCodecPage();
-    void wizTranscodeCodecPage::OnWizardPageChanging(wxWizardEvent& event);
+    void OnWizardPageChanging(wxWizardEvent& event);
     virtual wxWizardPage *GetPrev() const;
     virtual wxWizardPage *GetNext() const;
     void SetPrev( wxWizardPage *page);
@@ -339,7 +339,7 @@ class wizEncapPage : public wxWizardPage
 {
 public:
     wizEncapPage( wxWizard *parent);
-    wizEncapPage::~wizEncapPage();
+    ~wizEncapPage();
     void OnWizardPageChanging(wxWizardEvent& event);
     virtual wxWizardPage *GetPrev() const;
     virtual wxWizardPage *GetNext() const;
@@ -387,7 +387,7 @@ public:
     void OnWizardPageChanging( wxWizardEvent& event );
 protected:
     DECLARE_EVENT_TABLE()
-    void wizTranscodeExtraPage::OnSelectFile(wxCommandEvent&);
+    void OnSelectFile(wxCommandEvent&);
     wxTextCtrl *file_text;
     WizardDialog *p_parent;
     wxWizardPage *p_prev;
@@ -550,7 +550,7 @@ wizInputPage::wizInputPage( wxWizard *parent, wxWizardPage *prev, intf_thread_t
                                wxU( INPUT_OPEN ) );
     radioSizer->Add( input_radios[0], 0, wxALL, 5 );
     input_radios[1] = new wxRadioButton( radio_panel, InputRadio1_Event ,
-                               wxU( INPUT_PL ) );  
+                               wxU( INPUT_PL ) );
     radioSizer->Add( input_radios[1], 0, wxALL, 5 );
 
     radio_panel->SetSizer( radioSizer );
@@ -724,7 +724,9 @@ void wizInputPage::OnWizardPageChanging(wxWizardEvent& event)
                 playlist_item_t * p_item = playlist_ItemGetById(                                                   p_playlist, (int)data, VLC_FALSE );
                 if( p_item )
                 {
-                    p_parent->SetMrl( (const char*)p_item->p_input->psz_uri );
+                    const char *psz_uri = input_item_GetURI( p_item->p_input );
+                    p_parent->SetMrl( psz_uri );
+                    free( psz_uri );
                 }
                 else
                     event.Veto();
@@ -819,7 +821,7 @@ wizTranscodeCodecPage::wizTranscodeCodecPage( wxWizard *parent,
     /* Line 2 : codec */
     video_sizer1->Add( new wxStaticText(this, -1, wxU(_("Codec"))),0,wxLEFT ,5);
     video_combo = new wxComboBox( this, VideoCodec_Event, wxT(""),
-                                  wxDefaultPosition, wxSize(200,25), 0, NULL, 
+                                  wxDefaultPosition, wxSize(200,25), 0, NULL,
                                   wxCB_DROPDOWN| wxCB_READONLY );
     for( i= 0; vcodecs_array[i].psz_display != NULL; i++ )
     {
@@ -859,7 +861,7 @@ wizTranscodeCodecPage::wizTranscodeCodecPage( wxWizard *parent,
     /* Line 2 : codec */
     audio_sizer1->Add( new wxStaticText(this, -1, wxU(_("Codec"))),0,wxLEFT,5);
     audio_combo = new wxComboBox( this, AudioCodec_Event, wxT(""),
-                                  wxDefaultPosition, wxSize(200,25), 0, NULL, 
+                                  wxDefaultPosition, wxSize(200,25), 0, NULL,
                                   wxCB_DROPDOWN| wxCB_READONLY );
     for( i= 0; acodecs_array[i].psz_display != NULL; i++ )
     {
@@ -1609,8 +1611,8 @@ void WizardDialog::Run()
             /* Add brackets automatically for IPv6 if they are missing */
             v6 = ( address[0] != '[' ) && ( strchr( address, ':' ) != NULL );
             asprintf( &psz_opt,
-                      ":sout=#standard{mux=%s,dst=%s%s%s,access=%s%s}",
-                      mux, v6 ? "[" : "", address, v6 ? "]" : "", method,
+                      ":sout=#%smux=%s,dst=%s%s%s%s}", method,
+                      mux, v6 ? "[" : "", address, v6 ? "]" : "",
                       psz_sap_option ?: "" );
             if( psz_sap_option ) free( psz_sap_option );
         }
@@ -1640,7 +1642,7 @@ void WizardDialog::Run()
             input_ItemAddOption( p_input, psz_ttl );
 
             playlist_AddInput( p_playlist, p_input,
-                               PLAYLIST_GO, PLAYLIST_END, VLC_TRUE );
+                               PLAYLIST_GO, PLAYLIST_END, VLC_TRUE, VLC_FALSE );
             vlc_object_release(p_playlist);
         }
         else