Commit 0d85325d authored by Marian Durkovic's avatar Marian Durkovic

Fix unicode-incompatible dialogs

parent 1f5efdb6
...@@ -441,9 +441,9 @@ void VLMAddStreamPanel::Load( VLMStream *p_stream ) ...@@ -441,9 +441,9 @@ void VLMAddStreamPanel::Load( VLMStream *p_stream )
void VLMAddStreamPanel::OnCreate( wxCommandEvent &event ) void VLMAddStreamPanel::OnCreate( wxCommandEvent &event )
{ {
char *psz_name = FromLocale( name_text->GetValue().mb_str() ); char *psz_name = wxFromLocale( name_text->GetValue() );
char *psz_input = FromLocale( input_text->GetValue().mb_str() ); char *psz_input = wxFromLocale( input_text->GetValue() );
char *psz_output = FromLocale( output_text->GetValue().mb_str() ); char *psz_output = wxFromLocale( output_text->GetValue() );
if( b_broadcast && ! b_edit ) if( b_broadcast && ! b_edit )
{ {
p_vlm->AddBroadcast( psz_name, psz_input, psz_output, p_vlm->AddBroadcast( psz_name, psz_input, psz_output,
...@@ -468,8 +468,8 @@ void VLMAddStreamPanel::OnCreate( wxCommandEvent &event ) ...@@ -468,8 +468,8 @@ void VLMAddStreamPanel::OnCreate( wxCommandEvent &event )
enabled_checkbox->IsChecked() ? VLC_TRUE: VLC_FALSE, enabled_checkbox->IsChecked() ? VLC_TRUE: VLC_FALSE,
loop_checkbox->IsChecked() ? VLC_TRUE : VLC_FALSE ); loop_checkbox->IsChecked() ? VLC_TRUE : VLC_FALSE );
} }
LocaleFree( psz_name) ; LocaleFree( psz_input ) ; wxLocaleFree( psz_name) ; wxLocaleFree( psz_input ) ;
LocaleFree( psz_output); wxLocaleFree( psz_output);
if( !b_edit ) if( !b_edit )
OnClear( event ); OnClear( event );
if( b_edit ) if( b_edit )
......
...@@ -1308,7 +1308,7 @@ void wizTranscodeExtraPage::OnWizardPageChanging( wxWizardEvent& event ) ...@@ -1308,7 +1308,7 @@ void wizTranscodeExtraPage::OnWizardPageChanging( wxWizardEvent& event )
} }
if( event.GetDirection() ) if( event.GetDirection() )
{ {
p_parent->SetTranscodeOut( file_text->GetValue().mb_str()); p_parent->SetTranscodeOut( file_text->GetValue() );
} }
} }
...@@ -1521,11 +1521,11 @@ void WizardDialog::SetStream( char const *method, char const *address ) ...@@ -1521,11 +1521,11 @@ void WizardDialog::SetStream( char const *method, char const *address )
this->address = strdup( address ); this->address = strdup( address );
} }
void WizardDialog::SetTranscodeOut( char const *address ) void WizardDialog::SetTranscodeOut( wxString address )
{ {
char *psz_utf8 = FromLocale( address ); char *psz_utf8 = wxFromLocale( address );
this->address = strdup( psz_utf8 ); this->address = strdup( psz_utf8 );
LocaleFree( psz_utf8 ); wxLocaleFree( psz_utf8 );
} }
void WizardDialog::SetMux( char const *mux ) void WizardDialog::SetMux( char const *mux )
......
...@@ -42,7 +42,7 @@ namespace wxvlc ...@@ -42,7 +42,7 @@ namespace wxvlc
void SetTTL( int i_ttl ); void SetTTL( int i_ttl );
void SetPartial( int, int ); void SetPartial( int, int );
void SetStream( char const *method, char const *address ); void SetStream( char const *method, char const *address );
void SetTranscodeOut( char const *address ); void SetTranscodeOut( wxString address );
void SetAction( int i_action ); void SetAction( int i_action );
int GetAction(); int GetAction();
void SetSAP( bool b_enabled, const char *psz_name ); void SetSAP( bool b_enabled, const char *psz_name );
......
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