Commit 32bbb393 authored by gbazin's avatar gbazin
Browse files

* gui/wxwindows/open.cpp: removed deprecated DVD entries.

* access/dvdread.c: added dvdsimple shortcut.
parent 163b655b
......@@ -90,8 +90,9 @@ vlc_module_begin();
CSSMETHOD_LONGTEXT, VLC_TRUE );
change_string_list( psz_css_list, psz_css_list_text, 0 );
set_capability( "access_demux", 0 );
add_shortcut( "dvd" );
//add_shortcut( "dvd" );
add_shortcut( "dvdread" );
add_shortcut( "dvdsimple" );
set_callbacks( Open, Close );
vlc_module_end();
......
......@@ -612,7 +612,6 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent )
wxU(_("DVD")),
wxU(_("VCD")),
wxU(_("Audio CD")),
wxU(_("DVD (test)"))
};
disc_type = new wxRadioBox( panel, DiscType_Event, wxU(_("Disc type")),
......@@ -772,7 +771,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
switch ( i_disc_type_selection )
{
case 0: /* DVD with menues */
case 0: /* DVD with menus */
disc_chapter->Enable();
disc_chapter_label->Enable();
mrltemp = wxT("dvd://")
......@@ -782,7 +781,7 @@ void OpenDialog::UpdateMRL( int i_access_method )
disc_chapter->GetValue() );
break;
case 1: /* DVD of some sort */
case 1: /* DVD without menus */
disc_chapter->Enable();
disc_chapter_label->Enable();
mrltemp = wxT("dvdsimple://")
......@@ -844,16 +843,6 @@ void OpenDialog::UpdateMRL( int i_access_method )
#endif
break;
case 4: /* DVD of some sort */
disc_chapter->Enable();
disc_chapter_label->Enable();
mrltemp = wxT("dvdnav://")
+ disc_device->GetValue()
+ wxString::Format( wxT("@%d:%d"),
disc_title->GetValue(),
disc_chapter->GetValue() );
break;
default: ;
msg_Err( p_intf, "invalid selection (%d)",
disc_type->GetSelection() );
......
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