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
18dee68f
Commit
18dee68f
authored
Jul 23, 2012
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: remove outdated and unused isFullscreen methods
parent
9288133f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1 addition
and
27 deletions
+1
-27
modules/gui/macosx/MainWindow.h
modules/gui/macosx/MainWindow.h
+0
-1
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+0
-6
modules/gui/macosx/VideoView.m
modules/gui/macosx/VideoView.m
+1
-1
modules/gui/macosx/misc.h
modules/gui/macosx/misc.h
+0
-4
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+0
-11
modules/video_output/macosx.m
modules/video_output/macosx.m
+0
-4
No files found.
modules/gui/macosx/MainWindow.h
View file @
18dee68f
...
...
@@ -217,7 +217,6 @@
NSRect
previousSavedFrame
;
}
-
(
BOOL
)
isFullscreen
;
-
(
void
)
customZoom
:(
id
)
sender
;
@end
modules/gui/macosx/MainWindow.m
View file @
18dee68f
...
...
@@ -2031,7 +2031,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
rect
.
origin
.
x
+=
[
o_videoWindow
frame
].
origin
.
x
;
rect
.
origin
.
y
+=
[
o_videoWindow
frame
].
origin
.
y
;
o_fullscreen_window
=
[[
VLCWindow
alloc
]
initWithContentRect
:
rect
styleMask
:
NSBorderlessWindowMask
backing
:
NSBackingStoreBuffered
defer
:
YES
];
[
o_fullscreen_window
setFullscreen
:
YES
];
[
o_fullscreen_window
setBackgroundColor
:
[
NSColor
blackColor
]];
[
o_fullscreen_window
setCanBecomeKeyWindow
:
YES
];
[
o_fullscreen_window
setCanBecomeMainWindow
:
YES
];
...
...
@@ -2902,11 +2901,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
}
-
(
BOOL
)
isFullscreen
{
return
[[
VLCMainWindow
sharedInstance
]
isFullscreen
];
}
-
(
void
)
performClose
:(
id
)
sender
{
if
(
b_dark_interface
||
!
b_video_deco
)
...
...
modules/gui/macosx/VideoView.m
View file @
18dee68f
...
...
@@ -151,7 +151,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if
(
key
==
(
unichar
)
0x1b
)
{
playlist_t
*
p_playlist
=
pl_Get
(
VLCIntf
);
if
(
var_GetBool
(
p_playlist
,
"fullscreen"
)
)
if
(
var_GetBool
(
p_playlist
,
"fullscreen"
)
)
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
}
/* handle Lion's default key combo for fullscreen-toggle in addition to our own hotkeys */
...
...
modules/gui/macosx/misc.h
View file @
18dee68f
...
...
@@ -78,7 +78,6 @@
BOOL
b_isset_canBecomeKeyWindow
;
BOOL
b_canBecomeMainWindow
;
BOOL
b_isset_canBecomeMainWindow
;
BOOL
b_isFullscreen
;
NSViewAnimation
*
animation
;
}
...
...
@@ -98,9 +97,6 @@
/* animate mode is only supported in >=10.4 */
-
(
void
)
closeAndAnimate
:
(
BOOL
)
animate
;
-
(
void
)
setFullscreen
:(
BOOL
)
b_var
;
-
(
BOOL
)
isFullscreen
;
@end
...
...
modules/gui/macosx/misc.m
View file @
18dee68f
...
...
@@ -274,7 +274,6 @@ static NSMutableArray *blackoutWindows = NULL;
self
=
[
super
initWithContentRect
:
contentRect
styleMask
:
styleMask
backing
:
backingType
defer
:
flag
];
if
(
self
)
{
b_isFullscreen
=
NO
;
b_isset_canBecomeKeyWindow
=
NO
;
/* we don't want this window to be restored on relaunch */
if
(
OSX_LION
)
...
...
@@ -463,16 +462,6 @@ static NSMutableArray *blackoutWindows = NULL;
}
}
-
(
void
)
setFullscreen
:(
BOOL
)
b_var
{
b_isFullscreen
=
b_var
;
}
-
(
BOOL
)
isFullscreen
{
return
b_isFullscreen
;
}
-
(
IBAction
)
fullscreen
:(
id
)
sender
{
[[
VLCCoreInteraction
sharedInstance
]
toggleFullscreen
];
...
...
modules/video_output/macosx.m
View file @
18dee68f
...
...
@@ -49,10 +49,6 @@
#include <vlc_dialog.h>
#include "opengl.h"
@interface
NSWindow
(
VLCCustomCode
)
-
(
BOOL
)
isFullscreen
;
@end
/* compilation support for 10.5 and 10.6 */
#define OSX_LION NSAppKitVersionNumber >= 1115.2
#ifndef MAC_OS_X_VERSION_10_7
...
...
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