Mercurial > mplayer.hg
annotate libvo/vo_corevideo.m @ 35084:3be1bcf3f16b
Use "self".
author | reimar |
---|---|
date | Thu, 13 Sep 2012 19:11:55 +0000 |
parents | b3a7f40618b9 |
children | 5a9728bbb51e |
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" |
32471 | 43 #include "sub/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" | |
29533
9c8f8e375823
Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
reimar
parents:
29272
diff
changeset
|
50 #include "osx_common.h" |
15289 | 51 |
52 //Cocoa | |
35065 | 53 static NSDistantObject *mplayerosxProxy; |
54 static id <MPlayerOSXVOProto> mplayerosxProto; | |
55 static MPlayerOpenGLView *mpGLView; | |
56 static NSAutoreleasePool *autoreleasepool; | |
57 static OSType pixelFormat; | |
15289 | 58 |
16385 | 59 //shared memory |
35065 | 60 static 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 |
35065 | 65 static int screen_id = -1; |
15289 | 66 |
67 //image | |
35065 | 68 static unsigned char *image_data; |
25180 | 69 // For double buffering |
70 static uint8_t image_page = 0; | |
71 static unsigned char *image_datas[2]; | |
72 | |
15289 | 73 static uint32_t image_width; |
74 static uint32_t image_height; | |
75 static uint32_t image_bytes; | |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
76 static uint32_t image_stride; |
15289 | 77 static uint32_t image_format; |
78 | |
15731 | 79 static float winAlpha = 1; |
15289 | 80 |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
81 static BOOL isLeopardOrLater; |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
82 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
83 static vo_info_t info = |
15289 | 84 { |
28837 | 85 "Mac OS X Core Video", |
29210 | 86 "corevideo", |
15289 | 87 "Nicolas Plourde <nicolas.plourde@gmail.com>", |
88 "" | |
89 }; | |
90 | |
29210 | 91 LIBVO_EXTERN(corevideo) |
15289 | 92 |
93 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) | |
94 { | |
34876
c5f89bf5b952
corevideo: Reduce code duplication in OSD rendering code.
reimar
parents:
34875
diff
changeset
|
95 unsigned char *dst = image_data + image_bytes * (y0 * image_width + x0); |
15289 | 96 switch (image_format) |
97 { | |
30974
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
98 case IMGFMT_RGB24: |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
99 vo_draw_alpha_rgb24(w,h,src,srca,stride,dst,image_stride); |
30974
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
100 break; |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
101 case IMGFMT_ARGB: |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
102 case IMGFMT_BGRA: |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
103 vo_draw_alpha_rgb32(w,h,src,srca,stride,dst,image_stride); |
15289 | 104 break; |
105 case IMGFMT_YUY2: | |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
106 vo_draw_alpha_yuy2(w,h,src,srca,stride,dst,image_stride); |
15289 | 107 break; |
35019 | 108 case IMGFMT_UYVY: |
109 vo_draw_alpha_uyvy(w,h,src,srca,stride,dst,image_stride); | |
110 break; | |
15289 | 111 } |
112 } | |
113 | |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
114 static void update_screen_info(void) |
15289 | 115 { |
35074
3fb18ad99003
Deprecate corevideo device_id in favour of -xineramascreen.
reimar
parents:
35073
diff
changeset
|
116 int screen_id = xinerama_screen; |
35073 | 117 NSArray *screen_array = [NSScreen screens]; |
35072 | 118 NSScreen *screen_handle; |
119 NSRect screen_frame; | |
30000
a30debd7acd7
Add -xineramascreen support to corevideo vo. Still prefer corevideo's own device_id parameter if it's set.
adrian
parents:
29657
diff
changeset
|
120 |
31740 | 121 if(screen_id >= (int)[screen_array count]) |
15728 | 122 { |
29210 | 123 mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] Device ID %d does not exist, falling back to main device\n", screen_id); |
28306 | 124 screen_id = -1; |
15728 | 125 } |
31741
601cd1e830fe
Avoid some code duplication in update_screen_info.
reimar
parents:
31740
diff
changeset
|
126 if (screen_id < 0 && [mpGLView window]) |
601cd1e830fe
Avoid some code duplication in update_screen_info.
reimar
parents:
31740
diff
changeset
|
127 screen_handle = [[mpGLView window] screen]; |
601cd1e830fe
Avoid some code duplication in update_screen_info.
reimar
parents:
31740
diff
changeset
|
128 else |
31742 | 129 screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
130 |
31741
601cd1e830fe
Avoid some code duplication in update_screen_info.
reimar
parents:
31740
diff
changeset
|
131 screen_frame = [screen_handle frame]; |
25414
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
132 vo_screenwidth = screen_frame.size.width; |
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
133 vo_screenheight = screen_frame.size.height; |
35071 | 134 xinerama_x = screen_frame.origin.x; |
135 xinerama_y = screen_frame.origin.y; | |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
136 aspect_save_screenres(vo_screenwidth, vo_screenheight); |
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
137 } |
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
138 |
29573
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
139 static void free_file_specific(void) |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
140 { |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
141 if(shared_buffer) |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
142 { |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
143 [mplayerosxProto stop]; |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
144 mplayerosxProto = nil; |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
145 [mplayerosxProxy release]; |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
146 mplayerosxProxy = nil; |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
147 |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
148 if (munmap(image_data, image_height*image_stride) == -1) |
29573
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
149 mp_msg(MSGT_VO, MSGL_FATAL, "[vo_corevideo] uninit: munmap failed. Error: %s\n", strerror(errno)); |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
150 |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
151 if (shm_unlink(buffer_name) == -1) |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
152 mp_msg(MSGT_VO, MSGL_FATAL, "[vo_corevideo] uninit: shm_unlink failed. Error: %s\n", strerror(errno)); |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
153 } else { |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
154 free(image_datas[0]); |
34875
444a6a469743
Remove unnecessary if, free can be called unconditionally.
reimar
parents:
34825
diff
changeset
|
155 free(image_datas[1]); |
29573
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
156 image_datas[0] = NULL; |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
157 image_datas[1] = NULL; |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
158 image_data = NULL; |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
159 } |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
160 } |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
161 |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
162 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) |
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
163 { |
29573
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
164 free_file_specific(); |
16385 | 165 |
15289 | 166 //misc mplayer setup |
167 image_width = width; | |
168 image_height = height; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
169 switch (image_format) |
15289 | 170 { |
30974
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
171 case IMGFMT_RGB24: |
34825 | 172 image_bytes = 3; |
30974
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
173 break; |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
174 case IMGFMT_ARGB: |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
175 case IMGFMT_BGRA: |
34825 | 176 image_bytes = 4; |
15289 | 177 break; |
16385 | 178 case IMGFMT_YUY2: |
35019 | 179 case IMGFMT_UYVY: |
34825 | 180 image_bytes = 2; |
15289 | 181 break; |
182 } | |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
183 // should be aligned, but that would break the shared buffer |
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
184 image_stride = image_width * image_bytes; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
185 |
16385 | 186 if(!shared_buffer) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
187 { |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
188 image_data = malloc(image_height*image_stride); |
25180 | 189 image_datas[0] = image_data; |
190 if (vo_doublebuffering) | |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
191 image_datas[1] = malloc(image_height*image_stride); |
25180 | 192 image_page = 0; |
25120
9b4ca4dc1294
Fix a memory leak when working in shared_buffer mode.
ulion
parents:
25114
diff
changeset
|
193 |
16385 | 194 //config OpenGL View |
35080
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
195 [mpGLView config:d_width:d_height:flags]; |
16385 | 196 [mpGLView reshape]; |
34299 | 197 [[mpGLView window] setTitle:[NSString stringWithCString:vo_wintitle ? vo_wintitle : title]]; |
16385 | 198 } |
199 else | |
200 { | |
29567
349de9bdfcce
Make shm_fd a local variable and close it when we need it no longer, thus
reimar
parents:
29566
diff
changeset
|
201 int shm_fd; |
29210 | 202 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
|
203 "named \"%s\"\n",buffer_name); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
204 |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
205 // create shared memory |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
206 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
|
207 if (shm_fd == -1) |
16385 | 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 open shared memory. Error: %s\n", strerror(errno)); |
16385 | 211 return 1; |
212 } | |
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 |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
215 if (ftruncate(shm_fd, image_height*image_stride) == -1) |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
216 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
217 mp_msg(MSGT_VO, MSGL_FATAL, |
29210 | 218 "[vo_corevideo] failed to size shared memory, possibly already in use. Error: %s\n", strerror(errno)); |
29567
349de9bdfcce
Make shm_fd a local variable and close it when we need it no longer, thus
reimar
parents:
29566
diff
changeset
|
219 close(shm_fd); |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
220 shm_unlink(buffer_name); |
16385 | 221 return 1; |
222 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
223 |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
224 image_data = mmap(NULL, image_height*image_stride, |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
225 PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0); |
29567
349de9bdfcce
Make shm_fd a local variable and close it when we need it no longer, thus
reimar
parents:
29566
diff
changeset
|
226 close(shm_fd); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
227 |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
228 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
|
229 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
230 mp_msg(MSGT_VO, MSGL_FATAL, |
29210 | 231 "[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
|
232 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
|
233 return 1; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
234 } |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
235 |
28837 | 236 //connect to mplayerosx |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
237 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
|
238 if ([mplayerosxProxy conformsToProtocol:@protocol(MPlayerOSXVOProto)]) { |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
239 [mplayerosxProxy setProtocolForProxy:@protocol(MPlayerOSXVOProto)]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
240 mplayerosxProto = (id <MPlayerOSXVOProto>)mplayerosxProxy; |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
241 [mplayerosxProto startWithWidth: image_width withHeight: image_height withBytes: image_bytes withAspect:d_width*100/d_height]; |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
242 } |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
243 else { |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
244 [mplayerosxProxy release]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
245 mplayerosxProxy = nil; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
246 mplayerosxProto = nil; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
247 } |
16385 | 248 } |
15289 | 249 return 0; |
250 } | |
251 | |
252 static void check_events(void) | |
253 { | |
29272
c95bad660986
When used with shared_buffer, there's no need for a NSApp object, which causes MPlayer to be marked as unresponsive.
adrian
parents:
29271
diff
changeset
|
254 if (mpGLView) |
c95bad660986
When used with shared_buffer, there's no need for a NSApp object, which causes MPlayer to be marked as unresponsive.
adrian
parents:
29271
diff
changeset
|
255 [mpGLView check_events]; |
15289 | 256 } |
257 | |
258 static void draw_osd(void) | |
259 { | |
260 vo_draw_text(image_width, image_height, draw_alpha); | |
261 } | |
262 | |
263 static void flip_page(void) | |
264 { | |
29271
82b6fbc72099
When used with shared_buffer, autorelease in each flip_page so objects don't accumulate until exit.
adrian
parents:
29263
diff
changeset
|
265 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
|
266 NSAutoreleasePool *pool = [NSAutoreleasePool new]; |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
267 [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
|
268 [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
|
269 } else { |
25114
bed4188998ca
Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents:
25078
diff
changeset
|
270 [mpGLView setCurrentTexture]; |
16385 | 271 [mpGLView render]; |
25180 | 272 if (vo_doublebuffering) { |
273 image_page = 1 - image_page; | |
274 image_data = image_datas[image_page]; | |
275 } | |
25114
bed4188998ca
Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents:
25078
diff
changeset
|
276 } |
15289 | 277 } |
278 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
279 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) |
15289 | 280 { |
281 return 0; | |
282 } | |
283 | |
284 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
285 static int draw_frame(uint8_t *src[]) |
15289 | 286 { |
30972
886527159cae
Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoiding
reimar
parents:
30922
diff
changeset
|
287 return 0; |
886527159cae
Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoiding
reimar
parents:
30922
diff
changeset
|
288 } |
15289 | 289 |
30972
886527159cae
Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoiding
reimar
parents:
30922
diff
changeset
|
290 static uint32_t draw_image(mp_image_t *mpi) |
886527159cae
Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoiding
reimar
parents:
30922
diff
changeset
|
291 { |
35057 | 292 if (!(mpi->flags & MP_IMGFLAG_DIRECT)) |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
293 memcpy_pic(image_data, mpi->planes[0], image_width*image_bytes, image_height, image_stride, mpi->stride[0]); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
294 |
15289 | 295 return 0; |
296 } | |
297 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
298 static int query_format(uint32_t format) |
15289 | 299 { |
30974
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
300 const int supportflags = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; |
15289 | 301 image_format = format; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
302 |
15289 | 303 switch(format) |
304 { | |
305 case IMGFMT_YUY2: | |
306 pixelFormat = kYUVSPixelFormat; | |
30974
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
307 return supportflags; |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
308 |
35019 | 309 case IMGFMT_UYVY: |
310 pixelFormat = k2vuyPixelFormat; | |
311 return supportflags; | |
312 | |
30974
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
313 case IMGFMT_RGB24: |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
314 pixelFormat = k24RGBPixelFormat; |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
315 return supportflags; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
316 |
30974
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
317 case IMGFMT_ARGB: |
15289 | 318 pixelFormat = k32ARGBPixelFormat; |
30974
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
319 return supportflags; |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
320 |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
321 case IMGFMT_BGRA: |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
322 pixelFormat = k32BGRAPixelFormat; |
bd964ca1f6fa
Fix RGB support for corevideo: corevideo can only support
reimar
parents:
30973
diff
changeset
|
323 return supportflags; |
15289 | 324 } |
325 return 0; | |
326 } | |
327 | |
35057 | 328 static int get_image(mp_image_t *mpi) |
329 { | |
330 if (!(mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH)) || | |
331 (mpi->type != MP_IMGTYPE_TEMP && mpi->type != MP_IMGTYPE_STATIC)) | |
332 return VO_FALSE; | |
333 | |
334 // mpi should not be planar format here | |
335 mpi->planes[0] = image_data; | |
336 mpi->stride[0] = image_stride; | |
337 mpi->flags |= MP_IMGFLAG_DIRECT; | |
338 mpi->flags &= ~MP_IMGFLAG_DRAW_CALLBACK; | |
339 return VO_TRUE; | |
340 } | |
341 | |
15289 | 342 static void uninit(void) |
343 { | |
21551 | 344 SetSystemUIMode( kUIModeNormal, 0); |
345 CGDisplayShowCursor(kCGDirectMainDisplay); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
346 |
29573
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
347 free_file_specific(); |
2b14be337eaf
Fix some of the major memleaks of vo_corevideo with -fixed-vo
reimar
parents:
29567
diff
changeset
|
348 |
21551 | 349 if(mpGLView) |
350 { | |
25136 | 351 NSAutoreleasePool *finalPool; |
24742
0bef706332b5
Fix deallocate bug which sometimes causes a crash when reinitializing.
nplourde
parents:
24698
diff
changeset
|
352 mpGLView = nil; |
21551 | 353 [autoreleasepool release]; |
25136 | 354 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
|
355 [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
|
356 [finalPool release]; |
21551 | 357 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
358 |
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
32471
diff
changeset
|
359 free(buffer_name); |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
360 buffer_name = NULL; |
15289 | 361 } |
362 | |
29603 | 363 static const opt_t subopts[] = { |
28306 | 364 {"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
|
365 {"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
|
366 {"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
|
367 {NULL} |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
368 }; |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
369 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
370 static int preinit(const char *arg) |
15289 | 371 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
372 |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
373 // set defaults |
28306 | 374 screen_id = -1; |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
375 shared_buffer = false; |
28204 | 376 buffer_name = NULL; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
377 |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
378 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
|
379 mp_msg(MSGT_VO, MSGL_FATAL, |
29210 | 380 "\n-vo corevideo command line help:\n" |
381 "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
|
382 "\nOptions:\n" |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
383 " device_id=<0-...>\n" |
35074
3fb18ad99003
Deprecate corevideo device_id in favour of -xineramascreen.
reimar
parents:
35073
diff
changeset
|
384 " DEPRECATED, use -xineramascreen instead.\n" |
28837 | 385 " 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
|
386 " shared_buffer\n" |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
387 " 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
|
388 " buffer_name=<name>\n" |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
389 " 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
|
390 " 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
|
391 " 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
|
392 "\n" ); |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
393 return -1; |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
394 } |
15728 | 395 |
15289 | 396 autoreleasepool = [[NSAutoreleasePool alloc] init]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
397 |
35074
3fb18ad99003
Deprecate corevideo device_id in favour of -xineramascreen.
reimar
parents:
35073
diff
changeset
|
398 if (screen_id != -1) |
3fb18ad99003
Deprecate corevideo device_id in favour of -xineramascreen.
reimar
parents:
35073
diff
changeset
|
399 xinerama_screen = screen_id; |
3fb18ad99003
Deprecate corevideo device_id in favour of -xineramascreen.
reimar
parents:
35073
diff
changeset
|
400 |
28204 | 401 if (!buffer_name) |
402 buffer_name = strdup(DEFAULT_BUFFER_NAME); | |
403 else | |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
404 shared_buffer = true; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
405 |
16385 | 406 if(!shared_buffer) |
16144 | 407 { |
29272
c95bad660986
When used with shared_buffer, there's no need for a NSApp object, which causes MPlayer to be marked as unresponsive.
adrian
parents:
29271
diff
changeset
|
408 NSApplicationLoad(); |
c95bad660986
When used with shared_buffer, there's no need for a NSApp object, which causes MPlayer to be marked as unresponsive.
adrian
parents:
29271
diff
changeset
|
409 NSApp = [NSApplication sharedApplication]; |
c95bad660986
When used with shared_buffer, there's no need for a NSApp object, which causes MPlayer to be marked as unresponsive.
adrian
parents:
29271
diff
changeset
|
410 isLeopardOrLater = floor(NSAppKitVersionNumber) > 824; |
c95bad660986
When used with shared_buffer, there's no need for a NSApp object, which causes MPlayer to be marked as unresponsive.
adrian
parents:
29271
diff
changeset
|
411 |
30922
7e3b047c51e7
Refactor OS X foreground process setting into a separate function.
diego
parents:
30001
diff
changeset
|
412 osx_foreground_hack(); |
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
|
413 |
16385 | 414 if(!mpGLView) |
415 { | |
416 mpGLView = [[MPlayerOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:[MPlayerOpenGLView defaultPixelFormat]]; | |
417 [mpGLView autorelease]; | |
418 } | |
31758 | 419 // Install an event handler so the Quit menu entry works |
420 // The proper way using NSApp setDelegate: and | |
421 // applicationShouldTerminate: does not work, | |
422 // probably NSApplication never installs its handler. | |
423 [[NSAppleEventManager sharedAppleEventManager] | |
424 setEventHandler:mpGLView | |
425 andSelector:@selector(handleQuitEvent:withReplyEvent:) | |
426 forEventClass:kCoreEventClass | |
427 andEventID:kAEQuitApplication]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
428 |
16385 | 429 [mpGLView display]; |
430 [mpGLView preinit]; | |
16144 | 431 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
432 |
15289 | 433 return 0; |
434 } | |
435 | |
33330
ad12e6080ed1
Fix compilation for OSX due to r33392 - control() vaarg removal.
iive
parents:
32537
diff
changeset
|
436 static int control(uint32_t request, void *data) |
15289 | 437 { |
438 switch (request) | |
439 { | |
30972
886527159cae
Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoiding
reimar
parents:
30922
diff
changeset
|
440 case VOCTRL_DRAW_IMAGE: return draw_image(data); |
34825 | 441 case VOCTRL_PAUSE: |
442 case VOCTRL_RESUME: | |
443 return VO_TRUE; | |
31737 | 444 case VOCTRL_QUERY_FORMAT: return query_format(*(uint32_t*)data); |
35057 | 445 case VOCTRL_GET_IMAGE: return get_image(data); |
31737 | 446 case VOCTRL_ONTOP: vo_ontop = !vo_ontop; if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE; |
447 case VOCTRL_ROOTWIN: vo_rootwin = !vo_rootwin; [mpGLView rootwin]; return VO_TRUE; | |
448 case VOCTRL_FULLSCREEN: vo_fs = !vo_fs; if(!shared_buffer){ [mpGLView fullscreen: NO]; } else { [mplayerosxProto toggleFullscreen]; } return VO_TRUE; | |
15289 | 449 case VOCTRL_GET_PANSCAN: return VO_TRUE; |
35069 | 450 case VOCTRL_SET_PANSCAN: panscan_calc(); return VO_TRUE; |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
451 case VOCTRL_UPDATE_SCREENINFO: update_screen_info(); return VO_TRUE; |
15289 | 452 } |
453 return VO_NOTIMPL; | |
454 } | |
455 | |
456 ////////////////////////////////////////////////////////////////////////// | |
457 // NSOpenGLView Subclass | |
458 ////////////////////////////////////////////////////////////////////////// | |
15611 | 459 @implementation MPlayerOpenGLView |
24076 | 460 - (void) preinit |
15289 | 461 { |
29575
0e182921966b
Make glContext a local variable, it is not needed outside the function
reimar
parents:
29574
diff
changeset
|
462 NSOpenGLContext *glContext; |
29566
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
463 GLint swapInterval = 1; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
464 CVReturn error; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
465 |
15726 | 466 //init menu |
467 [self initMenu]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
468 |
15726 | 469 //create window |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
470 window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) |
15726 | 471 styleMask:NSTitledWindowMask|NSTexturedBackgroundWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask |
472 backing:NSBackingStoreBuffered defer:NO]; | |
473 | |
16144 | 474 [window autorelease]; |
35066
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
475 [window setDelegate:self]; |
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
476 [window setContentView:self]; |
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
477 [window setInitialFirstResponder:self]; |
15726 | 478 [window setAcceptsMouseMovedEvents:YES]; |
31742 | 479 [window setTitle:@"MPlayer - The Movie Player"]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
480 |
15855 | 481 winSizeMult = 1; |
29566
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
482 |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
483 //create OpenGL Context |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
484 glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil]; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
485 |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
486 [self setOpenGLContext:glContext]; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
487 [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval]; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
488 [glContext setView:self]; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
489 [glContext makeCurrentContext]; |
29575
0e182921966b
Make glContext a local variable, it is not needed outside the function
reimar
parents:
29574
diff
changeset
|
490 [glContext release]; |
29566
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
491 |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
492 error = CVOpenGLTextureCacheCreate(NULL, 0, [glContext CGLContextObj], [[self pixelFormat] CGLPixelFormatObj], 0, &textureCache); |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
493 if(error != kCVReturnSuccess) |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
494 mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL texture Cache(%d)\n", error); |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
495 } |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
496 |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
497 - (void) releaseVideoSpecific |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
498 { |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
499 CVPixelBufferRelease(frameBuffers[0]); |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
500 frameBuffers[0] = NULL; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
501 CVPixelBufferRelease(frameBuffers[1]); |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
502 frameBuffers[1] = NULL; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
503 CVOpenGLTextureRelease(texture); |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
504 texture = NULL; |
15726 | 505 } |
506 | |
29574
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
507 - (void) dealloc |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
508 { |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
509 [self releaseVideoSpecific]; |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
510 CVOpenGLTextureCacheRelease(textureCache); |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
511 textureCache = NULL; |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
512 [self setOpenGLContext:nil]; |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
513 [super dealloc]; |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
514 } |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
515 |
35080
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
516 - (void) config:(uint32_t)width:(uint32_t)height:(uint32_t)flags |
15726 | 517 { |
15289 | 518 CVReturn error = kCVReturnSuccess; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
519 |
35080
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
520 config_movie_aspect((float)width/height); |
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
521 |
35084 | 522 vo_dwidth = width *= self->winSizeMult; |
523 vo_dheight = height *= self->winSizeMult; | |
35080
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
524 |
15728 | 525 //config window |
30001 | 526 [window setContentSize:NSMakeSize(vo_dwidth, vo_dheight)]; |
527 | |
35070
ff4758e8cfba
Change geometry for corevideo vo to not take dock into account.
reimar
parents:
35069
diff
changeset
|
528 // Do not use visibleFrame - taking the menu bar and dock into account |
ff4758e8cfba
Change geometry for corevideo vo to not take dock into account.
reimar
parents:
35069
diff
changeset
|
529 // would be nicer in principle, but currently only results in the window |
ff4758e8cfba
Change geometry for corevideo vo to not take dock into account.
reimar
parents:
35069
diff
changeset
|
530 // being placed strangely off-center since vo_dx/vo_dy calculation is |
ff4758e8cfba
Change geometry for corevideo vo to not take dock into account.
reimar
parents:
35069
diff
changeset
|
531 // not aware of it. |
30001 | 532 // Also flip vo_dy since the screen origin is in the bottom left on OSX. |
31743 | 533 update_screen_info(); |
30001 | 534 [window setFrameTopLeftPoint:NSMakePoint( |
35071 | 535 vo_dx, |
536 2*xinerama_y + vo_screenheight - vo_dy)]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
537 |
29566
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
538 [self releaseVideoSpecific]; |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
539 error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[0], image_stride, NULL, NULL, NULL, &frameBuffers[0]); |
15289 | 540 if(error != kCVReturnSuccess) |
29210 | 541 mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create Pixel Buffer(%d)\n", error); |
25180 | 542 if (vo_doublebuffering) { |
34878
3e6cfa2053bf
Add a separate stride variable to make it easier to optimize later (e.g. align stride).
reimar
parents:
34876
diff
changeset
|
543 error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[1], image_stride, NULL, NULL, NULL, &frameBuffers[1]); |
25180 | 544 if(error != kCVReturnSuccess) |
29210 | 545 mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create Pixel Double Buffer(%d)\n", error); |
25180 | 546 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
547 |
25180 | 548 error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture); |
15289 | 549 if(error != kCVReturnSuccess) |
29210 | 550 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
|
551 |
35080
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
552 vo_fs = flags & VOFLAG_FULLSCREEN; |
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
553 |
35083 | 554 [self rootwin]; |
15726 | 555 |
556 if(vo_fs) | |
35066
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
557 [self fullscreen: NO]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
558 |
35083 | 559 [self ontop]; |
35081
65f3a403ab3e
Set up things like fullscreen status etc. before showing the window.
reimar
parents:
35080
diff
changeset
|
560 |
65f3a403ab3e
Set up things like fullscreen status etc. before showing the window.
reimar
parents:
35080
diff
changeset
|
561 //show window |
65f3a403ab3e
Set up things like fullscreen status etc. before showing the window.
reimar
parents:
35080
diff
changeset
|
562 [window makeKeyAndOrderFront:self]; |
15289 | 563 } |
564 | |
565 /* | |
15570 | 566 Init Menu |
567 */ | |
568 - (void)initMenu | |
569 { | |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
570 NSMenu *mainMenu = [[NSMenu alloc] init]; |
21395 | 571 NSMenu *menu, *aspectMenu; |
15570 | 572 NSMenuItem *menuItem; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
573 |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
574 menu = [[NSMenu alloc] init]; |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
575 menuItem = [[NSMenuItem alloc] init]; |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
576 [menuItem setSubmenu:menu]; |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
577 [mainMenu addItem:menuItem]; |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
578 // Note: setAppleMenu seems to be unnecessary from 10.6 on, |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
579 // but is needed for all earlier versions or the menu is |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
580 // messed up. |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
581 // Round-about way with performSelector used to avoid compiler |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
582 // warnings. |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
583 [NSApp performSelector:@selector(setAppleMenu:) withObject:menu]; |
15570 | 584 |
585 //Create Movie Menu | |
586 menu = [[NSMenu alloc] initWithTitle:@"Movie"]; | |
587 menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem]; | |
588 kHalfScreenCmd = menuItem; | |
589 menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem]; | |
590 kNormalScreenCmd = menuItem; | |
591 menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem]; | |
592 kDoubleScreenCmd = menuItem; | |
593 menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem]; | |
594 kFullScreenCmd = menuItem; | |
31738 | 595 menuItem = [NSMenuItem separatorItem]; [menu addItem:menuItem]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
596 |
31742 | 597 aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"]; |
598 menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
599 if(vo_keepaspect) [menuItem setState:NSOnState]; | |
600 kKeepAspectCmd = menuItem; | |
601 menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
602 if(vo_panscan) [menuItem setState:NSOnState]; | |
603 kPanScanCmd = menuItem; | |
604 menuItem = [NSMenuItem separatorItem]; [aspectMenu addItem:menuItem]; | |
605 menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
606 kAspectOrgCmd = menuItem; | |
607 menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
608 kAspectFullCmd = menuItem; | |
609 menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
610 kAspectWideCmd = menuItem; | |
611 menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""]; | |
612 [menuItem setSubmenu:aspectMenu]; | |
613 [menu addItem:menuItem]; | |
614 [aspectMenu release]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
615 |
15570 | 616 //Add to menubar |
617 menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""]; | |
618 [menuItem setSubmenu:menu]; | |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
619 [mainMenu addItem:menuItem]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
620 |
15570 | 621 //Create Window Menu |
622 menu = [[NSMenu alloc] initWithTitle:@"Window"]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
623 |
15570 | 624 menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem]; |
625 menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem]; | |
626 | |
627 //Add to menubar | |
628 menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""]; | |
629 [menuItem setSubmenu:menu]; | |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
630 [mainMenu addItem:menuItem]; |
15570 | 631 [NSApp setWindowsMenu:menu]; |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
632 [NSApp setMainMenu:mainMenu]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
633 |
15570 | 634 [menu release]; |
635 [menuItem release]; | |
636 } | |
637 | |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
638 - (void)set_winSizeMult:(float)mult |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
639 { |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
640 NSRect frame; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
641 int d_width, d_height; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
642 aspect(&d_width, &d_height, A_NOZOOM); |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
643 |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
644 if (vo_fs) { |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
645 vo_fs = !vo_fs; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
646 [self fullscreen:NO]; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
647 } |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
648 |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
649 winSizeMult = mult; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
650 frame.size.width = d_width * mult; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
651 frame.size.height = d_height * mult; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
652 [window setContentSize: frame.size]; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
653 [self reshape]; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
654 } |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
655 |
15570 | 656 /* |
657 Menu Action | |
658 */ | |
659 - (void)menuAction:(id)sender | |
660 { | |
661 if(sender == kHalfScreenCmd) | |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
662 [self set_winSizeMult: 0.5]; |
15570 | 663 if(sender == kNormalScreenCmd) |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
664 [self set_winSizeMult: 1]; |
15570 | 665 if(sender == kDoubleScreenCmd) |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
666 [self set_winSizeMult: 2]; |
15570 | 667 if(sender == kFullScreenCmd) |
668 { | |
31736 | 669 vo_fs = !vo_fs; |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
670 [self fullscreen:NO]; |
15570 | 671 } |
672 | |
673 if(sender == kKeepAspectCmd) | |
674 { | |
31736 | 675 vo_keepaspect = !vo_keepaspect; |
15570 | 676 if(vo_keepaspect) |
677 [kKeepAspectCmd setState:NSOnState]; | |
678 else | |
679 [kKeepAspectCmd setState:NSOffState]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
680 |
15909 | 681 [self reshape]; |
15570 | 682 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
683 |
15570 | 684 if(sender == kPanScanCmd) |
685 { | |
31736 | 686 vo_panscan = !vo_panscan; |
15570 | 687 if(vo_panscan) |
688 [kPanScanCmd setState:NSOnState]; | |
689 else | |
690 [kPanScanCmd setState:NSOffState]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
691 |
35069 | 692 panscan_calc(); |
15570 | 693 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
694 |
15570 | 695 if(sender == kAspectOrgCmd) |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
696 change_movie_aspect(-1); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
697 |
15570 | 698 if(sender == kAspectFullCmd) |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
699 change_movie_aspect(4.0f/3.0f); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
700 |
15570 | 701 if(sender == kAspectWideCmd) |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
702 change_movie_aspect(16.0f/9.0f); |
15570 | 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 { | |
31739
923b5da53f65
Declare variables with proper types to avoid dangerous pointer casts.
reimar
parents:
31738
diff
changeset
|
722 int d_width, d_height; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
723 |
15289 | 724 NSRect frame = [self frame]; |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
725 vo_dwidth = frame.size.width; |
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
726 vo_dheight = frame.size.height; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
727 |
15289 | 728 glViewport(0, 0, frame.size.width, frame.size.height); |
729 glMatrixMode(GL_PROJECTION); | |
730 glLoadIdentity(); | |
731 glOrtho(0, frame.size.width, frame.size.height, 0, -1.0, 1.0); | |
732 glMatrixMode(GL_MODELVIEW); | |
733 glLoadIdentity(); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
734 |
15729 | 735 //set texture frame |
15289 | 736 if(vo_keepaspect) |
737 { | |
31739
923b5da53f65
Declare variables with proper types to avoid dangerous pointer casts.
reimar
parents:
31738
diff
changeset
|
738 aspect(&d_width, &d_height, A_WINZOOM); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
739 |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
740 textureFrame = NSMakeRect((vo_dwidth - d_width) / 2, (vo_dheight - d_height) / 2, d_width, d_height); |
15289 | 741 } |
742 else | |
743 { | |
15729 | 744 textureFrame = frame; |
15289 | 745 } |
746 } | |
747 | |
748 /* | |
749 Render frame | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
750 */ |
15289 | 751 - (void) render |
752 { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
753 glClear(GL_COLOR_BUFFER_BIT); |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
754 |
15289 | 755 glEnable(CVOpenGLTextureGetTarget(texture)); |
756 glBindTexture(CVOpenGLTextureGetTarget(texture), CVOpenGLTextureGetName(texture)); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
757 |
15289 | 758 glColor3f(1,1,1); |
759 glBegin(GL_QUADS); | |
15729 | 760 glTexCoord2f(upperLeft[0], upperLeft[1]); glVertex2i( textureFrame.origin.x-(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1)); |
25424 | 761 glTexCoord2f(lowerLeft[0], lowerLeft[1]); glVertex2i(textureFrame.origin.x-(vo_panscan_x >> 1), NSMaxY(textureFrame)+(vo_panscan_y >> 1)); |
762 glTexCoord2f(lowerRight[0], lowerRight[1]); glVertex2i(NSMaxX(textureFrame)+(vo_panscan_x >> 1), NSMaxY(textureFrame)+(vo_panscan_y >> 1)); | |
763 glTexCoord2f(upperRight[0], upperRight[1]); glVertex2i(NSMaxX(textureFrame)+(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1)); | |
15289 | 764 glEnd(); |
15339 | 765 glDisable(CVOpenGLTextureGetTarget(texture)); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
766 |
15339 | 767 //render resize box |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
768 if(!vo_fs) |
15339 | 769 { |
770 NSRect frame = [self frame]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
771 |
15339 | 772 glBegin(GL_LINES); |
773 glColor4f(0.2, 0.2, 0.2, 0.5); | |
774 glVertex2i(frame.size.width-1, frame.size.height-1); glVertex2i(frame.size.width-1, frame.size.height-1); | |
775 glVertex2i(frame.size.width-1, frame.size.height-5); glVertex2i(frame.size.width-5, frame.size.height-1); | |
776 glVertex2i(frame.size.width-1, frame.size.height-9); glVertex2i(frame.size.width-9, frame.size.height-1); | |
777 | |
778 glColor4f(0.4, 0.4, 0.4, 0.5); | |
779 glVertex2i(frame.size.width-1, frame.size.height-2); glVertex2i(frame.size.width-2, frame.size.height-1); | |
780 glVertex2i(frame.size.width-1, frame.size.height-6); glVertex2i(frame.size.width-6, frame.size.height-1); | |
781 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
|
782 |
15339 | 783 glColor4f(0.6, 0.6, 0.6, 0.5); |
784 glVertex2i(frame.size.width-1, frame.size.height-3); glVertex2i(frame.size.width-3, frame.size.height-1); | |
785 glVertex2i(frame.size.width-1, frame.size.height-7); glVertex2i(frame.size.width-7, frame.size.height-1); | |
786 glVertex2i(frame.size.width-1, frame.size.height-11); glVertex2i(frame.size.width-11, frame.size.height-1); | |
787 glEnd(); | |
788 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
789 |
15289 | 790 glFlush(); |
791 } | |
792 | |
793 /* | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
794 Create OpenGL texture from current frame & set texco |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
795 */ |
15289 | 796 - (void) setCurrentTexture |
797 { | |
798 CVReturn error = kCVReturnSuccess; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
799 |
29137
0f6fc0df2c23
fix a memory leak leading to ~80 bytes being leaked at each call to flip_page.
gpoirier
parents:
28837
diff
changeset
|
800 CVOpenGLTextureRelease(texture); |
25180 | 801 error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture); |
15289 | 802 if(error != kCVReturnSuccess) |
29210 | 803 mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL texture(%d)\n", error); |
15289 | 804 |
805 CVOpenGLTextureGetCleanTexCoords(texture, lowerLeft, lowerRight, upperRight, upperLeft); | |
806 } | |
807 | |
808 /* | |
809 redraw win rect | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
810 */ |
15289 | 811 - (void) drawRect: (NSRect *) bounds |
812 { | |
813 [self render]; | |
814 } | |
815 | |
816 /* | |
817 Toggle Fullscreen | |
818 */ | |
819 - (void) fullscreen: (BOOL) animate | |
820 { | |
821 static NSRect old_frame; | |
822 static NSRect old_view_frame; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
823 |
15573 | 824 panscan_calc(); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
825 |
15289 | 826 //go fullscreen |
827 if(vo_fs) | |
828 { | |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
829 if(!vo_rootwin) |
15327 | 830 { |
15882 | 831 SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); |
18057 | 832 CGDisplayHideCursor(kCGDirectMainDisplay); |
15327 | 833 mouseHide = YES; |
834 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
835 |
15289 | 836 old_frame = [window frame]; //save main window size & position |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
837 update_screen_info(); |
25413 | 838 |
35072 | 839 [window setFrame:NSMakeRect(xinerama_x, xinerama_y, vo_screenwidth, vo_screenheight) display:YES animate:animate]; //zoom-in window with nice useless sfx |
15289 | 840 old_view_frame = [self bounds]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
841 |
35072 | 842 [self setFrame:NSMakeRect(0, 0, vo_screenwidth, vo_screenheight)]; |
15289 | 843 [self setNeedsDisplay:YES]; |
844 [window setHasShadow:NO]; | |
845 } | |
846 else | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
847 { |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
848 SetSystemUIMode( kUIModeNormal, 0); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
849 |
18057 | 850 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 851 mouseHide = NO; |
852 | |
853 //revert window to previous setting | |
854 [self setFrame:old_view_frame]; | |
855 [self setNeedsDisplay:YES]; | |
16081
72c352edce8f
restore window shadow when quitting fullscreen mode
nplourde
parents:
15909
diff
changeset
|
856 [window setHasShadow:YES]; |
15289 | 857 [window setFrame:old_frame display:YES animate:animate];//zoom-out window with nice useless sfx |
858 } | |
859 } | |
860 | |
861 /* | |
862 Toggle ontop | |
863 */ | |
864 - (void) ontop | |
865 { | |
15320 | 866 if(vo_ontop) |
867 { | |
868 [window setLevel:NSScreenSaverWindowLevel]; | |
869 } | |
870 else | |
871 { | |
872 [window setLevel:NSNormalWindowLevel]; | |
873 } | |
15289 | 874 } |
875 | |
876 /* | |
15327 | 877 Toggle rootwin |
878 */ | |
879 - (void) rootwin | |
880 { | |
881 if(vo_rootwin) | |
882 { | |
883 [window setLevel:CGWindowLevelForKey(kCGDesktopWindowLevelKey)]; | |
884 [window orderBack:self]; | |
885 } | |
886 else | |
887 { | |
888 [window setLevel:NSNormalWindowLevel]; | |
889 } | |
890 } | |
891 | |
892 /* | |
15289 | 893 Check event for new event |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
894 */ |
15289 | 895 - (void) check_events |
896 { | |
31760
dc95a7191375
Move variable into the only function where it is used.
reimar
parents:
31759
diff
changeset
|
897 NSEvent *event; |
31759
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
898 int curTime = TickCount()/60; |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
899 |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
900 //automatically hide mouse cursor (and future on-screen control?) |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
901 if(vo_fs && !mouseHide && !vo_rootwin) |
31759
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
902 { |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
903 if(curTime - lastMouseHide >= 5 || lastMouseHide == 0) |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
904 { |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
905 CGDisplayHideCursor(kCGDirectMainDisplay); |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
906 mouseHide = TRUE; |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
907 lastMouseHide = curTime; |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
908 } |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
909 } |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
910 |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
911 //update activity every 30 seconds to prevent |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
912 //screensaver from starting up. |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
913 if(curTime - lastScreensaverUpdate >= 30 || lastScreensaverUpdate == 0) |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
914 { |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
915 UpdateSystemActivity(UsrActivity); |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
916 lastScreensaverUpdate = curTime; |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
917 } |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
918 |
31757
83423e6b288e
Simplify check_events: avoid seemingly pointless untilDate argument.
reimar
parents:
31756
diff
changeset
|
919 event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSEventTrackingRunLoopMode dequeue:YES]; |
25178 | 920 if (event == nil) |
921 return; | |
15289 | 922 [NSApp sendEvent:event]; |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
923 // Without SDL's bootstrap code (include SDL.h in mplayer.c), |
28837 | 924 // on Leopard, we have trouble to get the play window automatically focused |
925 // 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
|
926 #ifndef CONFIG_SDL |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
927 if (isLeopardOrLater && [event type] == NSAppKitDefined |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
928 && [event subtype] == NSApplicationActivatedEventType) { |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
929 [window makeMainWindow]; |
35066
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
930 [window makeKeyAndOrderFront:self]; |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
931 } |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
932 #endif |
15289 | 933 } |
934 | |
935 /* | |
15731 | 936 From NSView, respond to key equivalents. |
937 */ | |
938 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent | |
939 { | |
940 switch([theEvent keyCode]) | |
31742 | 941 { |
15731 | 942 case 0x21: [window setAlphaValue: winAlpha-=0.05]; return YES; |
943 case 0x1e: [window setAlphaValue: winAlpha+=0.05]; return YES; | |
31742 | 944 } |
15731 | 945 return NO; |
946 } | |
947 | |
948 /* | |
15289 | 949 Process key event |
950 */ | |
951 - (void) keyDown: (NSEvent *) theEvent | |
952 { | |
29533
9c8f8e375823
Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
reimar
parents:
29272
diff
changeset
|
953 int key = convert_key([theEvent keyCode], *[[theEvent characters] UTF8String]); |
9c8f8e375823
Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
reimar
parents:
29272
diff
changeset
|
954 if (key != -1) |
15289 | 955 mplayer_put_key(key); |
956 } | |
957 | |
958 /* | |
959 Process mouse button event | |
960 */ | |
961 - (void) mouseMoved: (NSEvent *) theEvent | |
962 { | |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
963 if(vo_fs && !vo_rootwin) |
15289 | 964 { |
18057 | 965 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 966 mouseHide = NO; |
967 } | |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
968 if (enable_mouse_movements && !vo_rootwin) { |
25446 | 969 NSPoint p =[self convertPoint:[theEvent locationInWindow] fromView:nil]; |
35079 | 970 if ([self mouse:p inRect:[self frame]]) { |
971 vo_mouse_movement(p.x, [self frame].size.height - p.y); | |
25446 | 972 } |
973 } | |
15289 | 974 } |
975 | |
976 - (void) mouseDown: (NSEvent *) theEvent | |
977 { | |
978 [self mouseEvent: theEvent]; | |
979 } | |
980 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
981 - (void) mouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
982 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
983 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
984 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
985 |
15289 | 986 - (void) rightMouseDown: (NSEvent *) theEvent |
987 { | |
988 [self mouseEvent: theEvent]; | |
989 } | |
990 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
991 - (void) rightMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
992 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
993 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
994 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
995 |
15289 | 996 - (void) otherMouseDown: (NSEvent *) theEvent |
997 { | |
998 [self mouseEvent: theEvent]; | |
999 } | |
1000 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1001 - (void) otherMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1002 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1003 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1004 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1005 |
15289 | 1006 - (void) scrollWheel: (NSEvent *) theEvent |
1007 { | |
1008 if([theEvent deltaY] > 0) | |
1009 mplayer_put_key(MOUSE_BTN3); | |
1010 else | |
1011 mplayer_put_key(MOUSE_BTN4); | |
1012 } | |
1013 | |
1014 - (void) mouseEvent: (NSEvent *) theEvent | |
1015 { | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1016 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
|
1017 { |
25422 | 1018 int buttonNumber = [theEvent buttonNumber]; |
1019 // Fix to mplayer defined button order: left, middle, right | |
1020 if (buttonNumber == 1) | |
1021 buttonNumber = 2; | |
25423 | 1022 else if (buttonNumber == 2) |
1023 buttonNumber = 1; | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1024 switch([theEvent type]) |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1025 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1026 case NSLeftMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1027 case NSRightMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1028 case NSOtherMouseDown: |
25422 | 1029 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
|
1030 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1031 case NSLeftMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1032 case NSRightMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1033 case NSOtherMouseUp: |
25422 | 1034 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
|
1035 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1036 } |
15289 | 1037 } |
1038 } | |
1039 | |
1040 /* | |
1041 NSResponder | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
1042 */ |
15289 | 1043 - (BOOL) acceptsFirstResponder |
1044 { | |
1045 return YES; | |
1046 } | |
1047 | |
1048 - (BOOL) becomeFirstResponder | |
1049 { | |
1050 return YES; | |
1051 } | |
1052 | |
1053 - (BOOL) resignFirstResponder | |
1054 { | |
1055 return YES; | |
1056 } | |
15325 | 1057 |
31756
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
1058 - (BOOL)windowShouldClose:(id)sender |
15325 | 1059 { |
31735
3bb00f5abe8e
Send KEY_CLOSE_WIN instead of KEY_ESC when the user requested
reimar
parents:
31049
diff
changeset
|
1060 mplayer_put_key(KEY_CLOSE_WIN); |
31756
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
1061 // We have to wait for MPlayer to handle this, |
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
1062 // otherwise we are in trouble if the |
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
1063 // KEY_CLOSE_WIN handler is disabled |
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
1064 return NO; |
15325 | 1065 } |
31758 | 1066 |
1067 - (void)handleQuitEvent:(NSAppleEventDescriptor*)e withReplyEvent:(NSAppleEventDescriptor*)r | |
1068 { | |
1069 mplayer_put_key(KEY_CLOSE_WIN); | |
1070 } | |
15325 | 1071 @end |