Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
faae87f6
Commit
faae87f6
authored
Jul 12, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Don't name 'Real' the functions that applies to those executed on MainThread.
parent
4168ec37
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
modules/gui/macosx/vout.h
modules/gui/macosx/vout.h
+2
-2
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+4
-4
No files found.
modules/gui/macosx/vout.h
View file @
faae87f6
...
...
@@ -127,10 +127,10 @@
-
(
id
)
initWithVout
:
(
vout_thread_t
*
)
p_vout
view
:
(
VLCVoutView
*
)
view
frame
:
(
NSRect
*
)
s_frame
;
-
(
id
)
init
Real
:
(
id
)
sender
;
-
(
id
)
init
MainThread
:
(
id
)
sender
;
-
(
void
)
close
;
-
(
void
)
closeWindow
;
-
(
id
)
close
Real
:
(
id
)
sender
;
-
(
id
)
close
MainThread
:
(
id
)
sender
;
-
(
id
)
getVoutView
;
-
(
BOOL
)
windowShouldClose
:(
id
)
sender
;
...
...
modules/gui/macosx/vout.m
View file @
faae87f6
...
...
@@ -1009,7 +1009,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
o_view
=
view
;
s_frame
=
frame
;
[
self
performSelectorOnMainThread
:
@selector
(
init
Real
:)
[
self
performSelectorOnMainThread
:
@selector
(
init
MainThread
:)
withObject:
NULL
waitUntilDone
:
YES
];
if
(
!
b_init_ok
)
...
...
@@ -1020,7 +1020,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
return
self
;
}
-
(
id
)
init
Real
:
(
id
)
sender
-
(
id
)
init
MainThread
:
(
id
)
sender
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
NSArray
*
o_screens
=
[
NSScreen
screens
];
...
...
@@ -1149,11 +1149,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
{
/* XXX waitUntilDone = NO to avoid a possible deadlock when hitting
Command-Q */
[
self
performSelectorOnMainThread
:
@selector
(
close
Real
:)
[
self
performSelectorOnMainThread
:
@selector
(
close
MainThread
:)
withObject:
NULL
waitUntilDone
:
NO
];
}
-
(
id
)
close
Real
:(
id
)
sender
-
(
id
)
close
MainThread
:(
id
)
sender
{
if
(
b_black
==
true
)
{
...
...
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