summaryrefslogtreecommitdiffstats
path: root/video/out/cocoa/window.h
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2017-02-12 01:01:56 +0100
committerMartin Herkt <lachs0r@srsfckn.biz>2017-02-12 01:01:56 +0100
commit35aa705c3ece8293652ffcf449c71fe80b96e722 (patch)
tree7c0fb34ec96204cbcd867a973b2476689919a5b4 /video/out/cocoa/window.h
parent10a005df0c981050afc35184a42173bea7ea2527 (diff)
parent3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff)
downloadmpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2
mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz
Merge branch 'master' into release/current
Diffstat (limited to 'video/out/cocoa/window.h')
-rw-r--r--video/out/cocoa/window.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/video/out/cocoa/window.h b/video/out/cocoa/window.h
index 485831a932..af04b2b1c6 100644
--- a/video/out/cocoa/window.h
+++ b/video/out/cocoa/window.h
@@ -18,11 +18,12 @@
#import <Cocoa/Cocoa.h>
#import "video/out/cocoa/mpvadapter.h"
-@protocol MpvSizing
+@protocol MpvWindowUpdate
- (void)queueNewVideoSize:(NSSize)newSize;
+- (void)updateBorder:(int)border;
@end
-@interface MpvVideoWindow : NSWindow <NSWindowDelegate, MpvSizing>
+@interface MpvVideoWindow : NSWindow <NSWindowDelegate, MpvWindowUpdate>
@property(nonatomic, retain) MpvCocoaAdapter *adapter;
- (BOOL)canBecomeKeyWindow;
- (BOOL)canBecomeMainWindow;