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
6b7c0c9f
Commit
6b7c0c9f
authored
Jul 11, 2012
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fix fullscreen set by vout only (e.g. over http interface)
close #7117
parent
d9cfe67b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
modules/gui/macosx/intf.h
modules/gui/macosx/intf.h
+1
-0
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+11
-2
No files found.
modules/gui/macosx/intf.h
View file @
6b7c0c9f
...
...
@@ -180,6 +180,7 @@ struct intf_sys_t
-
(
unsigned
int
)
VLCModifiersToCocoa
:(
NSString
*
)
theString
;
-
(
void
)
updateCurrentlyUsedHotkeys
;
-
(
void
)
fullscreenChanged
;
-
(
void
)
checkFullscreenChange
:(
NSNumber
*
)
o_full
;
-
(
void
)
PlaylistItemChanged
;
-
(
void
)
playbackStatusUpdated
;
-
(
void
)
sendDistributedNotificationWithUpdatedPlaybackStatus
;
...
...
modules/gui/macosx/intf.m
View file @
6b7c0c9f
...
...
@@ -170,8 +170,8 @@ static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args )
else
if
(
i_query
==
VOUT_WINDOW_SET_FULLSCREEN
)
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
// we already have our playlist "fullscreen" callback, do not repeat the same call here
//[[VLCMain sharedInstance] performSelectorOnMainThread:@selector(fullscreenChanged) withObject: nil waitUntilDone:
NO];
int
i_full
=
va_arg
(
args
,
int
);
[[
VLCMain
sharedInstance
]
performSelectorOnMainThread
:
@selector
(
checkFullscreenChange
:)
withObject
:
[
NSNumber
numberWithInt
:
i_full
]
waitUntilDone
:
NO
];
[
o_pool
release
];
}
else
...
...
@@ -1474,6 +1474,15 @@ unsigned int CocoaKeyToVLC( unichar i_key )
}
}
-
(
void
)
checkFullscreenChange
:(
NSNumber
*
)
o_full
{
BOOL
b_full
=
[
o_full
boolValue
];
if
(
p_intf
&&
!
var_GetBool
(
pl_Get
(
p_intf
),
"fullscreen"
)
!=
!
b_full
)
{
var_SetBool
(
pl_Get
(
p_intf
),
"fullscreen"
,
b_full
);
}
}
-
(
void
)
PlaylistItemChanged
{
if
(
p_current_input
&&
(
p_current_input
->
b_dead
||
!
vlc_object_alive
(
p_current_input
)
))
...
...
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