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
9dd2f6ed
Commit
9dd2f6ed
authored
Aug 22, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed crash when setting up the video output
AppKit could be accessed by a non-main-thread
parent
52576ea5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
modules/gui/macosx/MainWindow.h
modules/gui/macosx/MainWindow.h
+1
-1
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+1
-2
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+2
-1
No files found.
modules/gui/macosx/MainWindow.h
View file @
9dd2f6ed
...
...
@@ -184,7 +184,7 @@
-
(
void
)
drawFancyGradientEffectForTimeSlider
;
-
(
id
)
videoView
;
-
(
id
)
setupVideoView
;
-
(
vo
id
)
setupVideoView
;
-
(
void
)
setVideoplayEnabled
;
-
(
void
)
resizeWindow
;
-
(
void
)
setNativeVideoSize
:(
NSSize
)
size
;
...
...
modules/gui/macosx/MainWindow.m
View file @
9dd2f6ed
...
...
@@ -1762,7 +1762,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
return
o_video_view
;
}
-
(
id
)
setupVideoView
-
(
vo
id
)
setupVideoView
{
// TODO: make lion fullscreen compatible with macosx-background and !embedded-video
if
(
var_InheritBool
(
VLCIntf
,
"macosx-background"
)
&&
!
b_nativeFullscreenMode
)
...
...
@@ -1851,7 +1851,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
}
[[
o_video_view
window
]
setAlphaValue
:
config_GetFloat
(
VLCIntf
,
"macosx-opaqueness"
)];
return
o_video_view
;
}
-
(
void
)
setVideoplayEnabled
...
...
modules/gui/macosx/intf.m
View file @
9dd2f6ed
...
...
@@ -1783,7 +1783,8 @@ unsigned int CocoaKeyToVLC( unichar i_key )
-
(
id
)
getVideoViewAtPositionX
:
(
int
*
)
pi_x
Y
:
(
int
*
)
pi_y
withWidth
:
(
unsigned
int
*
)
pi_width
andHeight
:
(
unsigned
int
*
)
pi_height
{
id
videoView
=
[
o_mainwindow
setupVideoView
];
[
o_mainwindow
performSelectorOnMainThread
:
@selector
(
setupVideoView
)
withObject
:
nil
waitUntilDone
:
YES
];
id
videoView
=
[
o_mainwindow
videoView
];
NSRect
videoRect
=
[
videoView
frame
];
int
i_x
=
(
int
)
videoRect
.
origin
.
x
;
int
i_y
=
(
int
)
videoRect
.
origin
.
y
;
...
...
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