Commit d1e3b4ad authored by Eric Petit's avatar Eric Petit
Browse files

Fixed the 'Do not use DVD menus' check box.

parent a5d19ec4
......@@ -2,7 +2,7 @@
* InterfaceWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: InterfaceWindow.cpp,v 1.18 2003/01/16 15:26:23 titer Exp $
* $Id: InterfaceWindow.cpp,v 1.19 2003/01/17 18:19:43 titer Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -69,6 +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;
fPlaylistIsEmpty = ( p_wrapper->PlaylistSize() < 0 );
......
......@@ -2,7 +2,7 @@
* PreferencesWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: PreferencesWindow.cpp,v 1.7 2003/01/16 15:26:23 titer Exp $
* $Id: PreferencesWindow.cpp,v 1.8 2003/01/17 18:19:43 titer Exp $
*
* Authors: Eric Petit <titer@videolan.org>
*
......@@ -75,13 +75,9 @@ PreferencesWindow::PreferencesWindow( BRect frame, const char* name,
rect = fGeneralView->Bounds();
rect.InsetBy( 10, 10 );
rect.bottom = rect.top + 10;
fOldDvdCheck = new BCheckBox( rect, "olddvd", "Do not use DVD menus",
new BMessage( OLDDVD_CHECK ) );
fGeneralView->AddChild( fOldDvdCheck );
fprintf( stderr, "%s\n", config_GetPsz( p_intf, "access" ) );
if( config_GetPsz( p_intf, "access" ) &&
!strncmp( config_GetPsz( p_intf, "access" ), "dvdold,any", 10 ) )
fOldDvdCheck->SetValue( 1 );
fDvdOldCheck = new BCheckBox( rect, "dvdold", "Do not use DVD menus",
new BMessage( DVDOLD_CHECK ) );
fGeneralView->AddChild( fDvdOldCheck );
rect.top = rect.bottom + 20;
rect.bottom = rect.top + 30;
......@@ -177,7 +173,7 @@ void PreferencesWindow::MessageReceived( BMessage * p_message )
{
switch ( p_message->what )
{
case OLDDVD_CHECK:
case DVDOLD_CHECK:
case SLIDER_UPDATE:
{
ApplyChanges();
......@@ -221,7 +217,7 @@ void PreferencesWindow::ReallyQuit()
*****************************************************************************/
void PreferencesWindow::SetDefaults()
{
fOldDvdCheck->SetValue( 0 );
fDvdOldCheck->SetValue( 0 );
fPpSlider->SetValue( 0 );
fBrightnessSlider->SetValue( 100 );
fContrastSlider->SetValue( 100 );
......@@ -234,10 +230,10 @@ void PreferencesWindow::SetDefaults()
*****************************************************************************/
void PreferencesWindow::ApplyChanges()
{
if( fOldDvdCheck->Value() )
config_PutPsz( p_intf, "access", "dvdold,any" );
if( fDvdOldCheck->Value() )
p_intf->p_sys->b_dvdold = true;
else
config_PutPsz( p_intf, "access", NULL );
p_intf->p_sys->b_dvdold = false;
config_PutInt( p_intf, "ffmpeg-pp-q", fPpSlider->Value() );
config_PutFloat( p_intf, "brightness",
......
......@@ -2,7 +2,7 @@
* PreferencesWindow.h
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: PreferencesWindow.h,v 1.5 2003/01/16 15:26:23 titer Exp $
* $Id: PreferencesWindow.h,v 1.6 2003/01/17 18:19:43 titer Exp $
*
* Authors: Eric Petit <titer@videolan.org>
*
......@@ -33,7 +33,7 @@
#define PREFS_SAVE 'prsa'
#define PREFS_DEFAULTS 'prde'
#define SLIDER_UPDATE 'slup'
#define OLDDVD_CHECK 'olch'
#define DVDOLD_CHECK 'dvch'
class PreferencesWindow : public BWindow
{
......@@ -54,7 +54,7 @@ class PreferencesWindow : public BWindow
BView * fAdjustView;
BTab * fGeneralTab;
BTab * fAdjustTab;
BCheckBox * fOldDvdCheck;
BCheckBox * fDvdOldCheck;
BSlider * fPpSlider;
BSlider * fContrastSlider;
BSlider * fBrightnessSlider;
......
......@@ -2,7 +2,7 @@
* VlcWrapper.cpp: BeOS plugin for vlc (derived from MacOS X port)
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: VlcWrapper.cpp,v 1.19 2003/01/14 22:03:38 titer Exp $
* $Id: VlcWrapper.cpp,v 1.20 2003/01/17 18:19:43 titer Exp $
*
* Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
......@@ -252,10 +252,9 @@ void VlcWrapper::openFiles( BList* o_files, bool replace )
void VlcWrapper::openDisc(BString o_type, BString o_device, int i_title, int i_chapter)
{
BString o_source("");
o_source << o_type << ":" << o_device ;
playlist_Add( p_playlist, o_source.String(),
if( p_intf->p_sys->b_dvdold )
o_device.Prepend( "dvdold:" );
playlist_Add( p_playlist, o_device.String(),
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
}
......
......@@ -2,7 +2,7 @@
* VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port)
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: VlcWrapper.h,v 1.13 2003/01/14 14:48:55 titer Exp $
* $Id: VlcWrapper.h,v 1.14 2003/01/17 18:19:43 titer Exp $
*
* Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
......@@ -42,6 +42,7 @@ struct intf_sys_t
int i_part;
audio_volume_t i_saved_volume;
int i_channel;
bool b_dvdold;
VlcWrapper * p_wrapper;
};
......
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