From: Derk-Jan Hartman Date: Tue, 20 May 2003 18:53:03 +0000 (+0000) Subject: * NEWS: updated some OSX info X-Git-Tag: 0.6.0~244 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fa95d6e996e1913209a6e0a01aacc384285c64b8;p=vlc * NEWS: updated some OSX info * ALL: - added CDDA support - added a "Online Documentation" item to the Help menu - removed some debugging strings --- diff --git a/NEWS b/NEWS index 5d42ff62b8..0d04fac42f 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -$Id: NEWS,v 1.43 2003/05/20 16:20:33 zorglub Exp $ +$Id: NEWS,v 1.44 2003/05/20 18:53:03 hartman Exp $ Changes between 0.5.3 and 0.6.0: --------------------------------- @@ -44,12 +44,11 @@ UNIX ports: Mac OS X port: * When you add several items to the playlist, they are sorted alphabetically. - * New about panel + * New about panel and revamped preferences panel. * Fixed the deinterlace menu. - * Transparency option for video out. - * Float on top option for video out. - * New output dialog for transcode and display while stream capabilities - * New icons + * Float on top and a Transparency option for video out. + * New output dialog for transcode and display while stream capabilities. + * New icons by Davor Orel. * New audio resampler. Should make VLC much faster. * Fixed disappearing and crackling sound (PTS is out of range bug) * We no longer automatically save the preferences when you quit the application diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib index 0384fbd47e..e9fbbcbae8 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib @@ -53,6 +53,7 @@ clearRecentItems = id; closeError = id; openCrashLog = id; + openDocumentation = id; openLicense = id; openReadMe = id; openRecentItem = id; @@ -99,6 +100,7 @@ "o_mi_cut" = id; "o_mi_deinterlace" = id; "o_mi_device" = id; + "o_mi_documentation" = id; "o_mi_double_window" = id; "o_mi_faster" = id; "o_mi_fittoscreen" = id; diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib index fed6128721..8b31d8f168 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib @@ -21,11 +21,7 @@ 977 - IBOpenObjects - - 1530 - IBSystem Version - 6L29 + 6L60 diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib index b5756c259e..2083270fed 100644 Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 1bb5da50c5..94626bf65a 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -2,7 +2,7 @@ * intf.h: MacOS X interface plugin ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: intf.h,v 1.39 2003/05/15 01:23:05 hartman Exp $ + * $Id: intf.h,v 1.40 2003/05/20 18:53:03 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -210,6 +210,7 @@ struct intf_sys_t IBOutlet id o_mu_help; IBOutlet id o_mi_readme; + IBOutlet id o_mi_documentation; IBOutlet id o_mi_reportabug; IBOutlet id o_mi_website; IBOutlet id o_mi_license; @@ -251,6 +252,7 @@ struct intf_sys_t - (IBAction)closeError:(id)sender; - (IBAction)openReadMe:(id)sender; +- (IBAction)openDocumentation:(id)sender; - (IBAction)reportABug:(id)sender; - (IBAction)openWebsite:(id)sender; - (IBAction)openLicense:(id)sender; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index d8a444a452..a07b1450ed 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -2,7 +2,7 @@ * intf.m: MacOS X interface plugin ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: intf.m,v 1.84 2003/05/20 15:23:25 hartman Exp $ + * $Id: intf.m,v 1.85 2003/05/20 18:53:03 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -390,6 +390,7 @@ int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, [o_mu_help setTitle: _NS("Help")]; [o_mi_readme setTitle: _NS("ReadMe...")]; + [o_mi_documentation setTitle: _NS("Online Documentation")]; [o_mi_reportabug setTitle: _NS("Report a Bug")]; [o_mi_website setTitle: _NS("VideoLAN Website")]; [o_mi_license setTitle: _NS("License")]; @@ -1205,6 +1206,14 @@ int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, withApplication: @"TextEdit"]; } +- (IBAction)openDocumentation:(id)sender +{ + NSURL * o_url = [NSURL URLWithString: + @"http://www.videolan.org/doc/"]; + + [[NSWorkspace sharedWorkspace] openURL: o_url]; +} + - (IBAction)reportABug:(id)sender { NSURL * o_url = [NSURL URLWithString: diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 1132154109..9194b30f47 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-2003 VideoLAN - * $Id: open.m,v 1.33 2003/05/12 01:17:10 hartman Exp $ + * $Id: open.m,v 1.34 2003/05/20 18:53:03 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -154,6 +154,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) [[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("Audio CD")]; [o_net_udp_port_lbl setStringValue: _NS("Port")]; [o_net_udpm_addr_lbl setStringValue: _NS("Address")]; @@ -385,6 +386,13 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) b_menus = 0; b_title_chapter = 1; [o_disc_dvd_menus setState: FALSE]; } + else if ( [o_type isEqualToString: _NS("Audio CD")]) + { + psz_class = kIOCDMediaClass; + o_disc = o_type; + b_menus = 0; b_title_chapter = 0; + [o_disc_dvd_menus setState: FALSE]; + } else { psz_class = kIODVDMediaClass; @@ -469,6 +477,14 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) o_mrl_string = [NSString stringWithFormat: @"vcd://%@@%i,%i", o_device, i_title, i_chapter]; } + else if ( [o_type isEqualToString: _NS("Audio CD")] ) + { + if ( [o_device isEqualToString: + [NSString stringWithFormat: _NS("No %@s found"), o_type]] ) + o_device = @""; + o_mrl_string = [NSString stringWithFormat: @"cdda://%@", + o_device]; + } else if ( [o_type isEqualToString: _NS("DVD")] ) { if ( [o_device isEqualToString: diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index ea0b363fae..928efce5ab 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -2,7 +2,7 @@ * prefs.m: MacOS X plugin for vlc ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: prefs.m,v 1.22 2003/05/20 15:23:25 hartman Exp $ + * $Id: prefs.m,v 1.23 2003/05/20 18:53:03 hartman Exp $ * * Authors: Jon Lech Johansen * Derk-Jan Hartman @@ -120,7 +120,6 @@ - (void)outlineViewSelectionDidChange:(NSNotification *)o_notification { - NSLog( [[o_tree itemAtRow:[o_tree selectedRow]] getName] ); [self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID] andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]]; } @@ -129,11 +128,8 @@ id o_vlc_config = [o_unknown isKindOfClass: [NSNotification class]] ? [o_unknown object] : o_unknown; - NSString *o_module_name = [o_vlc_config moduleName]; - int i_type = [o_vlc_config configType]; NSString *o_name = [o_vlc_config configName]; - NSLog( o_name); char *psz_name = (char *)[o_name UTF8String]; switch( i_type ) @@ -145,7 +141,6 @@ NSString *o_value; o_value = [o_vlc_config titleOfSelectedItem]; - NSLog( o_value); psz_value = (char *)[o_value UTF8String]; config_PutPsz( p_intf, psz_name, psz_value ); @@ -160,7 +155,6 @@ NSString *o_value; o_value = [o_vlc_config stringValue]; - NSLog( o_value); psz_value = (char *)[o_value UTF8String]; config_PutPsz( p_intf, psz_name, psz_value );