From 7bcedb5859d7ff7915b155b44468d63d56c4a8b2 Mon Sep 17 00:00:00 2001 From: Christophe Massiot Date: Sun, 5 Jan 2003 02:39:48 +0000 Subject: [PATCH] * Added the possibility to select DVD menus with VIDEO_TS folder in the OS X open panel. --- .../English.lproj/MainMenu.nib/classes.nib | 2 + .../English.lproj/MainMenu.nib/info.nib | 2 +- .../English.lproj/MainMenu.nib/objects.nib | Bin 29842 -> 29998 bytes modules/gui/macosx/open.h | 4 +- modules/gui/macosx/open.m | 63 ++++++++++-------- 5 files changed, 41 insertions(+), 30 deletions(-) diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib index c15baed718..9ed4d79e19 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib @@ -112,6 +112,7 @@ { ACTIONS = { openDisc = id; + openDiscMenusChanged = id; openDiscStepperChanged = id; openDiscTypeChanged = id; openFile = id; @@ -135,6 +136,7 @@ "o_disc_chapter_stp" = id; "o_disc_device" = id; "o_disc_device_lbl" = id; + "o_disc_dvd_menus" = id; "o_disc_title" = id; "o_disc_title_lbl" = id; "o_disc_title_stp" = id; diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib index 81b04656ea..564d95a4f5 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib @@ -15,9 +15,9 @@ 291.0 IBOpenObjects + 21 29 636 - 21 IBSystem Version 6G30 diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib index cd3303dd8e740dd66f2b64b44571107ead35f8ac..606e5e45e8709bbd48662f7d07d49f158d1d6862 100644 GIT binary patch literal 29998 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 literal 29842 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 iwd&a(!djtF_%KKQ-9sR7f8llnC|CB-g+ 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 diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h index cfe4261d6c..ed7d187ee2 100644 --- a/modules/gui/macosx/open.h +++ b/modules/gui/macosx/open.h @@ -2,7 +2,7 @@ * open.h: MacOS X plugin for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: open.h,v 1.4 2002/12/30 23:45:21 massiot Exp $ + * $Id: open.h,v 1.5 2003/01/05 02:39:48 massiot Exp $ * * Authors: Jon Lech Johansen * @@ -54,6 +54,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); IBOutlet id o_disc_chapter_stp; IBOutlet id o_disc_videots_folder; IBOutlet id o_disc_videots_btn_browse; + IBOutlet id o_disc_dvd_menus; IBOutlet id o_net_mode; IBOutlet id o_net_udp_port; @@ -85,6 +86,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); - (IBAction)openDiscTypeChanged:(id)sender; - (IBAction)openDiscStepperChanged:(id)sender; - (void)openDiscInfoChanged:(NSNotification *)o_notification; +- (IBAction)openDiscMenusChanged:(id)sender; - (IBAction)openVTSBrowse:(id)sender; - (IBAction)openNet:(id)sender; diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 6ceeaf0fae..f6758102ba 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -2,7 +2,7 @@ * open.m: MacOS X plugin for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: open.m,v 1.5 2002/12/30 23:45:21 massiot Exp $ + * $Id: open.m,v 1.6 2003/01/05 02:39:48 massiot Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -154,11 +154,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) [o_disc_title_lbl setStringValue: _NS("Title")]; [o_disc_chapter_lbl setStringValue: _NS("Chapter")]; [o_disc_videots_btn_browse setStringValue: _NS("Browse...")]; + [o_disc_dvd_menus setTitle: _NS("Use DVD menus")]; - [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("DVD")]; - [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD with menus")]; + [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")]; + [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")]; [[o_disc_type cellAtRow:2 column:0] setTitle: _NS("VCD")]; - [[o_disc_type cellAtRow:3 column:0] setTitle: _NS("VIDEO_TS folder")]; [o_net_udp_port_lbl setStringValue: _NS("Port")]; [o_net_udpm_addr_lbl setStringValue: _NS("Address")]; @@ -299,40 +299,36 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) - (IBAction)openDiscTypeChanged:(id)sender { NSString *o_type; - vlc_bool_t b_vts, b_device, b_title_chapter; + vlc_bool_t b_device, b_menus, b_title_chapter; [o_disc_device removeAllItems]; + b_title_chapter = ![o_disc_dvd_menus state]; o_type = [[o_disc_type selectedCell] title]; if ( [o_type isEqualToString: _NS("VIDEO_TS folder")] ) { - b_vts = 1; b_device = b_title_chapter = 0; + b_device = 0; b_menus = 1; } else { NSArray *o_devices; NSString *o_disc; const char *psz_class = NULL; - b_vts = 0; b_device = 1; + b_device = 1; if ( [o_type isEqualToString: _NS("VCD")] ) { psz_class = kIOCDMediaClass; o_disc = o_type; - b_title_chapter = 1; + b_menus = 0; b_title_chapter = 1; + [o_disc_dvd_menus setState: FALSE]; } - else if ( [o_type isEqualToString: _NS("DVD")] ) + else { psz_class = kIODVDMediaClass; o_disc = o_type; - b_title_chapter = 1; - } - else /* DVD with menus */ - { - psz_class = kIODVDMediaClass; - o_disc = _NS("DVD"); - b_title_chapter = 0; + b_menus = 1; } o_devices = GetEjectableMediaOfClass( psz_class ); @@ -365,8 +361,9 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) [o_disc_title_stp setEnabled: b_title_chapter]; [o_disc_chapter setEnabled: b_title_chapter]; [o_disc_chapter_stp setEnabled: b_title_chapter]; - [o_disc_videots_folder setEnabled: b_vts]; - [o_disc_videots_btn_browse setEnabled: b_vts]; + [o_disc_videots_folder setEnabled: !b_device]; + [o_disc_videots_btn_browse setEnabled: !b_device]; + [o_disc_dvd_menus setEnabled: b_menus]; [self openDiscInfoChanged: nil]; } @@ -394,12 +391,14 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) NSString *o_videots; NSString *o_mrl_string; int i_title, i_chapter; + vlc_bool_t b_menus; o_type = [[o_disc_type selectedCell] title]; o_device = [o_disc_device stringValue]; i_title = [o_disc_title intValue]; i_chapter = [o_disc_chapter intValue]; o_videots = [o_disc_videots_folder stringValue]; + b_menus = [o_disc_dvd_menus state]; if ( [o_type isEqualToString: _NS("VCD")] ) { @@ -414,24 +413,32 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) if ( [o_device isEqualToString: [NSString stringWithFormat: _NS("No %@s found"), o_type]] ) o_device = @""; - o_mrl_string = [NSString stringWithFormat: @"dvdold://%@@%i,%i", - o_device, i_title, i_chapter]; - } - else if ( [o_type isEqualToString: _NS("DVD with menus")] ) - { - if ( [o_device isEqualToString: - [NSString stringWithFormat: _NS("No %@s found"), _NS("DVD")]] ) - o_device = @""; - o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@", o_device]; + if ( b_menus ) + o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@", + o_device]; + else + o_mrl_string = [NSString stringWithFormat: @"dvdold://%@@%i,%i", + o_device, i_title, i_chapter]; } else /* VIDEO_TS folder */ { - o_mrl_string = [NSString stringWithFormat: @"dvdread://%@", o_videots]; + if ( b_menus ) + o_mrl_string = [NSString stringWithFormat: @"dvdplay://%@", + o_videots]; + else + o_mrl_string = [NSString stringWithFormat: @"dvdread://%@@%i,%i", + o_videots, i_title, i_chapter]; } [o_mrl setStringValue: o_mrl_string]; } +- (IBAction)openDiscMenusChanged:(id)sender +{ + [self openDiscInfoChanged: nil]; + [self openDiscTypeChanged: nil]; +} + - (IBAction)openNetModeChanged:(id)sender { NSString *o_mode;