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
13d3b7ec
Commit
13d3b7ec
authored
May 11, 2005
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* vout.m: small codefixes that were not 100% problems.
parent
c3064219
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+3
-5
No files found.
modules/gui/macosx/vout.m
View file @
13d3b7ec
...
@@ -67,7 +67,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -67,7 +67,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
-
(
id
)
initWithVout
:(
vout_thread_t
*
)
_p_vout
frame
:(
NSRect
*
)
s_frame
-
(
id
)
initWithVout
:(
vout_thread_t
*
)
_p_vout
frame
:(
NSRect
*
)
s_frame
{
{
NSAutoreleasePool
*
o_pool
;
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
]
;
NSArray
*
o_screens
=
[
NSScreen
screens
];
NSArray
*
o_screens
=
[
NSScreen
screens
];
NSScreen
*
o_screen
;
NSScreen
*
o_screen
;
vlc_bool_t
b_menubar_screen
=
VLC_FALSE
;
vlc_bool_t
b_menubar_screen
=
VLC_FALSE
;
...
@@ -199,8 +199,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -199,8 +199,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
b_menubar_screen
=
(
i_device
==
0
);
b_menubar_screen
=
(
i_device
==
0
);
}
}
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
if
(
p_vout
->
b_fullscreen
)
if
(
p_vout
->
b_fullscreen
)
{
{
NSRect
screen_rect
=
[
o_screen
frame
];
NSRect
screen_rect
=
[
o_screen
frame
];
...
@@ -268,11 +266,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -268,11 +266,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
-
(
void
)
close
-
(
void
)
close
{
{
[
super
close
];
if
(
p_fullscreen_state
)
if
(
p_fullscreen_state
)
{
{
EndFullScreen
(
p_fullscreen_state
,
0
);
EndFullScreen
(
p_fullscreen_state
,
0
);
}
}
[
super
close
];
}
}
-
(
void
)
setOnTop
:(
BOOL
)
b_on_top
-
(
void
)
setOnTop
:(
BOOL
)
b_on_top
...
@@ -690,7 +688,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -690,7 +688,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if
(
b_inside
)
if
(
b_inside
)
{
{
vlc_value_t
val
;
vlc_value_t
val
;
int
i_width
,
i_height
,
i_x
,
i_y
;
unsigned
int
i_width
,
i_height
,
i_x
,
i_y
;
vout_PlacePicture
(
p_vout
,
(
unsigned
int
)
s_rect
.
size
.
width
,
vout_PlacePicture
(
p_vout
,
(
unsigned
int
)
s_rect
.
size
.
width
,
(
unsigned
int
)
s_rect
.
size
.
height
,
(
unsigned
int
)
s_rect
.
size
.
height
,
...
...
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