summaryrefslogtreecommitdiffstats
path: root/libvo/cocoa_common.h
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2012-09-13 09:32:59 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2012-10-16 07:19:32 +0200
commitb94619724327e555a348e2cdcd4c6d2ccde8f8b1 (patch)
treed66de095c8b3f494e9d86ce3ca80258949aa925c /libvo/cocoa_common.h
parent511d5478f91f06ad3bc1354db68b114771c89812 (diff)
downloadmpv-b94619724327e555a348e2cdcd4c6d2ccde8f8b1.tar.bz2
mpv-b94619724327e555a348e2cdcd4c6d2ccde8f8b1.tar.xz
cocoa_common: save state in the vo struct
Save the cocoa state in an instance variable for the Objective-C part of the code and use a field in the vo struct for the raw C part of the code.
Diffstat (limited to 'libvo/cocoa_common.h')
-rw-r--r--libvo/cocoa_common.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/libvo/cocoa_common.h b/libvo/cocoa_common.h
index 943a5fb8ba..a158a501fd 100644
--- a/libvo/cocoa_common.h
+++ b/libvo/cocoa_common.h
@@ -22,6 +22,8 @@
#include "video_out.h"
+struct vo_cocoa_state;
+
bool vo_cocoa_gui_running(void);
void *vo_cocoa_glgetaddr(const char *s);
@@ -35,7 +37,7 @@ int vo_cocoa_create_window(struct vo *vo, uint32_t d_width,
uint32_t d_height, uint32_t flags,
int gl3profile);
-void vo_cocoa_swap_buffers(void);
+void vo_cocoa_swap_buffers(struct vo *vo);
int vo_cocoa_check_events(struct vo *vo);
void vo_cocoa_fullscreen(struct vo *vo);
void vo_cocoa_ontop(struct vo *vo);
@@ -43,9 +45,9 @@ void vo_cocoa_ontop(struct vo *vo);
// returns an int to conform to the gl extensions from other platforms
int vo_cocoa_swap_interval(int enabled);
-void *vo_cocoa_cgl_context(void);
-void *vo_cocoa_cgl_pixel_format(void);
+void *vo_cocoa_cgl_context(struct vo *vo);
+void *vo_cocoa_cgl_pixel_format(struct vo *vo);
-int vo_cocoa_cgl_color_size(void);
+int vo_cocoa_cgl_color_size(struct vo *vo);
#endif /* MPLAYER_COCOA_COMMON_H */