annotate libvo/vo_macosx.m @ 15573:5db3dd72c876

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