From: Eric Petit Date: Mon, 27 Jan 2003 10:29:22 +0000 (+0000) Subject: Disabled DVD menus by default for 0.5.0 X-Git-Tag: 0.5.0~144 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=58990fdaa56e39ce7c027ea3bbfc239a5a39467d;p=vlc Disabled DVD menus by default for 0.5.0 --- diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp index 5d7e3b2a56..45686996e3 100644 --- a/modules/gui/beos/InterfaceWindow.cpp +++ b/modules/gui/beos/InterfaceWindow.cpp @@ -2,7 +2,7 @@ * InterfaceWindow.cpp: beos interface ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: InterfaceWindow.cpp,v 1.22 2003/01/25 20:15:41 titer Exp $ + * $Id: InterfaceWindow.cpp,v 1.23 2003/01/27 10:29:21 titer Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -69,7 +69,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name, { p_intf = p_interface; p_wrapper = p_intf->p_sys->p_wrapper; - p_intf->p_sys->b_dvdold = false; + p_intf->p_sys->b_dvdmenus = false; fPlaylistIsEmpty = !( p_wrapper->PlaylistSize() > 0 ); diff --git a/modules/gui/beos/PreferencesWindow.cpp b/modules/gui/beos/PreferencesWindow.cpp index 93d0955c29..c8a17f3c0d 100644 --- a/modules/gui/beos/PreferencesWindow.cpp +++ b/modules/gui/beos/PreferencesWindow.cpp @@ -2,7 +2,7 @@ * PreferencesWindow.cpp: beos interface ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: PreferencesWindow.cpp,v 1.9 2003/01/25 20:15:41 titer Exp $ + * $Id: PreferencesWindow.cpp,v 1.10 2003/01/27 10:29:21 titer Exp $ * * Authors: Eric Petit * @@ -75,9 +75,9 @@ PreferencesWindow::PreferencesWindow( intf_thread_t * p_intf, rect = fGeneralView->Bounds(); rect.InsetBy( 10, 10 ); rect.bottom = rect.top + 10; - fDvdOldCheck = new BCheckBox( rect, "dvdold", "Do not use DVD menus", - new BMessage( DVDOLD_CHECK ) ); - fGeneralView->AddChild( fDvdOldCheck ); + fDvdMenusCheck = new BCheckBox( rect, "dvdmenus", "Use DVD menus", + new BMessage( DVDMENUS_CHECK ) ); + fGeneralView->AddChild( fDvdMenusCheck ); rect.top = rect.bottom + 20; rect.bottom = rect.top + 30; @@ -171,7 +171,7 @@ void PreferencesWindow::MessageReceived( BMessage * p_message ) { switch ( p_message->what ) { - case DVDOLD_CHECK: + case DVDMENUS_CHECK: case SLIDER_UPDATE: { ApplyChanges(); @@ -215,7 +215,7 @@ void PreferencesWindow::ReallyQuit() *****************************************************************************/ void PreferencesWindow::SetDefaults() { - fDvdOldCheck->SetValue( 0 ); + fDvdMenusCheck->SetValue( 0 ); fPpSlider->SetValue( 0 ); fBrightnessSlider->SetValue( 100 ); fContrastSlider->SetValue( 100 ); @@ -228,10 +228,10 @@ void PreferencesWindow::SetDefaults() *****************************************************************************/ void PreferencesWindow::ApplyChanges() { - if( fDvdOldCheck->Value() ) - p_intf->p_sys->b_dvdold = true; + if( fDvdMenusCheck->Value() ) + p_intf->p_sys->b_dvdmenus = true; else - p_intf->p_sys->b_dvdold = false; + p_intf->p_sys->b_dvdmenus = false; config_PutInt( p_intf, "ffmpeg-pp-q", fPpSlider->Value() ); config_PutFloat( p_intf, "brightness", diff --git a/modules/gui/beos/PreferencesWindow.h b/modules/gui/beos/PreferencesWindow.h index 86c812cc06..b165ff0a22 100644 --- a/modules/gui/beos/PreferencesWindow.h +++ b/modules/gui/beos/PreferencesWindow.h @@ -2,7 +2,7 @@ * PreferencesWindow.h ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN - * $Id: PreferencesWindow.h,v 1.7 2003/01/25 20:15:41 titer Exp $ + * $Id: PreferencesWindow.h,v 1.8 2003/01/27 10:29:22 titer Exp $ * * Authors: Eric Petit * @@ -33,7 +33,7 @@ #define PREFS_SAVE 'prsa' #define PREFS_DEFAULTS 'prde' #define SLIDER_UPDATE 'slup' -#define DVDOLD_CHECK 'dvch' +#define DVDMENUS_CHECK 'dvme' class PreferencesWindow : public BWindow { @@ -54,7 +54,7 @@ class PreferencesWindow : public BWindow BView * fAdjustView; BTab * fGeneralTab; BTab * fAdjustTab; - BCheckBox * fDvdOldCheck; + BCheckBox * fDvdMenusCheck; BSlider * fPpSlider; BSlider * fContrastSlider; BSlider * fBrightnessSlider; diff --git a/modules/gui/beos/VlcWrapper.cpp b/modules/gui/beos/VlcWrapper.cpp index 9f9189dc02..3b5fbf5e68 100644 --- a/modules/gui/beos/VlcWrapper.cpp +++ b/modules/gui/beos/VlcWrapper.cpp @@ -2,7 +2,7 @@ * VlcWrapper.cpp: BeOS plugin for vlc (derived from MacOS X port) ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: VlcWrapper.cpp,v 1.21 2003/01/22 01:13:22 titer Exp $ + * $Id: VlcWrapper.cpp,v 1.22 2003/01/27 10:29:22 titer Exp $ * * Authors: Florian G. Pflug * Jon Lech Johansen @@ -389,7 +389,9 @@ void VlcWrapper::OpenFiles( BList* o_files, bool replace ) void VlcWrapper::OpenDisc(BString o_type, BString o_device, int i_title, int i_chapter) { - if( p_intf->p_sys->b_dvdold ) + if( p_intf->p_sys->b_dvdmenus ) + o_device.Prepend( "dvd:" ); + else o_device.Prepend( "dvdold:" ); playlist_Add( p_playlist, o_device.String(), PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END ); diff --git a/modules/gui/beos/VlcWrapper.h b/modules/gui/beos/VlcWrapper.h index e966a15f56..be0c84c88c 100644 --- a/modules/gui/beos/VlcWrapper.h +++ b/modules/gui/beos/VlcWrapper.h @@ -2,7 +2,7 @@ * VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port) ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: VlcWrapper.h,v 1.16 2003/01/25 20:15:41 titer Exp $ + * $Id: VlcWrapper.h,v 1.17 2003/01/27 10:29:22 titer Exp $ * * Authors: Florian G. Pflug * Jon Lech Johansen @@ -44,7 +44,7 @@ struct intf_sys_t int i_part; audio_volume_t i_saved_volume; int i_channel; - bool b_dvdold; + bool b_dvdmenus; VlcWrapper * p_wrapper; };