RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 16:33:02 +00:00
Code Issues Releases Wiki Activity

cocoa: macosx_application needs cocoa-application

Browse Source
This commit is contained in:
FRAU KOUJIRO 2014-04-15 19:52:24 -07:00 committed by Stefano Pigozzi
parent 022a43de8e
commit b8a431c892
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
video/out/cocoa/window.m
View File

@ -19,7 +19,6 @@
#include "input/keycodes.h" #include "input/keycodes.h"
#include "osdep/macosx_application.h"
#include "osdep/macosx_events.h" #include "osdep/macosx_events.h"
#include "osdep/macosx_compat.h" #include "osdep/macosx_compat.h"

9
video/out/cocoa_common.m
View File

@ -28,12 +28,15 @@
#import "video/out/cocoa/mpvadapter.h" #import "video/out/cocoa/mpvadapter.h"
#include "osdep/macosx_compat.h" #include "osdep/macosx_compat.h"
#include "osdep/macosx_application.h"
#include "osdep/macosx_application_objc.h"
#include "osdep/macosx_events_objc.h" #include "osdep/macosx_events_objc.h"
#include "config.h" #include "config.h"
#if HAVE_COCOA_APPLICATION
# include "osdep/macosx_application.h"
# include "osdep/macosx_application_objc.h"
#endif
#include "options/options.h" #include "options/options.h"
#include "video/out/vo.h" #include "video/out/vo.h"
#include "win_state.h" #include "win_state.h"
@ -298,11 +301,13 @@ static void create_window(struct vo *vo, struct mp_rect *win, int geo_flags)
[s->view setWantsBestResolutionOpenGLSurface:YES]; [s->view setWantsBestResolutionOpenGLSurface:YES];
#if HAVE_COCOA_APPLICATION
cocoa_register_menu_item_action(MPM_H_SIZE, @selector(halfSize)); cocoa_register_menu_item_action(MPM_H_SIZE, @selector(halfSize));
cocoa_register_menu_item_action(MPM_N_SIZE, @selector(normalSize)); cocoa_register_menu_item_action(MPM_N_SIZE, @selector(normalSize));
cocoa_register_menu_item_action(MPM_D_SIZE, @selector(doubleSize)); cocoa_register_menu_item_action(MPM_D_SIZE, @selector(doubleSize));
cocoa_register_menu_item_action(MPM_MINIMIZE, @selector(performMiniaturize:)); cocoa_register_menu_item_action(MPM_MINIMIZE, @selector(performMiniaturize:));
cocoa_register_menu_item_action(MPM_ZOOM, @selector(performZoom:)); cocoa_register_menu_item_action(MPM_ZOOM, @selector(performZoom:));
#endif
[s->window setRestorable:NO]; [s->window setRestorable:NO];
[s->window setContentView:s->view]; [s->window setContentView:s->view];

2
wscript_build.py
View File

@ -382,7 +382,7 @@ def build(ctx):
( "osdep/threads.c" ), ( "osdep/threads.c" ),
( "osdep/ar/HIDRemote.m", "cocoa" ), ( "osdep/ar/HIDRemote.m", "cocoa" ),
( "osdep/macosx_application.m", "cocoa" ), ( "osdep/macosx_application.m", "cocoa-application" ),
( "osdep/macosx_events.m", "cocoa" ), ( "osdep/macosx_events.m", "cocoa" ),
( "osdep/path-macosx.m", "cocoa" ), ( "osdep/path-macosx.m", "cocoa" ),