From c361066fb94ae32ee2c94af3ad1ea06cd6c4d742 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Thu, 6 Jan 2005 17:58:07 +0000 Subject: [PATCH] * controls.m: call openFileGeneric via VLCMain and not directly from VLCOpen * controls.h: removed "o_open" * intf.*, open.*: make sure the open-nib is loaded only once, don't load it at launch time but dynamic and do it in VLCMain, so VLCOpen does not know about it anymore * MainMenu.nib: we don't need instances of VLCOpen and VLCOutput anymore --- .../English.lproj/MainMenu.nib/classes.nib | 24 ++-------- .../English.lproj/MainMenu.nib/objects.nib | Bin 33414 -> 33568 bytes modules/gui/macosx/controls.h | 1 - modules/gui/macosx/controls.m | 2 +- modules/gui/macosx/intf.h | 1 + modules/gui/macosx/intf.m | 41 ++++++++++++++---- modules/gui/macosx/open.h | 2 - modules/gui/macosx/open.m | 5 --- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib index 3130ac2ce9..4bfb9ca845 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib @@ -36,12 +36,7 @@ }; CLASS = VLCControls; LANGUAGE = ObjC; - OUTLETS = { - "o_btn_fullscreen" = id; - "o_main" = id; - "o_open" = id; - "o_volumeslider" = id; - }; + OUTLETS = {"o_btn_fullscreen" = id; "o_main" = id; "o_volumeslider" = id; }; SUPERCLASS = NSObject; }, { @@ -232,7 +227,6 @@ "o_mu_videotrack" = id; "o_mu_visual" = id; "o_mu_window" = id; - "o_open" = id; "o_playlist" = id; "o_scrollfield" = id; "o_timefield" = id; @@ -242,20 +236,8 @@ }; SUPERCLASS = NSObject; }, - { - ACTIONS = {}; - CLASS = VLCOpen; - LANGUAGE = ObjC; - OUTLETS = {}; - SUPERCLASS = NSObject; - }, - { - ACTIONS = {}; - CLASS = VLCOutput; - LANGUAGE = ObjC; - OUTLETS = {}; - SUPERCLASS = NSObject; - }, + {CLASS = VLCOpen; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = VLCOutput; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, { ACTIONS = { deleteItem = id; diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib index e2c01204fcc98c7a49c7183b88a0c9fe2366fa3b..7c690c8c3264b952541d2ce268723409b165770d 100644 GIT binary patch literal 33568 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 TJ1-eYhMVxg$|!%vHJ|@K(G6wC literal 33414 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 diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h index aea4624d7c..26612c3831 100644 --- a/modules/gui/macosx/controls.h +++ b/modules/gui/macosx/controls.h @@ -28,7 +28,6 @@ *****************************************************************************/ @interface VLCControls : NSObject { - IBOutlet id o_open; IBOutlet id o_main; IBOutlet id o_btn_fullscreen; diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index c7f4eaed13..0b424965bc 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -54,7 +54,7 @@ { vlc_mutex_unlock( &p_playlist->object_lock ); vlc_object_release( p_playlist ); - [o_open openFileGeneric]; + [o_main intfOpenFileGeneric: (id)sender]; } else { diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index e6f86383a0..6bf31894f7 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -84,6 +84,7 @@ struct intf_sys_t id o_prefs; /* VLCPrefs */ id o_about; /* VLAboutBox */ id o_open; /* VLCOpen */ + BOOL nib_open_loaded; /* reference to the open-nib */ IBOutlet id o_window; /* main window */ IBOutlet id o_scrollfield; /* info field */ diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 3483558c9f..6d76c752af 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -294,6 +294,7 @@ static VLCMain *_o_sharedMainInstance = nil; o_about = [[VLAboutBox alloc] init]; o_prefs = [[VLCPrefs alloc] init]; + o_open = [[VLCOpen alloc] init]; return _o_sharedMainInstance; } @@ -376,10 +377,6 @@ static VLCMain *_o_sharedMainInstance = nil; [self setSubmenusEnabled: FALSE]; [self manageVolumeSlider]; - - /* let's load the open and sout-option dialogues and init the related classes */ - o_open = [[VLCOpen alloc] init]; - [o_open getReady]; p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); @@ -1290,22 +1287,50 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)intfOpenFile:(id)sender { - [o_open openFile]; + if (!nib_open_loaded) + { + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + [o_open awakeFromNib]; + [o_open openFile]; + } else { + [o_open openFile]; + } } - (IBAction)intfOpenFileGeneric:(id)sender { - [o_open openFileGeneric]; + if (!nib_open_loaded) + { + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + [o_open awakeFromNib]; + [o_open openFileGeneric]; + } else { + [o_open openFileGeneric]; + } } - (IBAction)intfOpenDisc:(id)sender { - [o_open openDisc]; + if (!nib_open_loaded) + { + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + [o_open awakeFromNib]; + [o_open openDisc]; + } else { + [o_open openDisc]; + } } - (IBAction)intfOpenNet:(id)sender { - [o_open openNet]; + if (!nib_open_loaded) + { + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + [o_open awakeFromNib]; + [o_open openNet]; + } else { + [o_open openNet]; + } } - (IBAction)viewAbout:(id)sender diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h index 59034d991f..703fdca984 100644 --- a/modules/gui/macosx/open.h +++ b/modules/gui/macosx/open.h @@ -132,6 +132,4 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); - (IBAction)panelOk:(id)sender; - (void)openFile; - -- (void)getReady; @end diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 4bbbbd53e6..38dd2bc938 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -147,11 +147,6 @@ static VLCOpen *_o_sharedMainInstance = nil; return _o_sharedMainInstance; } -- (void)getReady -{ - [NSBundle loadNibNamed:@"Open" owner:self]; -} - - (void)awakeFromNib { intf_thread_t * p_intf = VLCIntf; -- 2.39.5