Commit 3b4a5339 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx/misc: simplify header

parent e0f1ce39
...@@ -2121,7 +2121,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2121,7 +2121,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
CGDisplayFade( token, 0.5, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES ); CGDisplayFade( token, 0.5, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
} }
if ([screen isMainScreen]) if ([screen mainScreen])
[NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)]; [NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
[[o_video_view superview] replaceSubview:o_video_view with:o_temp_view]; [[o_video_view superview] replaceSubview:o_video_view with:o_temp_view];
...@@ -2176,7 +2176,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2176,7 +2176,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_fullscreen_anim2 release]; [o_fullscreen_anim2 release];
} }
if ([screen isMainScreen]) if ([screen mainScreen])
[NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)]; [NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
dict1 = [[NSMutableDictionary alloc] initWithCapacity:2]; dict1 = [[NSMutableDictionary alloc] initWithCapacity:2];
......
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
*****************************************************************************/ *****************************************************************************/
@interface NSAnimation (VLCAdditions) @interface NSAnimation (VLCAdditions)
- (void)setUserInfo: (void *)userInfo; @property (readwrite) void * userInfo;
- (void *)userInfo;
@end @end
/***************************************************************************** /*****************************************************************************
...@@ -58,8 +58,9 @@ ...@@ -58,8 +58,9 @@
@interface NSScreen (VLCAdditions) @interface NSScreen (VLCAdditions)
@property (readonly) BOOL mainScreen;
+ (NSScreen *)screenWithDisplayID: (CGDirectDisplayID)displayID; + (NSScreen *)screenWithDisplayID: (CGDirectDisplayID)displayID;
- (BOOL)isMainScreen;
- (BOOL)isScreen: (NSScreen*)screen; - (BOOL)isScreen: (NSScreen*)screen;
- (CGDirectDisplayID)displayID; - (CGDirectDisplayID)displayID;
- (void)blackoutOtherScreens; - (void)blackoutOtherScreens;
...@@ -80,10 +81,8 @@ ...@@ -80,10 +81,8 @@
BOOL b_isset_canBecomeMainWindow; BOOL b_isset_canBecomeMainWindow;
NSViewAnimation *animation; NSViewAnimation *animation;
} }
@property (readwrite) BOOL canBecomeKeyWindow;
- (void)setCanBecomeKeyWindow: (BOOL)canBecomeKey; @property (readwrite) BOOL canBecomeMainWindow;
- (void)setCanBecomeMainWindow: (BOOL)canBecomeMain;
/* animate mode is only supported in >=10.4 */ /* animate mode is only supported in >=10.4 */
- (void)orderFront: (id)sender animate: (BOOL)animate; - (void)orderFront: (id)sender animate: (BOOL)animate;
...@@ -105,9 +104,6 @@ ...@@ -105,9 +104,6 @@
*****************************************************************************/ *****************************************************************************/
@interface VLBrushedMetalImageView : NSImageView @interface VLBrushedMetalImageView : NSImageView
{
}
@end @end
...@@ -117,8 +113,6 @@ ...@@ -117,8 +113,6 @@
*****************************************************************************/ *****************************************************************************/
@interface MPSlider : NSSlider @interface MPSlider : NSSlider
{
}
@end @end
...@@ -132,7 +126,7 @@ ...@@ -132,7 +126,7 @@
NSRect img_rect; NSRect img_rect;
BOOL b_dark; BOOL b_dark;
} }
- (CGFloat)knobPosition; @property (readonly) CGFloat knobPosition;
- (void)drawRect:(NSRect)rect; - (void)drawRect:(NSRect)rect;
- (void)drawKnobInRect:(NSRect)knobRect; - (void)drawKnobInRect:(NSRect)knobRect;
...@@ -166,16 +160,13 @@ ...@@ -166,16 +160,13 @@
NSDictionary * o_string_attributes_dict; NSDictionary * o_string_attributes_dict;
NSTextAlignment textAlignment; NSTextAlignment textAlignment;
} }
@property (readonly) BOOL timeRemaining;
- (BOOL)timeRemaining;
@end @end
/***************************************************************************** /*****************************************************************************
* VLCMainWindowSplitView interface * VLCMainWindowSplitView interface
*****************************************************************************/ *****************************************************************************/
@interface VLCMainWindowSplitView : NSSplitView @interface VLCMainWindowSplitView : NSSplitView
{
}
@end @end
...@@ -196,8 +187,5 @@ ...@@ -196,8 +187,5 @@
* VLCThreePartDropView interface * VLCThreePartDropView interface
*****************************************************************************/ *****************************************************************************/
@interface VLCThreePartDropView : VLCThreePartImageView @interface VLCThreePartDropView : VLCThreePartImageView
{
}
@end @end
...@@ -184,7 +184,7 @@ static NSMutableArray *blackoutWindows = NULL; ...@@ -184,7 +184,7 @@ static NSMutableArray *blackoutWindows = NULL;
return nil; return nil;
} }
- (BOOL)isMainScreen - (BOOL)mainScreen
{ {
return ([self displayID] == [[[NSScreen screens] objectAtIndex:0] displayID]); return ([self displayID] == [[[NSScreen screens] objectAtIndex:0] displayID]);
} }
...@@ -233,7 +233,7 @@ static NSMutableArray *blackoutWindows = NULL; ...@@ -233,7 +233,7 @@ static NSMutableArray *blackoutWindows = NULL;
[blackoutWindows addObject: blackoutWindow]; [blackoutWindows addObject: blackoutWindow];
[blackoutWindow release]; [blackoutWindow release];
if( [screen isMainScreen] ) if( [screen mainScreen] )
[NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)]; [NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment