Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
9eb1e87c
Commit
9eb1e87c
authored
Apr 02, 2014
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: load core dialog nib on demand
parent
7d67bb4b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+6
-6
No files found.
modules/gui/macosx/intf.m
View file @
9eb1e87c
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment