summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa/window.h6
-rw-r--r--video/out/cocoa_common.m5
2 files changed, 6 insertions, 5 deletions
diff --git a/video/out/cocoa/window.h b/video/out/cocoa/window.h
index 352eba61d6..af04b2b1c6 100644
--- a/video/out/cocoa/window.h
+++ b/video/out/cocoa/window.h
@@ -18,14 +18,14 @@
#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;
- (void)mulSize:(float)multiplier;
-- (void)updateBorder:(int)border;
@end
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index d00d5d78c7..bf702c4cd4 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -146,7 +146,7 @@ static void queue_new_video_size(struct vo *vo, int w, int h)
{
struct vo_cocoa_state *s = vo->cocoa;
struct mp_vo_opts *opts = vo->opts;
- id<MpvSizing> win = (id<MpvSizing>) s->window;
+ id<MpvWindowUpdate> win = (id<MpvWindowUpdate>) s->window;
NSRect r = calculate_window_geometry(vo, NSMakeRect(0, 0, w, h));
[win queueNewVideoSize:NSMakeSize(r.size.width, r.size.height)];
}
@@ -592,7 +592,8 @@ static int vo_cocoa_window_border(struct vo *vo)
return VO_NOTIMPL;
struct mp_vo_opts *opts = vo->opts;
- [s->window updateBorder:opts->border];
+ id<MpvWindowUpdate> win = (id<MpvWindowUpdate>) s->window;
+ [win updateBorder:opts->border];
if (opts->border)
cocoa_set_window_title(vo);