[vlc-commits] macosx: load core dialog nib on demand
David Fuhrmann
git at videolan.org
Wed Apr 2 15:01:52 CEST 2014
vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Apr 2 14:53:03 2014 +0200| [9eb1e87cf2a602f6cf641d225369c496af81d2f0] | committer: David Fuhrmann
macosx: load core dialog nib on demand
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9eb1e87cf2a602f6cf641d225369c496af81d2f0
---
modules/gui/macosx/intf.m | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 53e4867..2e82246 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -493,7 +493,7 @@ static int DialogCallback(vlc_object_t *p_this, const char *type, vlc_value_t pr
}
NSValue *o_value = [NSValue valueWithPointer:value.p_address];
- [[VLCCoreDialogProvider sharedInstance] performEventWithObject: o_value ofType: type];
+ [[[VLCMain sharedInstance] coreDialogProvider] performEventWithObject: o_value ofType: type];
[o_pool release];
return VLC_SUCCESS;
@@ -682,8 +682,7 @@ static VLCMain *_o_sharedMainInstance = nil;
var_SetBool(p_playlist, "fullscreen", YES);
}
- /* load our Core and Shared Dialogs nibs */
- nib_coredialogs_loaded = [NSBundle loadNibNamed:@"CoreDialogs" owner: NSApp];
+ /* load our Shared Dialogs nib */
[NSBundle loadNibNamed:@"SharedDialogs" owner: NSApp];
/* subscribe to various interactive dialogues */
@@ -1659,10 +1658,11 @@ static VLCMain *_o_sharedMainInstance = nil;
- (id)coreDialogProvider
{
- if (o_coredialogs)
- return o_coredialogs;
+ if (!nib_coredialogs_loaded) {
+ nib_coredialogs_loaded = [NSBundle loadNibNamed:@"CoreDialogs" owner: NSApp];
+ }
- return nil;
+ return o_coredialogs;
}
- (id)eyeTVController
More information about the vlc-commits
mailing list