Commit dd8a6acf authored by Rocky Bernstein's avatar Rocky Bernstein
Browse files

Remember the disc selection type (DVD, VCD, CD-DA) selected in "Open

Disc" and use that as the default for next time.
parent af1fa8e7
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc * open.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001, 2003 VideoLAN * Copyright (C) 2000, 2001, 2003 VideoLAN
* $Id: open.cpp,v 1.55 2003/12/15 20:20:55 gbazin Exp $ * $Id: open.cpp,v 1.56 2003/12/16 03:21:47 rocky Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -234,6 +234,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -234,6 +234,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
p_parent = _p_parent; p_parent = _p_parent;
SetIcon( *p_intf->p_sys->p_icon ); SetIcon( *p_intf->p_sys->p_icon );
file_dialog = NULL; file_dialog = NULL;
i_disc_type_selection = 0;
#ifndef WIN32 #ifndef WIN32
v4l_dialog = NULL; v4l_dialog = NULL;
#endif #endif
...@@ -476,7 +478,8 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent ) ...@@ -476,7 +478,8 @@ wxPanel *OpenDialog::DiscPanel( wxWindow* parent )
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
WXSIZEOF(disc_type_array), disc_type_array, WXSIZEOF(disc_type_array), disc_type_array,
WXSIZEOF(disc_type_array), wxRA_SPECIFY_COLS ); WXSIZEOF(disc_type_array), wxRA_SPECIFY_COLS );
sizer_row->Add( disc_type, 0, wxEXPAND | wxALL, 5 );
sizer_row->Add( disc_type, i_disc_type_selection, wxEXPAND | wxALL, 5 );
wxStaticText *label = new wxStaticText( panel, -1, wxU(_("Device name")) ); wxStaticText *label = new wxStaticText( panel, -1, wxU(_("Device name")) );
disc_device = new wxTextCtrl( panel, DiscDevice_Event, wxT(""), disc_device = new wxTextCtrl( panel, DiscDevice_Event, wxT(""),
...@@ -678,7 +681,9 @@ void OpenDialog::UpdateMRL( int i_access_method ) ...@@ -678,7 +681,9 @@ void OpenDialog::UpdateMRL( int i_access_method )
mrltemp = file_combo->GetValue(); mrltemp = file_combo->GetValue();
break; break;
case DISC_ACCESS: case DISC_ACCESS:
switch ( disc_type->GetSelection() ) i_disc_type_selection = disc_type->GetSelection();
switch ( i_disc_type_selection )
{ {
case 0: case 0:
disc_chapter->Enable(); disc_chapter->Enable();
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* wxwindows.h: private wxWindows interface description * wxwindows.h: private wxWindows interface description
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: wxwindows.h,v 1.80 2003/12/14 22:49:28 gbazin Exp $ * $Id: wxwindows.h,v 1.81 2003/12/16 03:21:47 rocky Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -362,6 +362,7 @@ private: ...@@ -362,6 +362,7 @@ private:
intf_thread_t *p_intf; intf_thread_t *p_intf;
wxWindow *p_parent; wxWindow *p_parent;
int i_current_access_method; int i_current_access_method;
int i_disc_type_selection;
int i_method; /* Normal or for the stream dialog ? */ int i_method; /* Normal or for the stream dialog ? */
wxComboBox *mrl_combo; wxComboBox *mrl_combo;
......
Supports Markdown
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