Skip to content

V
vlc-1.1
Commit 90e23b41 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/gui/wxwindows/open.cpp: compilation fix.

parent d1ffd81d
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
modules/gui/wxwindows/open.cpp
View file @ 90e23b41
...@@ -793,7 +793,7 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -793,7 +793,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
{ {
case FILE_ACCESS: case FILE_ACCESS:
mrltemp = file_combo->GetValue(); mrltemp = file_combo->GetValue();
caching_name = "file-caching"; caching_name = wxT("file-caching");
break; break;
case DISC_ACCESS: case DISC_ACCESS:
...@@ -806,12 +806,12 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -806,12 +806,12 @@ void OpenDialog::UpdateMRL( int i_access_method )
if( i_disc_type_selection == 0 ) if( i_disc_type_selection == 0 )
{ {
mrltemp = wxT("dvd://") + disc_device->GetValue(); mrltemp = wxT("dvd://") + disc_device->GetValue();
caching_name = "dvdnav-caching"; caching_name = wxT("dvdnav-caching");
} }
else else
{ {
mrltemp = wxT("dvdsimple://") + disc_device->GetValue(); mrltemp = wxT("dvdsimple://") + disc_device->GetValue();
caching_name = "dvdread-caching"; caching_name = wxT("dvdread-caching");
} }
if( i_disc_title > 0 ) if( i_disc_title > 0 )
...@@ -844,7 +844,7 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -844,7 +844,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
mrltemp += wxString::Format( wxT(" :spu-channel=%d"), mrltemp += wxString::Format( wxT(" :spu-channel=%d"),
i_disc_sub ); i_disc_sub );
caching_name = "vcd-caching"; caching_name = wxT("vcd-caching");
break; break;
case 3: /* CD-DA */ case 3: /* CD-DA */
...@@ -852,7 +852,7 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -852,7 +852,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
if( i_disc_title > 0 ) if( i_disc_title > 0 )
mrltemp += wxString::Format( wxT("@%d"), i_disc_title ); mrltemp += wxString::Format( wxT("@%d"), i_disc_title );
caching_name = "cdda-caching"; caching_name = wxT("cdda-caching");
break; break;
default: default:
...@@ -877,7 +877,7 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -877,7 +877,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
mrltemp += wxString::Format( wxT("@:%d"), i_net_ports[0] ); mrltemp += wxString::Format( wxT("@:%d"), i_net_ports[0] );
} }
caching_name = "udp-caching"; caching_name = wxT("udp-caching");
break; break;
case 1: case 1:
...@@ -898,7 +898,7 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -898,7 +898,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
mrltemp += wxString::Format( wxT(":%d"), i_net_ports[1] ); mrltemp += wxString::Format( wxT(":%d"), i_net_ports[1] );
} }
caching_name = "udp-caching"; caching_name = wxT("udp-caching");
break; break;
case 2: case 2:
...@@ -909,7 +909,7 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -909,7 +909,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
} }
mrltemp += net_addrs[2]->GetLineText(0); mrltemp += net_addrs[2]->GetLineText(0);
caching_name = "http-caching"; caching_name = wxT("http-caching");
break; break;
case 3: case 3:
...@@ -920,7 +920,7 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -920,7 +920,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
} }
mrltemp += net_addrs[3]->GetLineText(0); mrltemp += net_addrs[3]->GetLineText(0);
caching_name = "rtsp-caching"; caching_name = wxT("rtsp-caching");
break; break;
} }
break; break;
...@@ -980,8 +980,8 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -980,8 +980,8 @@ void OpenDialog::UpdateMRL( int i_access_method )
{ {
if( caching_value->IsEnabled() ) if( caching_value->IsEnabled() )
{ {
mrltemp += wxString::Format( wxT(" :%s=%d"), caching_name.mb_str(), mrltemp += wxT(" :") + caching_name +
i_caching ); wxString::Format( wxT("=%d"), i_caching );
} }
else else
{ {
......
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