annotate libvo/vo_macosx.m @ 15719:e040252b8370

Fix OSD handling, DVD subtitles work now. Will be a bit slower though.
author reimar
date Mon, 13 Jun 2005 20:09:05 +0000
parents e695fcd731e0
children 25ee208c6da9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
2 vo_macosx.m
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
3 by Nicolas Plourde <nicolasplourde@gmail.com>
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
4
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
5 MPlayer Mac OSX video out module.
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
6 Copyright (c) Nicolas Plourde - 2005
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
7 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
8
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
9 #import "vo_macosx.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
10
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
11 //MPLAYER
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
12 #include "config.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
13 #include "fastmemcpy.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
14 #include "video_out.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
15 #include "video_out_internal.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
16 #include "aspect.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
17 #include "mp_msg.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
18 #include "m_option.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
19
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
20 #include "input/input.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
21 #include "input/mouse.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
22
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
23 #include "osdep/keycodes.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
24
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
25 //Cocoa
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
26 MPlayerOpenGLView *mpGLView;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
27 NSAutoreleasePool *autoreleasepool;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
28 OSType pixelFormat;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
29
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
30 //Device
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
31 static int device_width;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
32 static int device_height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
33 static int device_id;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
34 static GDHandle device_handle;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
35
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
36 //image
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
37 unsigned char *image_data;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
38 static uint32_t image_width;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
39 static uint32_t image_height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
40 static uint32_t image_depth;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
41 static uint32_t image_bytes;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
42 static uint32_t image_format;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
43 static NSRect image_rec;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
44
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
45 //vo
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
46 extern int vo_rootwin;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
47 extern int vo_ontop;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
48 extern int vo_fs;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
49 static int isFullscreen;
15320
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
50 static int isOntop;
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
51 static int isRootwin;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
52 extern float monitor_aspect;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
53 extern int vo_keepaspect;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
54 extern float movie_aspect;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
55 static float old_movie_aspect;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
56 extern float vo_panscan;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
57
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
58 static int int_pause = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
59
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
60 static vo_info_t info =
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
61 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
62 "Mac OSX Core Video",
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
63 "macosx",
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
64 "Nicolas Plourde <nicolas.plourde@gmail.com>",
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
65 ""
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
66 };
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
67
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
68 LIBVO_EXTERN(macosx)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
69
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
70 extern void mplayer_put_key(int code);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
71 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));
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
72
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
73 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
74 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
75 switch (image_format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
76 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
77 case IMGFMT_RGB32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
78 vo_draw_alpha_rgb32(w,h,src,srca,stride,image_data+4*(y0*image_width+x0),4*image_width);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
79 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
80 case IMGFMT_YUY2:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
81 vo_draw_alpha_yuy2(w,h,src,srca,stride,image_data + (x0 + y0 * image_width) * 2,image_width*2);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
82 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
83 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
84 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
85
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
86 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
87 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
88 int i;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
89
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
90 //Get Main device info///////////////////////////////////////////////////
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
91 device_handle = GetMainDevice();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
92
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
93 for(i=0; i<device_id; i++)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
94 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
95 device_handle = GetNextDevice(device_handle);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
96
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
97 if(device_handle == NULL)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
98 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
99 mp_msg(MSGT_VO, MSGL_FATAL, "Get device error: Device ID %d do not exist, falling back to main device.\n", device_id);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
100 device_handle = GetMainDevice();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
101 device_id = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
102 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
103 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
104 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
105
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
106 NSRect device_rect = [[NSScreen mainScreen] frame];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
107 device_width = device_rect.size.width;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
108 device_height = device_rect.size.height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
109 monitor_aspect = (float)device_width/(float)device_height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
110
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
111 //misc mplayer setup
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
112 image_width = width;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
113 image_height = height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
114 switch (image_format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
115 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
116 case IMGFMT_BGR32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
117 case IMGFMT_RGB32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
118 image_depth = 32;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
119 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
120 case IMGFMT_YUY2:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
121 image_depth = 16;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
122 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
123 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
124 image_bytes = (image_depth + 7) / 8;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
125 image_data = (unsigned char*)malloc(image_width*image_height*image_bytes);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
126
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
127 //set aspect
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
128 panscan_init();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
129 aspect_save_orig(width,height);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
130 aspect_save_prescale(d_width,d_height);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
131 aspect_save_screenres(device_width,device_height);
15571
ab43da229a76 fix signess warning
nplourde
parents: 15570
diff changeset
132 aspect((int *)&d_width,(int *)&d_height,A_NOZOOM);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
133
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
134 movie_aspect = (float)d_width/(float)d_height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
135 old_movie_aspect = movie_aspect;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
136
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
137 //init OpenGL View
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
138 mpGLView = [[MPlayerOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, d_width, d_height) pixelFormat:[MPlayerOpenGLView defaultPixelFormat]];
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
139 [mpGLView initView];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
140
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
141 vo_fs = flags & VOFLAG_FULLSCREEN;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
142
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
143 if(vo_rootwin)
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
144 [mpGLView rootwin];
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
145
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
146 if(vo_fs)
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
147 [mpGLView fullscreen: NO];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
148
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
149 if(vo_ontop)
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
150 [mpGLView ontop];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
151
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
152 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
153 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
154
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
155 static void check_events(void)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
156 {
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
157 [mpGLView check_events];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
158 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
159
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
160 static void draw_osd(void)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
161 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
162 vo_draw_text(image_width, image_height, draw_alpha);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
163 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
164
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
165 static void flip_page(void)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
166 {
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
167 [mpGLView render];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
168 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
169
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
170 static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
171 {
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
172 [mpGLView setCurrentTexture];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
173 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
174 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
175
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
176
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
177 static uint32_t draw_frame(uint8_t *src[])
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
178 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
179 switch (image_format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
180 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
181 case IMGFMT_BGR32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
182 case IMGFMT_RGB32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
183 memcpy(image_data, src[0], image_width*image_height*image_bytes);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
184 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
185
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
186 case IMGFMT_YUY2:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
187 memcpy_pic(image_data, src[0], image_width * 2, image_height, image_width * 2, image_width * 2);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
188 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
189 }
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
190 [mpGLView setCurrentTexture];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
191 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
192 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
193
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
194 static uint32_t query_format(uint32_t format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
195 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
196 image_format = format;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
197
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
198 switch(format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
199 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
200 case IMGFMT_YUY2:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
201 pixelFormat = kYUVSPixelFormat;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
202 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
203
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
204 case IMGFMT_RGB32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
205 case IMGFMT_BGR32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
206 pixelFormat = k32ARGBPixelFormat;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
207 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
208 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
209 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
210 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
211
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
212 static void uninit(void)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
213 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
214 [autoreleasepool release];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
215 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
216
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
217 static uint32_t preinit(const char *arg)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
218 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
219 int parse_err = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
220
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
221 if(arg)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
222 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
223 char *parse_pos = (char *)&arg[0];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
224 while (parse_pos[0] && !parse_err)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
225 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
226 if (strncmp (parse_pos, "device_id=", 10) == 0)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
227 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
228 parse_pos = &parse_pos[10];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
229 device_id = strtol(parse_pos, &parse_pos, 0);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
230 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
231 if (parse_pos[0] == ':') parse_pos = &parse_pos[1];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
232 else if (parse_pos[0]) parse_err = 1;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
233 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
234 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
235
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
236 #if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
237 //this chunk of code is heavily based off SDL_macosx.m from SDL
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
238 //it uses an Apple private function to request foreground operation
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
239 void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
240 ProcessSerialNumber myProc, frProc;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
241 Boolean sameProc;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
242
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
243 if (GetFrontProcess(&frProc) == noErr)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
244 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
245 if (GetCurrentProcess(&myProc) == noErr)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
246 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
247 if (SameProcess(&frProc, &myProc, &sameProc) == noErr && !sameProc)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
248 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
249 CPSEnableForegroundOperation(&myProc);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
250 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
251 SetFrontProcess(&myProc);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
252 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
253 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
254 #endif
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
255
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
256 NSApplicationLoad();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
257 autoreleasepool = [[NSAutoreleasePool alloc] init];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
258
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
259 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
260 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
261
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
262 static uint32_t control(uint32_t request, void *data, ...)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
263 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
264 switch (request)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
265 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
266 case VOCTRL_PAUSE: return (int_pause=1);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
267 case VOCTRL_RESUME: return (int_pause=0);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
268 case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data));
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
269 case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); [mpGLView ontop]; return VO_TRUE;
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
270 case VOCTRL_ROOTWIN: vo_rootwin = (!(vo_rootwin)); [mpGLView rootwin]; return VO_TRUE;
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
271 case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); [mpGLView fullscreen: YES]; return VO_TRUE;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
272 case VOCTRL_GET_PANSCAN: return VO_TRUE;
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
273 case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
274 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
275 return VO_NOTIMPL;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
276 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
277
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
278 //////////////////////////////////////////////////////////////////////////
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
279 // NSOpenGLView Subclass
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
280 //////////////////////////////////////////////////////////////////////////
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
281 @implementation MPlayerOpenGLView
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
282 - (void) initView
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
283 {
15610
9a4d9b7c8dd6 Sync swap with VBL.
nplourde
parents: 15573
diff changeset
284 long swapInterval = 1;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
285 NSRect frame = [self frame];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
286 CVReturn error = kCVReturnSuccess;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
287
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
288 //init menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
289 [self initMenu];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
290
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
291 //create OpenGL Context
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
292 glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
293
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
294
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
295 //create window
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
296 window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, frame.size.width, frame.size.height)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
297 styleMask:NSTitledWindowMask|NSTexturedBackgroundWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask
15647
0968fd3d5675 Pure cosmetic
nplourde
parents: 15612
diff changeset
298 backing:NSBackingStoreBuffered defer:NO];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
299
15325
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
300 [window setDelegate:self];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
301 [window setContentView:self];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
302 [window setInitialFirstResponder:self];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
303 [window setAcceptsMouseMovedEvents:YES];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
304 [window setTitle:@"MPlayer - The Movie Player"];
15657
e695fcd731e0 show window only after texture creation (look better).
nplourde
parents: 15647
diff changeset
305 [window center];
15647
0968fd3d5675 Pure cosmetic
nplourde
parents: 15612
diff changeset
306
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
307 [self setOpenGLContext:glContext];
15647
0968fd3d5675 Pure cosmetic
nplourde
parents: 15612
diff changeset
308 [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
309 [glContext setView:self];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
310 [glContext makeCurrentContext];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
311
15647
0968fd3d5675 Pure cosmetic
nplourde
parents: 15612
diff changeset
312 error = CVPixelBufferCreateWithBytes( NULL, image_width, image_height, pixelFormat, image_data, image_width*image_bytes, NULL, NULL, NULL, &currentFrameBuffer);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
313 if(error != kCVReturnSuccess)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
314 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create Pixel Buffer(%d)\n", error);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
315
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
316 error = CVOpenGLTextureCacheCreate(NULL, 0, [glContext CGLContextObj], [[self pixelFormat] CGLPixelFormatObj], 0, &textureCache);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
317 if(error != kCVReturnSuccess)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
318 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture Cache(%d)\n", error);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
319
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
320 error = CVOpenGLTextureCacheCreateTextureFromImage( NULL, textureCache, currentFrameBuffer, 0, &texture);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
321 if(error != kCVReturnSuccess)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
322 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
323
15657
e695fcd731e0 show window only after texture creation (look better).
nplourde
parents: 15647
diff changeset
324 //show window
e695fcd731e0 show window only after texture creation (look better).
nplourde
parents: 15647
diff changeset
325 [window makeKeyAndOrderFront:self];
e695fcd731e0 show window only after texture creation (look better).
nplourde
parents: 15647
diff changeset
326
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
327 isFullscreen = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
328 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
329
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
330 /*
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
331 Init Menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
332 */
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
333 - (void)initMenu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
334 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
335 NSMenu *menu;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
336 NSMenuItem *menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
337
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
338 [NSApp setMainMenu:[[NSMenu alloc] init]];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
339
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
340 //Create Movie Menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
341 menu = [[NSMenu alloc] initWithTitle:@"Movie"];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
342 menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
343 kHalfScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
344 menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
345 kNormalScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
346 menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
347 kDoubleScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
348 menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
349 kFullScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
350 menuItem = [NSMenuItem separatorItem]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
351
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
352 NSMenu *aspectMenu;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
353 aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
354 menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
355 if(vo_keepaspect) [menuItem setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
356 kKeepAspectCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
357 menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
358 if(vo_panscan) [menuItem setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
359 kPanScanCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
360 menuItem = [NSMenuItem separatorItem]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
361 menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
362 kAspectOrgCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
363 menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
364 kAspectFullCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
365 menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
366 kAspectWideCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
367 menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
368 [menuItem setSubmenu:aspectMenu];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
369 [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
370 [aspectMenu release];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
371
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
372 //Add to menubar
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
373 menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
374 [menuItem setSubmenu:menu];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
375 [[NSApp mainMenu] addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
376
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
377 //Create Window Menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
378 menu = [[NSMenu alloc] initWithTitle:@"Window"];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
379
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
380 menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
381 menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
382
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
383 //Add to menubar
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
384 menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
385 [menuItem setSubmenu:menu];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
386 [[NSApp mainMenu] addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
387 [NSApp setWindowsMenu:menu];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
388
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
389 [menu release];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
390 [menuItem release];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
391 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
392
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
393 /*
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
394 Menu Action
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
395 */
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
396 - (void)menuAction:(id)sender
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
397 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
398 uint32_t d_width;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
399 uint32_t d_height;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
400 NSRect frame;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
401
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
402 aspect((int *)&d_width, (int *)&d_height,A_NOZOOM);
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
403 //if(sender == kQuitCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
404
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
405 if(sender == kHalfScreenCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
406 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
407 if(isFullscreen) {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
408 vo_fs = (!(vo_fs)); [self fullscreen:YES];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
409 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
410
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
411 frame.size.width = (d_width/2);
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
412 frame.size.height = ((d_width/movie_aspect)/2);
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
413 [window setContentSize: frame.size];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
414 [self reshape];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
415 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
416 if(sender == kNormalScreenCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
417 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
418 if(isFullscreen) {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
419 vo_fs = (!(vo_fs)); [self fullscreen:YES];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
420 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
421
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
422 frame.size.width = d_width;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
423 frame.size.height = d_width/movie_aspect;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
424 [window setContentSize: frame.size];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
425 [self reshape];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
426 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
427 if(sender == kDoubleScreenCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
428 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
429 if(isFullscreen) {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
430 vo_fs = (!(vo_fs)); [self fullscreen:YES];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
431 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
432
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
433 frame.size.width = d_width*2;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
434 frame.size.height = (d_width/movie_aspect)*2;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
435 [window setContentSize: frame.size];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
436 [self reshape];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
437 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
438 if(sender == kFullScreenCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
439 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
440 vo_fs = (!(vo_fs));
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
441 [self fullscreen:YES];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
442 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
443
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
444 if(sender == kKeepAspectCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
445 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
446 vo_keepaspect = (!(vo_keepaspect));
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
447 if(vo_keepaspect)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
448 [kKeepAspectCmd setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
449 else
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
450 [kKeepAspectCmd setState:NSOffState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
451 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
452
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
453 if(sender == kPanScanCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
454 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
455 vo_panscan = (!(vo_panscan));
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
456 if(vo_panscan)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
457 [kPanScanCmd setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
458 else
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
459 [kPanScanCmd setState:NSOffState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
460 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
461
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
462 if(sender == kAspectOrgCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
463 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
464 movie_aspect = old_movie_aspect;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
465 frame.size.width = d_width;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
466 frame.size.height = d_width/movie_aspect;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
467 [window setContentSize: frame.size];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
468 [self reshape];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
469 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
470
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
471 if(sender == kAspectFullCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
472 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
473 movie_aspect = 4.0f/3.0f;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
474 frame.size.width = d_width;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
475 frame.size.height = d_width/movie_aspect;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
476 [window setContentSize: frame.size];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
477 [self reshape];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
478 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
479
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
480 if(sender == kAspectWideCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
481 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
482 movie_aspect = 16.0f/9.0f;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
483 frame.size.width = d_width;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
484 frame.size.height = d_width/movie_aspect;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
485 [window setContentSize: frame.size];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
486 [self reshape];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
487 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
488 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
489
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
490 /*
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
491 Setup OpenGL
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
492 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
493 - (void)prepareOpenGL
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
494 {
15339
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
495 glEnable(GL_BLEND);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
496 glDisable(GL_DEPTH_TEST);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
497 glDepthMask(GL_FALSE);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
498 glDisable(GL_CULL_FACE);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
499 [self reshape];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
500 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
501
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
502 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
503 reshape OpenGL viewport
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
504 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
505 - (void)reshape
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
506 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
507 uint32_t d_width;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
508 uint32_t d_height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
509 float aspectX;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
510 float aspectY;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
511 int padding = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
512
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
513 NSRect frame = [self frame];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
514
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
515 glViewport(0, 0, frame.size.width, frame.size.height);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
516 glMatrixMode(GL_PROJECTION);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
517 glLoadIdentity();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
518 glOrtho(0, frame.size.width, frame.size.height, 0, -1.0, 1.0);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
519 glMatrixMode(GL_MODELVIEW);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
520 glLoadIdentity();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
521
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
522 //set image_rec
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
523 if(vo_keepaspect)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
524 {
15571
ab43da229a76 fix signess warning
nplourde
parents: 15570
diff changeset
525 aspect( (int *)&d_width, (int *)&d_height, A_NOZOOM);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
526 d_height = ((float)d_width/movie_aspect);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
527
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
528 aspectX = (float)((float)frame.size.width/(float)d_width);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
529 aspectY = (float)((float)(frame.size.height)/(float)d_height);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
530
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
531 if((d_height*aspectX)>(frame.size.height))
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
532 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
533 padding = (frame.size.width - d_width*aspectY)/2;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
534 image_rec.origin.x = padding;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
535 image_rec.origin.y = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
536 image_rec.size.width = d_width*aspectY+padding;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
537 image_rec.size.height = d_height*aspectY;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
538 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
539 else
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
540 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
541 padding = ((frame.size.height) - d_height*aspectX)/2;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
542 image_rec.origin.x = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
543 image_rec.origin.y = padding;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
544 image_rec.size.width = d_width*aspectX;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
545 image_rec.size.height = d_height*aspectX+padding;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
546 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
547 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
548 else
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
549 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
550 image_rec = frame;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
551 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
552 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
553
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
554 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
555 Render frame
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
556 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
557 - (void) render
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
558 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
559 glClear(GL_COLOR_BUFFER_BIT);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
560
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
561 glEnable(CVOpenGLTextureGetTarget(texture));
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
562 glBindTexture(CVOpenGLTextureGetTarget(texture), CVOpenGLTextureGetName(texture));
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
563
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
564 glColor3f(1,1,1);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
565 glBegin(GL_QUADS);
15331
7746903599b2 enable panscan
nplourde
parents: 15327
diff changeset
566 glTexCoord2f(upperLeft[0], upperLeft[1]); glVertex2i( image_rec.origin.x-(vo_panscan_x >> 1), image_rec.origin.y-(vo_panscan_y >> 1));
7746903599b2 enable panscan
nplourde
parents: 15327
diff changeset
567 glTexCoord2f(lowerLeft[0], lowerLeft[1]); glVertex2i( image_rec.origin.x-(vo_panscan_x >> 1), image_rec.size.height+(vo_panscan_y >> 1));
7746903599b2 enable panscan
nplourde
parents: 15327
diff changeset
568 glTexCoord2f(lowerRight[0], lowerRight[1]); glVertex2i( image_rec.size.width+(vo_panscan_x >> 1), image_rec.size.height+(vo_panscan_y >> 1));
7746903599b2 enable panscan
nplourde
parents: 15327
diff changeset
569 glTexCoord2f(upperRight[0], upperRight[1]); glVertex2i( image_rec.size.width+(vo_panscan_x >> 1), image_rec.origin.y-(vo_panscan_y >> 1));
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
570 glEnd();
15339
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
571 glDisable(CVOpenGLTextureGetTarget(texture));
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
572
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
573 //render resize box
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
574 if(!isFullscreen)
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
575 {
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
576 NSRect frame = [self frame];
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
577
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
578 glBegin(GL_LINES);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
579 glColor4f(0.2, 0.2, 0.2, 0.5);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
580 glVertex2i(frame.size.width-1, frame.size.height-1); glVertex2i(frame.size.width-1, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
581 glVertex2i(frame.size.width-1, frame.size.height-5); glVertex2i(frame.size.width-5, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
582 glVertex2i(frame.size.width-1, frame.size.height-9); glVertex2i(frame.size.width-9, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
583
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
584 glColor4f(0.4, 0.4, 0.4, 0.5);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
585 glVertex2i(frame.size.width-1, frame.size.height-2); glVertex2i(frame.size.width-2, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
586 glVertex2i(frame.size.width-1, frame.size.height-6); glVertex2i(frame.size.width-6, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
587 glVertex2i(frame.size.width-1, frame.size.height-10); glVertex2i(frame.size.width-10, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
588
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
589 glColor4f(0.6, 0.6, 0.6, 0.5);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
590 glVertex2i(frame.size.width-1, frame.size.height-3); glVertex2i(frame.size.width-3, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
591 glVertex2i(frame.size.width-1, frame.size.height-7); glVertex2i(frame.size.width-7, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
592 glVertex2i(frame.size.width-1, frame.size.height-11); glVertex2i(frame.size.width-11, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
593 glEnd();
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
594 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
595
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
596 glFlush();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
597
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
598 //auto hide mouse cursor and futur on-screen control?
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
599 if(isFullscreen && !mouseHide && !isRootwin)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
600 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
601 DateTimeRec d;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
602 unsigned long curTime;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
603 static unsigned long lastTime = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
604
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
605 GetTime(&d);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
606 DateToSeconds( &d, &curTime);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
607
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
608 if( ((curTime - lastTime) >= 5) || (lastTime == 0) )
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
609 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
610 HideMenuBar();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
611 HideCursor();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
612 mouseHide = YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
613 lastTime = curTime;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
614 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
615 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
616 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
617
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
618 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
619 Create OpenGL texture from current frame & set texco
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
620 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
621 - (void) setCurrentTexture
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
622 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
623 CVReturn error = kCVReturnSuccess;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
624
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
625 error = CVOpenGLTextureCacheCreateTextureFromImage (NULL, textureCache, currentFrameBuffer, 0, &texture);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
626 if(error != kCVReturnSuccess)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
627 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
628
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
629 CVOpenGLTextureGetCleanTexCoords(texture, lowerLeft, lowerRight, upperRight, upperLeft);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
630 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
631
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
632 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
633 redraw win rect
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
634 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
635 - (void) drawRect: (NSRect *) bounds
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
636 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
637 [self render];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
638 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
639
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
640 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
641 Toggle Fullscreen
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
642 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
643 - (void) fullscreen: (BOOL) animate
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
644 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
645 static NSRect old_frame;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
646 static NSRect old_view_frame;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
647 NSRect device_rect = [[window screen] frame];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
648
15573
5db3dd72c876 Fix pan-scan in fullscreen mode
nplourde
parents: 15571
diff changeset
649 panscan_calc();
5db3dd72c876 Fix pan-scan in fullscreen mode
nplourde
parents: 15571
diff changeset
650
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
651 //go fullscreen
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
652 if(vo_fs)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
653 {
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
654 if(!isRootwin)
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
655 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
656 //hide menubar and mouse if fullscreen on main display
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
657 HideMenuBar();
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
658 HideCursor();
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
659 mouseHide = YES;
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
660 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
661
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
662 old_frame = [window frame]; //save main window size & position
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
663 [window setFrame:device_rect display:YES animate:animate]; //zoom-in window with nice useless sfx
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
664 old_view_frame = [self bounds];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
665
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
666 //fix origin for multi screen setup
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
667 device_rect.origin.x = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
668 device_rect.origin.y = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
669 [self setFrame:device_rect];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
670 [self setNeedsDisplay:YES];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
671 [window setHasShadow:NO];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
672 isFullscreen = 1;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
673 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
674 else
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
675 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
676 isFullscreen = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
677 ShowMenuBar();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
678 ShowCursor();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
679 mouseHide = NO;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
680
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
681 //revert window to previous setting
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
682 [self setFrame:old_view_frame];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
683 [self setNeedsDisplay:YES];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
684 [window setHasShadow:NO];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
685 [window setFrame:old_frame display:YES animate:animate];//zoom-out window with nice useless sfx
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
686 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
687 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
688
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
689 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
690 Toggle ontop
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
691 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
692 - (void) ontop
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
693 {
15320
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
694 if(vo_ontop)
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
695 {
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
696 [window setLevel:NSScreenSaverWindowLevel];
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
697 isOntop = YES;
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
698 }
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
699 else
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
700 {
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
701 [window setLevel:NSNormalWindowLevel];
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
702 isOntop = NO;
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
703 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
704 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
705
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
706 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
707 Toggle panscan
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
708 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
709 - (void) panscan
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
710 {
15331
7746903599b2 enable panscan
nplourde
parents: 15327
diff changeset
711 panscan_calc();
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
712 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
713
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
714 /*
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
715 Toggle rootwin
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
716 */
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
717 - (void) rootwin
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
718 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
719 if(vo_rootwin)
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
720 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
721 [window setLevel:CGWindowLevelForKey(kCGDesktopWindowLevelKey)];
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
722 [window orderBack:self];
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
723 isRootwin = YES;
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
724 }
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
725 else
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
726 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
727 [window setLevel:NSNormalWindowLevel];
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
728 isRootwin = NO;
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
729 }
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
730 }
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
731
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
732 /*
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
733 Check event for new event
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
734 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
735 - (void) check_events
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
736 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
737 event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.0001] inMode:NSEventTrackingRunLoopMode dequeue:YES];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
738 [NSApp sendEvent:event];
15612
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
739
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
740 //update activity every 60 seconds to prevent
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
741 //screensaver from starting up.
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
742 DateTimeRec d;
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
743 unsigned long curTime;
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
744 static unsigned long lastTime = 0;
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
745
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
746 GetTime(&d);
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
747 DateToSeconds( &d, &curTime);
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
748
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
749 if( ( (curTime - lastTime) >= 60) || (lastTime == 0))
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
750 {
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
751 UpdateSystemActivity(UsrActivity);
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
752 lastTime = curTime;
06e30282b170 Moved event update inside cocoa openglview class
nplourde
parents: 15611
diff changeset
753 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
754 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
755
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
756 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
757 Process key event
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
758 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
759 - (void) keyDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
760 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
761 unsigned int key;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
762
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
763 switch([theEvent keyCode])
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
764 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
765 case 0x34:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
766 case 0x24: key = KEY_ENTER; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
767 case 0x35: key = KEY_ESC; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
768 case 0x33: key = KEY_BACKSPACE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
769 case 0x3A: key = KEY_BACKSPACE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
770 case 0x3B: key = KEY_BACKSPACE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
771 case 0x38: key = KEY_BACKSPACE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
772 case 0x7A: key = KEY_F+1; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
773 case 0x78: key = KEY_F+2; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
774 case 0x63: key = KEY_F+3; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
775 case 0x76: key = KEY_F+4; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
776 case 0x60: key = KEY_F+5; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
777 case 0x61: key = KEY_F+6; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
778 case 0x62: key = KEY_F+7; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
779 case 0x64: key = KEY_F+8; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
780 case 0x65: key = KEY_F+9; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
781 case 0x6D: key = KEY_F+10; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
782 case 0x67: key = KEY_F+11; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
783 case 0x6F: key = KEY_F+12; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
784 case 0x72: key = KEY_INSERT; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
785 case 0x75: key = KEY_DELETE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
786 case 0x73: key = KEY_HOME; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
787 case 0x77: key = KEY_END; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
788 case 0x45: key = '+'; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
789 case 0x4E: key = '-'; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
790 case 0x30: key = KEY_TAB; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
791 case 0x74: key = KEY_PAGE_UP; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
792 case 0x79: key = KEY_PAGE_DOWN; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
793 case 0x7B: key = KEY_LEFT; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
794 case 0x7C: key = KEY_RIGHT; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
795 case 0x7D: key = KEY_DOWN; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
796 case 0x7E: key = KEY_UP; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
797 case 0x43: key = '*'; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
798 case 0x4B: key = '/'; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
799 case 0x4C: key = KEY_BACKSPACE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
800 case 0x41: key = KEY_KPDEC; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
801 case 0x52: key = KEY_KP0; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
802 case 0x53: key = KEY_KP1; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
803 case 0x54: key = KEY_KP2; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
804 case 0x55: key = KEY_KP3; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
805 case 0x56: key = KEY_KP4; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
806 case 0x57: key = KEY_KP5; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
807 case 0x58: key = KEY_KP6; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
808 case 0x59: key = KEY_KP7; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
809 case 0x5B: key = KEY_KP8; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
810 case 0x5C: key = KEY_KP9; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
811 default: key = *[[theEvent characters] UTF8String]; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
812 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
813 mplayer_put_key(key);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
814 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
815
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
816 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
817 Process mouse button event
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
818 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
819 - (void) mouseMoved: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
820 {
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
821 if(isFullscreen && !isRootwin)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
822 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
823 ShowMenuBar();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
824 ShowCursor();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
825 mouseHide = NO;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
826 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
827 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
828
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
829 - (void) mouseDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
830 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
831 [self mouseEvent: theEvent];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
832 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
833
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
834 - (void) rightMouseDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
835 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
836 [self mouseEvent: theEvent];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
837 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
838
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
839 - (void) otherMouseDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
840 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
841 [self mouseEvent: theEvent];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
842 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
843
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
844 - (void) scrollWheel: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
845 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
846 if([theEvent deltaY] > 0)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
847 mplayer_put_key(MOUSE_BTN3);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
848 else
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
849 mplayer_put_key(MOUSE_BTN4);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
850 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
851
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
852 - (void) mouseEvent: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
853 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
854 switch( [theEvent buttonNumber] )
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
855 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
856 case 0: mplayer_put_key(MOUSE_BTN0);break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
857 case 1: mplayer_put_key(MOUSE_BTN1);break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
858 case 2: mplayer_put_key(MOUSE_BTN2);break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
859 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
860 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
861
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
862 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
863 NSResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
864 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
865 - (BOOL) acceptsFirstResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
866 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
867 return YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
868 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
869
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
870 - (BOOL) becomeFirstResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
871 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
872 return YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
873 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
874
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
875 - (BOOL) resignFirstResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
876 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
877 return YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
878 }
15325
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
879
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
880 - (void)windowWillClose:(NSNotification *)aNotification
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
881 {
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
882 mplayer_put_key(KEY_ESC);
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
883 }
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
884 @end