Mercurial > mplayer.hg
annotate libvo/vo_corevideo.m @ 29271:82b6fbc72099
When used with shared_buffer, autorelease in each flip_page so objects don't accumulate until exit.
author | adrian |
---|---|
date | Mon, 18 May 2009 21:00:35 +0000 |
parents | 0f1b5b68af32 |
children | c95bad660986 |
rev | line source |
---|---|
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
1 /* |
29210 | 2 * CoreVideo video output driver |
28836 | 3 * Copyright (c) 2005 Nicolas Plourde <nicolasplourde@gmail.com> |
4 * | |
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
5 * This file is part of MPlayer. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
6 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
7 * MPlayer is free software; you can redistribute it and/or modify |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
8 * it under the terms of the GNU General Public License as published by |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
9 * the Free Software Foundation; either version 2 of the License, or |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
10 * (at your option) any later version. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
11 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
12 * MPlayer is distributed in the hope that it will be useful, |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
15 * GNU General Public License for more details. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
16 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
17 * You should have received a copy of the GNU General Public License along |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
18 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
20 */ |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
21 |
29210 | 22 #import "vo_corevideo.h" |
16385 | 23 #include <sys/types.h> |
24 #include <sys/ipc.h> | |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
25 #include <sys/mman.h> |
28077 | 26 #include <unistd.h> |
27988 | 27 #include <CoreServices/CoreServices.h> |
28 //special workaround for Apple bug #6267445 | |
29 //(OSServices Power API disabled in OSServices.h for 64bit systems) | |
30 #ifndef __POWER__ | |
31 #include <CoreServices/../Frameworks/OSServices.framework/Headers/Power.h> | |
32 #endif | |
15289 | 33 |
34 //MPLAYER | |
35 #include "config.h" | |
36 #include "fastmemcpy.h" | |
37 #include "video_out.h" | |
38 #include "video_out_internal.h" | |
39 #include "aspect.h" | |
40 #include "mp_msg.h" | |
41 #include "m_option.h" | |
28075
ca9badc94740
#include appropriate headers instead of locally declaring function prototypes.
diego
parents:
28051
diff
changeset
|
42 #include "mp_fifo.h" |
ca9badc94740
#include appropriate headers instead of locally declaring function prototypes.
diego
parents:
28051
diff
changeset
|
43 #include "libvo/sub.h" |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
44 #include "subopt-helper.h" |
15289 | 45 |
46 #include "input/input.h" | |
47 #include "input/mouse.h" | |
48 | |
49 #include "osdep/keycodes.h" | |
50 | |
51 //Cocoa | |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
52 NSDistantObject *mplayerosxProxy; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
53 id <MPlayerOSXVOProto> mplayerosxProto; |
15611 | 54 MPlayerOpenGLView *mpGLView; |
15289 | 55 NSAutoreleasePool *autoreleasepool; |
56 OSType pixelFormat; | |
57 | |
16385 | 58 //shared memory |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
59 int shm_fd; |
16385 | 60 BOOL shared_buffer = false; |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
61 #define DEFAULT_BUFFER_NAME "mplayerosx" |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
62 static char *buffer_name; |
16385 | 63 |
15728 | 64 //Screen |
28306 | 65 int screen_id = -1; |
15728 | 66 NSRect screen_frame; |
67 NSScreen *screen_handle; | |
68 NSArray *screen_array; | |
15289 | 69 |
70 //image | |
71 unsigned char *image_data; | |
25180 | 72 // For double buffering |
73 static uint8_t image_page = 0; | |
74 static unsigned char *image_datas[2]; | |
75 | |
15289 | 76 static uint32_t image_width; |
77 static uint32_t image_height; | |
78 static uint32_t image_depth; | |
79 static uint32_t image_bytes; | |
80 static uint32_t image_format; | |
81 | |
82 //vo | |
83 static int isFullscreen; | |
15320 | 84 static int isOntop; |
15327 | 85 static int isRootwin; |
15289 | 86 extern float monitor_aspect; |
87 extern float movie_aspect; | |
88 static float old_movie_aspect; | |
25446 | 89 extern int enable_mouse_movements; |
15289 | 90 |
15731 | 91 static float winAlpha = 1; |
15289 | 92 static int int_pause = 0; |
93 | |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
94 static BOOL isLeopardOrLater; |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
95 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
96 static vo_info_t info = |
15289 | 97 { |
28837 | 98 "Mac OS X Core Video", |
29210 | 99 "corevideo", |
15289 | 100 "Nicolas Plourde <nicolas.plourde@gmail.com>", |
101 "" | |
102 }; | |
103 | |
29210 | 104 LIBVO_EXTERN(corevideo) |
15289 | 105 |
106 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) | |
107 { | |
108 switch (image_format) | |
109 { | |
110 case IMGFMT_RGB32: | |
111 vo_draw_alpha_rgb32(w,h,src,srca,stride,image_data+4*(y0*image_width+x0),4*image_width); | |
112 break; | |
113 case IMGFMT_YUY2: | |
114 vo_draw_alpha_yuy2(w,h,src,srca,stride,image_data + (x0 + y0 * image_width) * 2,image_width*2); | |
115 break; | |
116 } | |
117 } | |
118 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
119 static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
15289 | 120 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
121 |
15728 | 122 //init screen |
123 screen_array = [NSScreen screens]; | |
29177
1dfd99eb3280
Fix a signedness issue that caused a warning to be wrongfully printed at runtime.
gpoirier
parents:
29170
diff
changeset
|
124 if(screen_id < (int)[screen_array count]) |
15289 | 125 { |
28306 | 126 screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; |
15289 | 127 } |
15728 | 128 else |
129 { | |
29210 | 130 mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] Device ID %d does not exist, falling back to main device\n", screen_id); |
15728 | 131 screen_handle = [screen_array objectAtIndex:0]; |
28306 | 132 screen_id = -1; |
15728 | 133 } |
134 screen_frame = [screen_handle frame]; | |
25414
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
135 vo_screenwidth = screen_frame.size.width; |
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
136 vo_screenheight = screen_frame.size.height; |
16385 | 137 |
15289 | 138 //misc mplayer setup |
139 image_width = width; | |
140 image_height = height; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
141 switch (image_format) |
15289 | 142 { |
143 case IMGFMT_BGR32: | |
144 case IMGFMT_RGB32: | |
145 image_depth = 32; | |
146 break; | |
16385 | 147 case IMGFMT_YUY2: |
15289 | 148 image_depth = 16; |
149 break; | |
150 } | |
151 image_bytes = (image_depth + 7) / 8; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
152 |
16385 | 153 if(!shared_buffer) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
154 { |
25120
9b4ca4dc1294
Fix a memory leak when working in shared_buffer mode.
ulion
parents:
25114
diff
changeset
|
155 image_data = malloc(image_width*image_height*image_bytes); |
25180 | 156 image_datas[0] = image_data; |
157 if (vo_doublebuffering) | |
158 image_datas[1] = malloc(image_width*image_height*image_bytes); | |
159 image_page = 0; | |
25120
9b4ca4dc1294
Fix a memory leak when working in shared_buffer mode.
ulion
parents:
25114
diff
changeset
|
160 |
16385 | 161 monitor_aspect = (float)screen_frame.size.width/(float)screen_frame.size.height; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
162 |
16385 | 163 //set aspect |
164 panscan_init(); | |
165 aspect_save_orig(width,height); | |
166 aspect_save_prescale(d_width,d_height); | |
167 aspect_save_screenres(screen_frame.size.width, screen_frame.size.height); | |
168 aspect((int *)&d_width,(int *)&d_height,A_NOZOOM); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
169 |
16385 | 170 movie_aspect = (float)d_width/(float)d_height; |
171 old_movie_aspect = movie_aspect; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
172 |
16385 | 173 vo_fs = flags & VOFLAG_FULLSCREEN; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
174 |
16385 | 175 //config OpenGL View |
176 [mpGLView config]; | |
177 [mpGLView reshape]; | |
178 } | |
179 else | |
180 { | |
29210 | 181 mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] writing output to a shared buffer " |
29170
9d40283d9a5d
Unify error message output and update error messages.
diego
parents:
29137
diff
changeset
|
182 "named \"%s\"\n",buffer_name); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
183 |
16385 | 184 movie_aspect = (float)d_width/(float)d_height; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
185 |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
186 // create shared memory |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
187 shm_fd = shm_open(buffer_name, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR); |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
188 if (shm_fd == -1) |
16385 | 189 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
190 mp_msg(MSGT_VO, MSGL_FATAL, |
29210 | 191 "[vo_corevideo] failed to open shared memory. Error: %s\n", strerror(errno)); |
16385 | 192 return 1; |
193 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
194 |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
195 |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
196 if (ftruncate(shm_fd, image_width*image_height*image_bytes) == -1) |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
197 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
198 mp_msg(MSGT_VO, MSGL_FATAL, |
29210 | 199 "[vo_corevideo] failed to size shared memory, possibly already in use. Error: %s\n", strerror(errno)); |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
200 shm_unlink(buffer_name); |
16385 | 201 return 1; |
202 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
203 |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
204 image_data = mmap(NULL, image_width*image_height*image_bytes, |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
205 PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
206 |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
207 if (image_data == MAP_FAILED) |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
208 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
209 mp_msg(MSGT_VO, MSGL_FATAL, |
29210 | 210 "[vo_corevideo] failed to map shared memory. Error: %s\n", strerror(errno)); |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
211 shm_unlink(buffer_name); |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
212 return 1; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
213 } |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
214 |
28837 | 215 //connect to mplayerosx |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
216 mplayerosxProxy=[NSConnection rootProxyForConnectionWithRegisteredName:[NSString stringWithCString:buffer_name] host:nil]; |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
217 if ([mplayerosxProxy conformsToProtocol:@protocol(MPlayerOSXVOProto)]) { |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
218 [mplayerosxProxy setProtocolForProxy:@protocol(MPlayerOSXVOProto)]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
219 mplayerosxProto = (id <MPlayerOSXVOProto>)mplayerosxProxy; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
220 [mplayerosxProto startWithWidth: image_width withHeight: image_height withBytes: image_bytes withAspect:(int)(movie_aspect*100)]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
221 } |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
222 else { |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
223 [mplayerosxProxy release]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
224 mplayerosxProxy = nil; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
225 mplayerosxProto = nil; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
226 } |
16385 | 227 } |
15289 | 228 return 0; |
229 } | |
230 | |
231 static void check_events(void) | |
232 { | |
15611 | 233 [mpGLView check_events]; |
15289 | 234 } |
235 | |
236 static void draw_osd(void) | |
237 { | |
238 vo_draw_text(image_width, image_height, draw_alpha); | |
239 } | |
240 | |
241 static void flip_page(void) | |
242 { | |
29271
82b6fbc72099
When used with shared_buffer, autorelease in each flip_page so objects don't accumulate until exit.
adrian
parents:
29263
diff
changeset
|
243 if(shared_buffer) { |
82b6fbc72099
When used with shared_buffer, autorelease in each flip_page so objects don't accumulate until exit.
adrian
parents:
29263
diff
changeset
|
244 NSAutoreleasePool *pool = [NSAutoreleasePool new]; |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
245 [mplayerosxProto render]; |
29271
82b6fbc72099
When used with shared_buffer, autorelease in each flip_page so objects don't accumulate until exit.
adrian
parents:
29263
diff
changeset
|
246 [pool release]; |
82b6fbc72099
When used with shared_buffer, autorelease in each flip_page so objects don't accumulate until exit.
adrian
parents:
29263
diff
changeset
|
247 } else { |
25114
bed4188998ca
Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents:
25078
diff
changeset
|
248 [mpGLView setCurrentTexture]; |
16385 | 249 [mpGLView render]; |
25180 | 250 if (vo_doublebuffering) { |
251 image_page = 1 - image_page; | |
252 image_data = image_datas[image_page]; | |
253 } | |
25114
bed4188998ca
Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents:
25078
diff
changeset
|
254 } |
15289 | 255 } |
256 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
257 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) |
15289 | 258 { |
259 return 0; | |
260 } | |
261 | |
262 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
263 static int draw_frame(uint8_t *src[]) |
15289 | 264 { |
265 switch (image_format) | |
266 { | |
267 case IMGFMT_BGR32: | |
268 case IMGFMT_RGB32: | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
23381
diff
changeset
|
269 fast_memcpy(image_data, src[0], image_width*image_height*image_bytes); |
15289 | 270 break; |
271 | |
272 case IMGFMT_YUY2: | |
273 memcpy_pic(image_data, src[0], image_width * 2, image_height, image_width * 2, image_width * 2); | |
274 break; | |
275 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
276 |
15289 | 277 return 0; |
278 } | |
279 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
280 static int query_format(uint32_t format) |
15289 | 281 { |
282 image_format = format; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
283 |
15289 | 284 switch(format) |
285 { | |
286 case IMGFMT_YUY2: | |
287 pixelFormat = kYUVSPixelFormat; | |
288 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
289 |
15289 | 290 case IMGFMT_RGB32: |
291 case IMGFMT_BGR32: | |
292 pixelFormat = k32ARGBPixelFormat; | |
293 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; | |
294 } | |
295 return 0; | |
296 } | |
297 | |
298 static void uninit(void) | |
299 { | |
16385 | 300 if(shared_buffer) |
301 { | |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
302 [mplayerosxProto stop]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
303 mplayerosxProto = nil; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
304 [mplayerosxProxy release]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
305 mplayerosxProxy = nil; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
306 |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
307 if (munmap(image_data, image_width*image_height*image_bytes) == -1) |
29210 | 308 mp_msg(MSGT_VO, MSGL_FATAL, "[vo_corevideo] uninit: munmap failed. Error: %s\n", strerror(errno)); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
309 |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
310 if (shm_unlink(buffer_name) == -1) |
29210 | 311 mp_msg(MSGT_VO, MSGL_FATAL, "[vo_corevideo] uninit: shm_unlink failed. Error: %s\n", strerror(errno)); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
312 |
16385 | 313 } |
314 | |
21551 | 315 SetSystemUIMode( kUIModeNormal, 0); |
316 CGDisplayShowCursor(kCGDirectMainDisplay); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
317 |
21551 | 318 if(mpGLView) |
319 { | |
25136 | 320 NSAutoreleasePool *finalPool; |
24742
0bef706332b5
Fix deallocate bug which sometimes causes a crash when reinitializing.
nplourde
parents:
24698
diff
changeset
|
321 mpGLView = nil; |
21551 | 322 [autoreleasepool release]; |
25136 | 323 finalPool = [[NSAutoreleasePool alloc] init]; |
25078
3efbdaab822f
Let NSApp handle events when uninit to fix the delay dealloc bug of mpGLView.
ulion
parents:
24965
diff
changeset
|
324 [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES]; |
3efbdaab822f
Let NSApp handle events when uninit to fix the delay dealloc bug of mpGLView.
ulion
parents:
24965
diff
changeset
|
325 [finalPool release]; |
21551 | 326 } |
25121 | 327 if (!shared_buffer) |
328 { | |
25180 | 329 free(image_datas[0]); |
330 if (vo_doublebuffering) | |
331 free(image_datas[1]); | |
332 image_datas[0] = NULL; | |
333 image_datas[1] = NULL; | |
25121 | 334 image_data = NULL; |
335 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
336 |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
337 if (buffer_name) free(buffer_name); |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
338 buffer_name = NULL; |
15289 | 339 } |
340 | |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
341 static opt_t subopts[] = { |
28306 | 342 {"device_id", OPT_ARG_INT, &screen_id, NULL}, |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
343 {"shared_buffer", OPT_ARG_BOOL, &shared_buffer, NULL}, |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
344 {"buffer_name", OPT_ARG_MSTRZ,&buffer_name, NULL}, |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
345 {NULL} |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
346 }; |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
347 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
348 static int preinit(const char *arg) |
15289 | 349 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
350 |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
351 // set defaults |
28306 | 352 screen_id = -1; |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
353 shared_buffer = false; |
28204 | 354 buffer_name = NULL; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
355 |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
356 if (subopt_parse(arg, subopts) != 0) { |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
357 mp_msg(MSGT_VO, MSGL_FATAL, |
29210 | 358 "\n-vo corevideo command line help:\n" |
359 "Example: mplayer -vo corevideo:device_id=1:shared_buffer:buffer_name=mybuff\n" | |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
360 "\nOptions:\n" |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
361 " device_id=<0-...>\n" |
28837 | 362 " Set screen device ID for fullscreen.\n" |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
363 " shared_buffer\n" |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
364 " Write output to a shared memory buffer instead of displaying it.\n" |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
365 " buffer_name=<name>\n" |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
366 " Name of the shared buffer created with shm_open() as well as\n" |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
367 " the name of the NSConnection MPlayer will try to open.\n" |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
368 " Setting buffer_name implicitly enables shared_buffer.\n" |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
369 "\n" ); |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
370 return -1; |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
371 } |
15728 | 372 |
15737
0c3939433cef
set nsapp and setup cocoa with NSApplicationLoad
nplourde
parents:
15736
diff
changeset
|
373 NSApplicationLoad(); |
15289 | 374 autoreleasepool = [[NSAutoreleasePool alloc] init]; |
15737
0c3939433cef
set nsapp and setup cocoa with NSApplicationLoad
nplourde
parents:
15736
diff
changeset
|
375 NSApp = [NSApplication sharedApplication]; |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
376 isLeopardOrLater = floor(NSAppKitVersionNumber) > 824; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
377 |
28204 | 378 if (!buffer_name) |
379 buffer_name = strdup(DEFAULT_BUFFER_NAME); | |
380 else | |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
381 shared_buffer = true; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
382 |
16385 | 383 if(!shared_buffer) |
16144 | 384 { |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27394
diff
changeset
|
385 #if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
386 //this chunk of code is heavily based off SDL_macosx.m from SDL |
17358
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
387 ProcessSerialNumber myProc, frProc; |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
388 Boolean sameProc; |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
389 |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
390 if (GetFrontProcess(&frProc) == noErr) |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
391 { |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
392 if (GetCurrentProcess(&myProc) == noErr) |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
393 { |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
394 if (SameProcess(&frProc, &myProc, &sameProc) == noErr && !sameProc) |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
395 { |
27988 | 396 TransformProcessType(&myProc, kProcessTransformToForegroundApplication); |
17358
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
397 } |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
398 SetFrontProcess(&myProc); |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
399 } |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
400 } |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
401 #endif |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
402 |
16385 | 403 if(!mpGLView) |
404 { | |
405 mpGLView = [[MPlayerOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:[MPlayerOpenGLView defaultPixelFormat]]; | |
406 [mpGLView autorelease]; | |
407 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
408 |
16385 | 409 [mpGLView display]; |
410 [mpGLView preinit]; | |
16144 | 411 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
412 |
15289 | 413 return 0; |
414 } | |
415 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
416 static int control(uint32_t request, void *data, ...) |
15289 | 417 { |
418 switch (request) | |
419 { | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
25468
diff
changeset
|
420 case VOCTRL_PAUSE: return int_pause = 1; |
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
25468
diff
changeset
|
421 case VOCTRL_RESUME: return int_pause = 0; |
15289 | 422 case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
423 case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE; |
15611 | 424 case VOCTRL_ROOTWIN: vo_rootwin = (!(vo_rootwin)); [mpGLView rootwin]; return VO_TRUE; |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
425 case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); if(!shared_buffer){ [mpGLView fullscreen: NO]; } else { [mplayerosxProto toggleFullscreen]; } return VO_TRUE; |
15289 | 426 case VOCTRL_GET_PANSCAN: return VO_TRUE; |
15611 | 427 case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE; |
15289 | 428 } |
429 return VO_NOTIMPL; | |
430 } | |
431 | |
432 ////////////////////////////////////////////////////////////////////////// | |
433 // NSOpenGLView Subclass | |
434 ////////////////////////////////////////////////////////////////////////// | |
15611 | 435 @implementation MPlayerOpenGLView |
24076 | 436 - (void) preinit |
15289 | 437 { |
15726 | 438 //init menu |
439 [self initMenu]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
440 |
15726 | 441 //create window |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
442 window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) |
15726 | 443 styleMask:NSTitledWindowMask|NSTexturedBackgroundWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask |
444 backing:NSBackingStoreBuffered defer:NO]; | |
445 | |
16144 | 446 [window autorelease]; |
15726 | 447 [window setDelegate:mpGLView]; |
448 [window setContentView:mpGLView]; | |
449 [window setInitialFirstResponder:mpGLView]; | |
450 [window setAcceptsMouseMovedEvents:YES]; | |
451 [window setTitle:@"MPlayer - The Movie Player"]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
452 |
15726 | 453 isFullscreen = 0; |
15855 | 454 winSizeMult = 1; |
15726 | 455 } |
456 | |
24076 | 457 - (void) config |
15726 | 458 { |
459 uint32_t d_width; | |
460 uint32_t d_height; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
461 |
25137 | 462 GLint swapInterval = 1; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
463 |
15726 | 464 NSRect frame; |
15289 | 465 CVReturn error = kCVReturnSuccess; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
466 |
15728 | 467 //config window |
15726 | 468 aspect((int *)&d_width, (int *)&d_height,A_NOZOOM); |
469 frame = NSMakeRect(0, 0, d_width, d_height); | |
470 [window setContentSize: frame.size]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
471 |
15289 | 472 //create OpenGL Context |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
473 glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil]; |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
474 |
15289 | 475 [self setOpenGLContext:glContext]; |
15647 | 476 [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval]; |
15289 | 477 [glContext setView:self]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
478 [glContext makeCurrentContext]; |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
479 |
25180 | 480 error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[0], image_width*image_bytes, NULL, NULL, NULL, &frameBuffers[0]); |
15289 | 481 if(error != kCVReturnSuccess) |
29210 | 482 mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create Pixel Buffer(%d)\n", error); |
25180 | 483 if (vo_doublebuffering) { |
484 error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[1], image_width*image_bytes, NULL, NULL, NULL, &frameBuffers[1]); | |
485 if(error != kCVReturnSuccess) | |
29210 | 486 mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create Pixel Double Buffer(%d)\n", error); |
25180 | 487 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
488 |
15289 | 489 error = CVOpenGLTextureCacheCreate(NULL, 0, [glContext CGLContextObj], [[self pixelFormat] CGLPixelFormatObj], 0, &textureCache); |
490 if(error != kCVReturnSuccess) | |
29210 | 491 mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL texture Cache(%d)\n", error); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
492 |
25180 | 493 error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture); |
15289 | 494 if(error != kCVReturnSuccess) |
29210 | 495 mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL texture(%d)\n", error); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
496 |
15728 | 497 //show window |
498 [window center]; | |
499 [window makeKeyAndOrderFront:mpGLView]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
500 |
15726 | 501 if(vo_rootwin) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
502 [mpGLView rootwin]; |
15726 | 503 |
504 if(vo_fs) | |
505 [mpGLView fullscreen: NO]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
506 |
15726 | 507 if(vo_ontop) |
508 [mpGLView ontop]; | |
15289 | 509 } |
510 | |
511 /* | |
15570 | 512 Init Menu |
513 */ | |
514 - (void)initMenu | |
515 { | |
21395 | 516 NSMenu *menu, *aspectMenu; |
15570 | 517 NSMenuItem *menuItem; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
518 |
15570 | 519 [NSApp setMainMenu:[[NSMenu alloc] init]]; |
520 | |
521 //Create Movie Menu | |
522 menu = [[NSMenu alloc] initWithTitle:@"Movie"]; | |
523 menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem]; | |
524 kHalfScreenCmd = menuItem; | |
525 menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem]; | |
526 kNormalScreenCmd = menuItem; | |
527 menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem]; | |
528 kDoubleScreenCmd = menuItem; | |
529 menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem]; | |
530 kFullScreenCmd = menuItem; | |
15909 | 531 menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [menu addItem:menuItem]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
532 |
15570 | 533 aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"]; |
534 menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
535 if(vo_keepaspect) [menuItem setState:NSOnState]; | |
536 kKeepAspectCmd = menuItem; | |
537 menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
538 if(vo_panscan) [menuItem setState:NSOnState]; | |
539 kPanScanCmd = menuItem; | |
15909 | 540 menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [aspectMenu addItem:menuItem]; |
15570 | 541 menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; |
542 kAspectOrgCmd = menuItem; | |
543 menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
544 kAspectFullCmd = menuItem; | |
545 menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
546 kAspectWideCmd = menuItem; | |
547 menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""]; | |
548 [menuItem setSubmenu:aspectMenu]; | |
549 [menu addItem:menuItem]; | |
550 [aspectMenu release]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
551 |
15570 | 552 //Add to menubar |
553 menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""]; | |
554 [menuItem setSubmenu:menu]; | |
555 [[NSApp mainMenu] addItem:menuItem]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
556 |
15570 | 557 //Create Window Menu |
558 menu = [[NSMenu alloc] initWithTitle:@"Window"]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
559 |
15570 | 560 menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem]; |
561 menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem]; | |
562 | |
563 //Add to menubar | |
564 menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""]; | |
565 [menuItem setSubmenu:menu]; | |
566 [[NSApp mainMenu] addItem:menuItem]; | |
567 [NSApp setWindowsMenu:menu]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
568 |
15570 | 569 [menu release]; |
570 [menuItem release]; | |
571 } | |
572 | |
573 /* | |
574 Menu Action | |
575 */ | |
576 - (void)menuAction:(id)sender | |
577 { | |
578 uint32_t d_width; | |
579 uint32_t d_height; | |
580 NSRect frame; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
581 |
15570 | 582 aspect((int *)&d_width, (int *)&d_height,A_NOZOOM); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
583 |
15731 | 584 if(sender == kQuitCmd) |
585 { | |
586 mplayer_put_key(KEY_ESC); | |
587 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
588 |
15570 | 589 if(sender == kHalfScreenCmd) |
590 { | |
591 if(isFullscreen) { | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
592 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
15570 | 593 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
594 |
15855 | 595 winSizeMult = 0.5; |
596 frame.size.width = (d_width*winSizeMult); | |
597 frame.size.height = ((d_width/movie_aspect)*winSizeMult); | |
15570 | 598 [window setContentSize: frame.size]; |
599 [self reshape]; | |
600 } | |
601 if(sender == kNormalScreenCmd) | |
602 { | |
603 if(isFullscreen) { | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
604 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
15570 | 605 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
606 |
15855 | 607 winSizeMult = 1; |
15570 | 608 frame.size.width = d_width; |
609 frame.size.height = d_width/movie_aspect; | |
610 [window setContentSize: frame.size]; | |
611 [self reshape]; | |
612 } | |
613 if(sender == kDoubleScreenCmd) | |
614 { | |
615 if(isFullscreen) { | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
616 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
15570 | 617 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
618 |
15855 | 619 winSizeMult = 2; |
620 frame.size.width = d_width*winSizeMult; | |
621 frame.size.height = (d_width/movie_aspect)*winSizeMult; | |
15570 | 622 [window setContentSize: frame.size]; |
623 [self reshape]; | |
624 } | |
625 if(sender == kFullScreenCmd) | |
626 { | |
627 vo_fs = (!(vo_fs)); | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
628 [self fullscreen:NO]; |
15570 | 629 } |
630 | |
631 if(sender == kKeepAspectCmd) | |
632 { | |
633 vo_keepaspect = (!(vo_keepaspect)); | |
634 if(vo_keepaspect) | |
635 [kKeepAspectCmd setState:NSOnState]; | |
636 else | |
637 [kKeepAspectCmd setState:NSOffState]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
638 |
15909 | 639 [self reshape]; |
15570 | 640 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
641 |
15570 | 642 if(sender == kPanScanCmd) |
643 { | |
644 vo_panscan = (!(vo_panscan)); | |
645 if(vo_panscan) | |
646 [kPanScanCmd setState:NSOnState]; | |
647 else | |
648 [kPanScanCmd setState:NSOffState]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
649 |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
650 [self panscan]; |
15570 | 651 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
652 |
15570 | 653 if(sender == kAspectOrgCmd) |
654 { | |
655 movie_aspect = old_movie_aspect; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
656 |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
657 if(isFullscreen) |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
658 { |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
659 [self reshape]; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
660 } |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
661 else |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
662 { |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
663 frame.size.width = d_width*winSizeMult; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
664 frame.size.height = (d_width/movie_aspect)*winSizeMult; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
665 [window setContentSize: frame.size]; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
666 [self reshape]; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
667 } |
15570 | 668 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
669 |
15570 | 670 if(sender == kAspectFullCmd) |
671 { | |
672 movie_aspect = 4.0f/3.0f; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
673 |
15882 | 674 if(isFullscreen) |
675 { | |
676 [self reshape]; | |
677 } | |
678 else | |
679 { | |
680 frame.size.width = d_width*winSizeMult; | |
681 frame.size.height = (d_width/movie_aspect)*winSizeMult; | |
682 [window setContentSize: frame.size]; | |
683 [self reshape]; | |
684 } | |
15570 | 685 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
686 |
15570 | 687 if(sender == kAspectWideCmd) |
688 { | |
689 movie_aspect = 16.0f/9.0f; | |
15882 | 690 |
691 if(isFullscreen) | |
692 { | |
693 [self reshape]; | |
694 } | |
695 else | |
696 { | |
697 frame.size.width = d_width*winSizeMult; | |
698 frame.size.height = (d_width/movie_aspect)*winSizeMult; | |
699 [window setContentSize: frame.size]; | |
700 [self reshape]; | |
701 } | |
15570 | 702 } |
703 } | |
704 | |
705 /* | |
15289 | 706 Setup OpenGL |
707 */ | |
708 - (void)prepareOpenGL | |
709 { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
710 glEnable(GL_BLEND); |
15289 | 711 glDisable(GL_DEPTH_TEST); |
712 glDepthMask(GL_FALSE); | |
713 glDisable(GL_CULL_FACE); | |
714 [self reshape]; | |
715 } | |
716 | |
717 /* | |
718 reshape OpenGL viewport | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
719 */ |
15289 | 720 - (void)reshape |
721 { | |
722 uint32_t d_width; | |
723 uint32_t d_height; | |
724 float aspectX; | |
725 float aspectY; | |
726 int padding = 0; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
727 |
15289 | 728 NSRect frame = [self frame]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
729 |
15289 | 730 glViewport(0, 0, frame.size.width, frame.size.height); |
731 glMatrixMode(GL_PROJECTION); | |
732 glLoadIdentity(); | |
733 glOrtho(0, frame.size.width, frame.size.height, 0, -1.0, 1.0); | |
734 glMatrixMode(GL_MODELVIEW); | |
735 glLoadIdentity(); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
736 |
15729 | 737 //set texture frame |
15289 | 738 if(vo_keepaspect) |
739 { | |
15571 | 740 aspect( (int *)&d_width, (int *)&d_height, A_NOZOOM); |
15289 | 741 d_height = ((float)d_width/movie_aspect); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
742 |
15289 | 743 aspectX = (float)((float)frame.size.width/(float)d_width); |
744 aspectY = (float)((float)(frame.size.height)/(float)d_height); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
745 |
15289 | 746 if((d_height*aspectX)>(frame.size.height)) |
747 { | |
748 padding = (frame.size.width - d_width*aspectY)/2; | |
25424 | 749 textureFrame = NSMakeRect(padding, 0, d_width*aspectY, d_height*aspectY); |
15289 | 750 } |
751 else | |
752 { | |
753 padding = ((frame.size.height) - d_height*aspectX)/2; | |
25424 | 754 textureFrame = NSMakeRect(0, padding, d_width*aspectX, d_height*aspectX); |
15289 | 755 } |
756 } | |
757 else | |
758 { | |
15729 | 759 textureFrame = frame; |
15289 | 760 } |
25446 | 761 vo_dwidth = textureFrame.size.width; |
762 vo_dheight = textureFrame.size.height; | |
15289 | 763 } |
764 | |
765 /* | |
766 Render frame | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
767 */ |
15289 | 768 - (void) render |
769 { | |
21395 | 770 int curTime; |
771 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
772 glClear(GL_COLOR_BUFFER_BIT); |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
773 |
15289 | 774 glEnable(CVOpenGLTextureGetTarget(texture)); |
775 glBindTexture(CVOpenGLTextureGetTarget(texture), CVOpenGLTextureGetName(texture)); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
776 |
15289 | 777 glColor3f(1,1,1); |
778 glBegin(GL_QUADS); | |
15729 | 779 glTexCoord2f(upperLeft[0], upperLeft[1]); glVertex2i( textureFrame.origin.x-(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1)); |
25424 | 780 glTexCoord2f(lowerLeft[0], lowerLeft[1]); glVertex2i(textureFrame.origin.x-(vo_panscan_x >> 1), NSMaxY(textureFrame)+(vo_panscan_y >> 1)); |
781 glTexCoord2f(lowerRight[0], lowerRight[1]); glVertex2i(NSMaxX(textureFrame)+(vo_panscan_x >> 1), NSMaxY(textureFrame)+(vo_panscan_y >> 1)); | |
782 glTexCoord2f(upperRight[0], upperRight[1]); glVertex2i(NSMaxX(textureFrame)+(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1)); | |
15289 | 783 glEnd(); |
15339 | 784 glDisable(CVOpenGLTextureGetTarget(texture)); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
785 |
15339 | 786 //render resize box |
787 if(!isFullscreen) | |
788 { | |
789 NSRect frame = [self frame]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
790 |
15339 | 791 glBegin(GL_LINES); |
792 glColor4f(0.2, 0.2, 0.2, 0.5); | |
793 glVertex2i(frame.size.width-1, frame.size.height-1); glVertex2i(frame.size.width-1, frame.size.height-1); | |
794 glVertex2i(frame.size.width-1, frame.size.height-5); glVertex2i(frame.size.width-5, frame.size.height-1); | |
795 glVertex2i(frame.size.width-1, frame.size.height-9); glVertex2i(frame.size.width-9, frame.size.height-1); | |
796 | |
797 glColor4f(0.4, 0.4, 0.4, 0.5); | |
798 glVertex2i(frame.size.width-1, frame.size.height-2); glVertex2i(frame.size.width-2, frame.size.height-1); | |
799 glVertex2i(frame.size.width-1, frame.size.height-6); glVertex2i(frame.size.width-6, frame.size.height-1); | |
800 glVertex2i(frame.size.width-1, frame.size.height-10); glVertex2i(frame.size.width-10, frame.size.height-1); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
801 |
15339 | 802 glColor4f(0.6, 0.6, 0.6, 0.5); |
803 glVertex2i(frame.size.width-1, frame.size.height-3); glVertex2i(frame.size.width-3, frame.size.height-1); | |
804 glVertex2i(frame.size.width-1, frame.size.height-7); glVertex2i(frame.size.width-7, frame.size.height-1); | |
805 glVertex2i(frame.size.width-1, frame.size.height-11); glVertex2i(frame.size.width-11, frame.size.height-1); | |
806 glEnd(); | |
807 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
808 |
15289 | 809 glFlush(); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
810 |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
811 curTime = TickCount()/60; |
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
812 |
28837 | 813 //automatically hide mouse cursor (and future on-screen control?) |
15327 | 814 if(isFullscreen && !mouseHide && !isRootwin) |
15289 | 815 { |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
816 if( ((curTime - lastMouseHide) >= 5) || (lastMouseHide == 0) ) |
15289 | 817 { |
18057 | 818 CGDisplayHideCursor(kCGDirectMainDisplay); |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
819 mouseHide = TRUE; |
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
820 lastMouseHide = curTime; |
15289 | 821 } |
822 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
823 |
17725 | 824 //update activity every 30 seconds to prevent |
17546 | 825 //screensaver from starting up. |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
826 if( ((curTime - lastScreensaverUpdate) >= 30) || (lastScreensaverUpdate == 0) ) |
17546 | 827 { |
828 UpdateSystemActivity(UsrActivity); | |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
829 lastScreensaverUpdate = curTime; |
17546 | 830 } |
15289 | 831 } |
832 | |
833 /* | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
834 Create OpenGL texture from current frame & set texco |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
835 */ |
15289 | 836 - (void) setCurrentTexture |
837 { | |
838 CVReturn error = kCVReturnSuccess; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
839 |
29137
0f6fc0df2c23
fix a memory leak leading to ~80 bytes being leaked at each call to flip_page.
gpoirier
parents:
28837
diff
changeset
|
840 CVOpenGLTextureRelease(texture); |
25180 | 841 error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture); |
15289 | 842 if(error != kCVReturnSuccess) |
29210 | 843 mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL texture(%d)\n", error); |
15289 | 844 |
845 CVOpenGLTextureGetCleanTexCoords(texture, lowerLeft, lowerRight, upperRight, upperLeft); | |
846 } | |
847 | |
848 /* | |
849 redraw win rect | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
850 */ |
15289 | 851 - (void) drawRect: (NSRect *) bounds |
852 { | |
853 [self render]; | |
854 } | |
855 | |
856 /* | |
857 Toggle Fullscreen | |
858 */ | |
859 - (void) fullscreen: (BOOL) animate | |
860 { | |
861 static NSRect old_frame; | |
862 static NSRect old_view_frame; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
863 |
15573 | 864 panscan_calc(); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
865 |
15289 | 866 //go fullscreen |
867 if(vo_fs) | |
868 { | |
15327 | 869 if(!isRootwin) |
870 { | |
15882 | 871 SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); |
18057 | 872 CGDisplayHideCursor(kCGDirectMainDisplay); |
15327 | 873 mouseHide = YES; |
874 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
875 |
15289 | 876 old_frame = [window frame]; //save main window size & position |
28306 | 877 if(screen_id >= 0) |
25413 | 878 screen_frame = [screen_handle frame]; |
25414
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
879 else { |
25413 | 880 screen_frame = [[window screen] frame]; |
25414
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
881 vo_screenwidth = screen_frame.size.width; |
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
882 vo_screenheight = screen_frame.size.height; |
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
883 } |
25413 | 884 |
15728 | 885 [window setFrame:screen_frame display:YES animate:animate]; //zoom-in window with nice useless sfx |
15289 | 886 old_view_frame = [self bounds]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
887 |
15289 | 888 //fix origin for multi screen setup |
15728 | 889 screen_frame.origin.x = 0; |
890 screen_frame.origin.y = 0; | |
891 [self setFrame:screen_frame]; | |
15289 | 892 [self setNeedsDisplay:YES]; |
893 [window setHasShadow:NO]; | |
894 isFullscreen = 1; | |
895 } | |
896 else | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
897 { |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
898 SetSystemUIMode( kUIModeNormal, 0); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
899 |
15289 | 900 isFullscreen = 0; |
18057 | 901 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 902 mouseHide = NO; |
903 | |
904 //revert window to previous setting | |
905 [self setFrame:old_view_frame]; | |
906 [self setNeedsDisplay:YES]; | |
16081
72c352edce8f
restore window shadow when quitting fullscreen mode
nplourde
parents:
15909
diff
changeset
|
907 [window setHasShadow:YES]; |
15289 | 908 [window setFrame:old_frame display:YES animate:animate];//zoom-out window with nice useless sfx |
909 } | |
910 } | |
911 | |
912 /* | |
913 Toggle ontop | |
914 */ | |
915 - (void) ontop | |
916 { | |
15320 | 917 if(vo_ontop) |
918 { | |
919 [window setLevel:NSScreenSaverWindowLevel]; | |
920 isOntop = YES; | |
921 } | |
922 else | |
923 { | |
924 [window setLevel:NSNormalWindowLevel]; | |
925 isOntop = NO; | |
926 } | |
15289 | 927 } |
928 | |
929 /* | |
930 Toggle panscan | |
931 */ | |
932 - (void) panscan | |
933 { | |
15331 | 934 panscan_calc(); |
15289 | 935 } |
936 | |
937 /* | |
15327 | 938 Toggle rootwin |
939 */ | |
940 - (void) rootwin | |
941 { | |
942 if(vo_rootwin) | |
943 { | |
944 [window setLevel:CGWindowLevelForKey(kCGDesktopWindowLevelKey)]; | |
945 [window orderBack:self]; | |
946 isRootwin = YES; | |
947 } | |
948 else | |
949 { | |
950 [window setLevel:NSNormalWindowLevel]; | |
951 isRootwin = NO; | |
952 } | |
953 } | |
954 | |
955 /* | |
15289 | 956 Check event for new event |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
957 */ |
15289 | 958 - (void) check_events |
959 { | |
960 event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.0001] inMode:NSEventTrackingRunLoopMode dequeue:YES]; | |
25178 | 961 if (event == nil) |
962 return; | |
15289 | 963 [NSApp sendEvent:event]; |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
964 // Without SDL's bootstrap code (include SDL.h in mplayer.c), |
28837 | 965 // on Leopard, we have trouble to get the play window automatically focused |
966 // when the app is actived. The Following code fix this problem. | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
26755
diff
changeset
|
967 #ifndef CONFIG_SDL |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
968 if (isLeopardOrLater && [event type] == NSAppKitDefined |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
969 && [event subtype] == NSApplicationActivatedEventType) { |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
970 [window makeMainWindow]; |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
971 [window makeKeyAndOrderFront:mpGLView]; |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
972 } |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
973 #endif |
15289 | 974 } |
975 | |
976 /* | |
15731 | 977 From NSView, respond to key equivalents. |
978 */ | |
979 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent | |
980 { | |
981 switch([theEvent keyCode]) | |
982 { | |
983 case 0x21: [window setAlphaValue: winAlpha-=0.05]; return YES; | |
984 case 0x1e: [window setAlphaValue: winAlpha+=0.05]; return YES; | |
985 } | |
986 return NO; | |
987 } | |
988 | |
989 /* | |
15289 | 990 Process key event |
991 */ | |
992 - (void) keyDown: (NSEvent *) theEvent | |
993 { | |
994 unsigned int key; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
995 |
15289 | 996 switch([theEvent keyCode]) |
997 { | |
998 case 0x34: | |
999 case 0x24: key = KEY_ENTER; break; | |
1000 case 0x35: key = KEY_ESC; break; | |
1001 case 0x33: key = KEY_BACKSPACE; break; | |
1002 case 0x3A: key = KEY_BACKSPACE; break; | |
1003 case 0x3B: key = KEY_BACKSPACE; break; | |
1004 case 0x38: key = KEY_BACKSPACE; break; | |
1005 case 0x7A: key = KEY_F+1; break; | |
1006 case 0x78: key = KEY_F+2; break; | |
1007 case 0x63: key = KEY_F+3; break; | |
1008 case 0x76: key = KEY_F+4; break; | |
1009 case 0x60: key = KEY_F+5; break; | |
1010 case 0x61: key = KEY_F+6; break; | |
1011 case 0x62: key = KEY_F+7; break; | |
1012 case 0x64: key = KEY_F+8; break; | |
1013 case 0x65: key = KEY_F+9; break; | |
1014 case 0x6D: key = KEY_F+10; break; | |
1015 case 0x67: key = KEY_F+11; break; | |
1016 case 0x6F: key = KEY_F+12; break; | |
1017 case 0x72: key = KEY_INSERT; break; | |
1018 case 0x75: key = KEY_DELETE; break; | |
1019 case 0x73: key = KEY_HOME; break; | |
1020 case 0x77: key = KEY_END; break; | |
1021 case 0x45: key = '+'; break; | |
1022 case 0x4E: key = '-'; break; | |
1023 case 0x30: key = KEY_TAB; break; | |
1024 case 0x74: key = KEY_PAGE_UP; break; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
1025 case 0x79: key = KEY_PAGE_DOWN; break; |
15289 | 1026 case 0x7B: key = KEY_LEFT; break; |
1027 case 0x7C: key = KEY_RIGHT; break; | |
1028 case 0x7D: key = KEY_DOWN; break; | |
1029 case 0x7E: key = KEY_UP; break; | |
1030 case 0x43: key = '*'; break; | |
1031 case 0x4B: key = '/'; break; | |
24107 | 1032 case 0x4C: key = KEY_KPENTER; break; |
15289 | 1033 case 0x41: key = KEY_KPDEC; break; |
1034 case 0x52: key = KEY_KP0; break; | |
1035 case 0x53: key = KEY_KP1; break; | |
1036 case 0x54: key = KEY_KP2; break; | |
1037 case 0x55: key = KEY_KP3; break; | |
1038 case 0x56: key = KEY_KP4; break; | |
1039 case 0x57: key = KEY_KP5; break; | |
1040 case 0x58: key = KEY_KP6; break; | |
1041 case 0x59: key = KEY_KP7; break; | |
1042 case 0x5B: key = KEY_KP8; break; | |
1043 case 0x5C: key = KEY_KP9; break; | |
1044 default: key = *[[theEvent characters] UTF8String]; break; | |
1045 } | |
1046 mplayer_put_key(key); | |
1047 } | |
1048 | |
1049 /* | |
1050 Process mouse button event | |
1051 */ | |
1052 - (void) mouseMoved: (NSEvent *) theEvent | |
1053 { | |
15327 | 1054 if(isFullscreen && !isRootwin) |
15289 | 1055 { |
18057 | 1056 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 1057 mouseHide = NO; |
1058 } | |
25468
a77c438fedf7
Do not send mouse movements events in root win mode.
ulion
parents:
25446
diff
changeset
|
1059 if (enable_mouse_movements && !isRootwin) { |
25446 | 1060 NSPoint p =[self convertPoint:[theEvent locationInWindow] fromView:nil]; |
1061 if ([self mouse:p inRect:textureFrame]) { | |
1062 char cmdstr[40]; | |
1063 snprintf(cmdstr, sizeof(cmdstr), "set_mouse_pos %i %i", | |
1064 (int)(vo_fs ? p.x : (p.x - textureFrame.origin.x)), | |
1065 (int)(vo_fs ? [self frame].size.height - p.y: (NSMaxY(textureFrame) - p.y))); | |
1066 mp_input_queue_cmd(mp_input_parse_cmd(cmdstr)); | |
1067 } | |
1068 } | |
15289 | 1069 } |
1070 | |
1071 - (void) mouseDown: (NSEvent *) theEvent | |
1072 { | |
1073 [self mouseEvent: theEvent]; | |
1074 } | |
1075 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1076 - (void) mouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1077 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1078 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1079 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1080 |
15289 | 1081 - (void) rightMouseDown: (NSEvent *) theEvent |
1082 { | |
1083 [self mouseEvent: theEvent]; | |
1084 } | |
1085 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1086 - (void) rightMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1087 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1088 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1089 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1090 |
15289 | 1091 - (void) otherMouseDown: (NSEvent *) theEvent |
1092 { | |
1093 [self mouseEvent: theEvent]; | |
1094 } | |
1095 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1096 - (void) otherMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1097 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1098 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1099 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1100 |
15289 | 1101 - (void) scrollWheel: (NSEvent *) theEvent |
1102 { | |
1103 if([theEvent deltaY] > 0) | |
1104 mplayer_put_key(MOUSE_BTN3); | |
1105 else | |
1106 mplayer_put_key(MOUSE_BTN4); | |
1107 } | |
1108 | |
1109 - (void) mouseEvent: (NSEvent *) theEvent | |
1110 { | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1111 if ( [theEvent buttonNumber] >= 0 && [theEvent buttonNumber] <= 9 ) |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1112 { |
25422 | 1113 int buttonNumber = [theEvent buttonNumber]; |
1114 // Fix to mplayer defined button order: left, middle, right | |
1115 if (buttonNumber == 1) | |
1116 buttonNumber = 2; | |
25423 | 1117 else if (buttonNumber == 2) |
1118 buttonNumber = 1; | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1119 switch([theEvent type]) |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1120 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1121 case NSLeftMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1122 case NSRightMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1123 case NSOtherMouseDown: |
25422 | 1124 mplayer_put_key((MOUSE_BTN0 + buttonNumber) | MP_KEY_DOWN); |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1125 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1126 case NSLeftMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1127 case NSRightMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1128 case NSOtherMouseUp: |
25422 | 1129 mplayer_put_key(MOUSE_BTN0 + buttonNumber); |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1130 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1131 } |
15289 | 1132 } |
1133 } | |
1134 | |
1135 /* | |
1136 NSResponder | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
1137 */ |
15289 | 1138 - (BOOL) acceptsFirstResponder |
1139 { | |
1140 return YES; | |
1141 } | |
1142 | |
1143 - (BOOL) becomeFirstResponder | |
1144 { | |
1145 return YES; | |
1146 } | |
1147 | |
1148 - (BOOL) resignFirstResponder | |
1149 { | |
1150 return YES; | |
1151 } | |
15325 | 1152 |
1153 - (void)windowWillClose:(NSNotification *)aNotification | |
1154 { | |
21551 | 1155 mpGLView = NULL; |
15325 | 1156 mplayer_put_key(KEY_ESC); |
1157 } | |
1158 @end |