diff options
Diffstat (limited to 'libvo/vo_macosx.m')
-rw-r--r-- | libvo/vo_macosx.m | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index b70ccbc4e8..50f1553c60 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -30,6 +30,7 @@ #include "input/mouse.h" #include "osdep/keycodes.h" +#include "mp_fifo.h" //Cocoa NSDistantObject *mplayerosxProxy; @@ -66,8 +67,6 @@ static uint32_t image_format; static int isFullscreen; static int isOntop; static int isRootwin; -extern float monitor_aspect; -extern float movie_aspect; static float old_movie_aspect; extern int enable_mouse_movements; @@ -86,9 +85,6 @@ static vo_info_t info = LIBVO_EXTERN(macosx) -extern void mplayer_put_key(int code); -extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); - static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) { switch (image_format) @@ -363,7 +359,7 @@ static int preinit(const char *arg) return 0; } -static int control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data) { switch (request) { @@ -1016,7 +1012,7 @@ static int control(uint32_t request, void *data, ...) snprintf(cmdstr, sizeof(cmdstr), "set_mouse_pos %i %i", (int)(vo_fs ? p.x : (p.x - textureFrame.origin.x)), (int)(vo_fs ? [self frame].size.height - p.y: (NSMaxY(textureFrame) - p.y))); - mp_input_queue_cmd(mp_input_parse_cmd(cmdstr)); + mp_input_queue_cmd(global_vo->input_ctx, mp_input_parse_cmd(cmdstr)); } } } |