annotate libvo/vo_macosx.m @ 25157:cf3b6015735d

Set protocol for the vo proxy used in shared-buffer mode. NOTE: You have to update your mplayerosx to svn r148 or newer to work with it. This change will speed up vo proxy and fix all these warnings: vo_macosx.m: In function 'config': vo_macosx.m:165: warning: 'NSProxy' may not respond to '-startWithWidth:withHeight:withBytes:withAspect:' vo_macosx.m:165: warning: (Messages without a matching method signature vo_macosx.m:165: warning: will be assumed to return 'id' and accept vo_macosx.m:165: warning: '...' as arguments.) vo_macosx.m: In function 'flip_page': vo_macosx.m:183: warning: 'NSProxy' may not respond to '-render' vo_macosx.m: In function 'uninit': vo_macosx.m:235: warning: 'NSProxy' may not respond to '-stop' vo_macosx.m: In function 'control': vo_macosx.m:334: warning: 'NSProxy' may not respond to '-ontop' vo_macosx.m:336: warning: 'NSProxy' may not respond to '-toggleFullscreen'
author ulion
date Wed, 28 Nov 2007 00:01:35 +0000
parents 6f2f5c2dea52
children e9d23081b4ab
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
2 vo_macosx.m
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
3 by Nicolas Plourde <nicolasplourde@gmail.com>
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
4
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
5 MPlayer Mac OSX video out module.
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
6 Copyright (c) Nicolas Plourde - 2005
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
7 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
8
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
9 #import "vo_macosx.h"
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
10 #include <sys/types.h>
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
11 #include <sys/ipc.h>
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
12 #include <sys/shm.h>
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
13
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
14 //MPLAYER
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
15 #include "config.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
16 #include "fastmemcpy.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
17 #include "video_out.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
18 #include "video_out_internal.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
19 #include "aspect.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
20 #include "mp_msg.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
21 #include "m_option.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
22
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
23 #include "input/input.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
24 #include "input/mouse.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
25
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
26 #include "osdep/keycodes.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
27
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
28 //Cocoa
25157
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
29 NSDistantObject *mplayerosxProxy;
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
30 id <MPlayerOSXVOProto> mplayerosxProto;
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
31 MPlayerOpenGLView *mpGLView;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
32 NSAutoreleasePool *autoreleasepool;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
33 OSType pixelFormat;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
34
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
35 //shared memory
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
36 int shm_id;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
37 struct shmid_ds shm_desc;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
38 BOOL shared_buffer = false;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
39
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
40 //Screen
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
41 int screen_id;
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
42 BOOL screen_force;
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
43 NSRect screen_frame;
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
44 NSScreen *screen_handle;
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
45 NSArray *screen_array;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
46
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
47 //image
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
48 unsigned char *image_data;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
49 static uint32_t image_width;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
50 static uint32_t image_height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
51 static uint32_t image_depth;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
52 static uint32_t image_bytes;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
53 static uint32_t image_format;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
54
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
55 //vo
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
56 static int isFullscreen;
15320
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
57 static int isOntop;
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
58 static int isRootwin;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
59 extern float monitor_aspect;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
60 extern float movie_aspect;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
61 static float old_movie_aspect;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
62
15731
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
63 static float winAlpha = 1;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
64 static int int_pause = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
65
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
66 static vo_info_t info =
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
67 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
68 "Mac OSX Core Video",
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
69 "macosx",
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
70 "Nicolas Plourde <nicolas.plourde@gmail.com>",
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
71 ""
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
72 };
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
73
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
74 LIBVO_EXTERN(macosx)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
75
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
76 extern void mplayer_put_key(int code);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
77 extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
78
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
79 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
80 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
81 switch (image_format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
82 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
83 case IMGFMT_RGB32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
84 vo_draw_alpha_rgb32(w,h,src,srca,stride,image_data+4*(y0*image_width+x0),4*image_width);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
85 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
86 case IMGFMT_YUY2:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
87 vo_draw_alpha_yuy2(w,h,src,srca,stride,image_data + (x0 + y0 * image_width) * 2,image_width*2);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
88 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
89 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
90 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
91
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16145
diff changeset
92 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
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
93 {
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
94
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
95 //init screen
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
96 screen_array = [NSScreen screens];
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
97 if(screen_id < [screen_array count])
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
98 {
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
99 screen_handle = [screen_array objectAtIndex:screen_id];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
100 }
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
101 else
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
102 {
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
103 mp_msg(MSGT_VO, MSGL_FATAL, "Get device error: Device ID %d do not exist, falling back to main device.\n", screen_id);
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
104 screen_handle = [screen_array objectAtIndex:0];
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
105 screen_id = 0;
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
106 }
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
107 screen_frame = [screen_handle frame];
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
108
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
109 //misc mplayer setup
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
110 image_width = width;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
111 image_height = height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
112 switch (image_format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
113 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
114 case IMGFMT_BGR32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
115 case IMGFMT_RGB32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
116 image_depth = 32;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
117 break;
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
118 case IMGFMT_YUY2:
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
119 image_depth = 16;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
120 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
121 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
122 image_bytes = (image_depth + 7) / 8;
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
123
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
124 if(!shared_buffer)
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
125 {
25120
9b4ca4dc1294 Fix a memory leak when working in shared_buffer mode.
ulion
parents: 25114
diff changeset
126 image_data = malloc(image_width*image_height*image_bytes);
9b4ca4dc1294 Fix a memory leak when working in shared_buffer mode.
ulion
parents: 25114
diff changeset
127
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
128 monitor_aspect = (float)screen_frame.size.width/(float)screen_frame.size.height;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
129
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
130 //set aspect
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
131 panscan_init();
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
132 aspect_save_orig(width,height);
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
133 aspect_save_prescale(d_width,d_height);
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
134 aspect_save_screenres(screen_frame.size.width, screen_frame.size.height);
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
135 aspect((int *)&d_width,(int *)&d_height,A_NOZOOM);
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
136
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
137 movie_aspect = (float)d_width/(float)d_height;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
138 old_movie_aspect = movie_aspect;
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
139
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
140 vo_fs = flags & VOFLAG_FULLSCREEN;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
141
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
142 //config OpenGL View
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
143 [mpGLView config];
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
144 [mpGLView reshape];
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
145 }
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
146 else
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
147 {
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
148 movie_aspect = (float)d_width/(float)d_height;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
149
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
150 shm_id = shmget(9849, image_width*image_height*image_bytes, IPC_CREAT | 0666);
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
151 if (shm_id == -1)
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
152 {
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
153 perror("vo_mplayer shmget: ");
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
154 return 1;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
155 }
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
156
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
157 image_data = shmat(shm_id, NULL, 0);
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
158 if (!image_data)
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
159 {
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
160 perror("vo_mplayer shmat: ");
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
161 return 1;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
162 }
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
163
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
164 //connnect to mplayerosx
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
165 mplayerosxProxy=[NSConnection rootProxyForConnectionWithRegisteredName:@"mplayerosx" host:nil];
25157
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
166 if ([mplayerosxProxy conformsToProtocol:@protocol(MPlayerOSXVOProto)]) {
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
167 [mplayerosxProxy setProtocolForProxy:@protocol(MPlayerOSXVOProto)];
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
168 mplayerosxProto = (id <MPlayerOSXVOProto>)mplayerosxProxy;
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
169 [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
170 }
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
171 else {
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
172 [mplayerosxProxy release];
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
173 mplayerosxProxy = nil;
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
174 mplayerosxProto = nil;
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
175 }
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
176 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
177 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
178 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
179
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
180 static void check_events(void)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
181 {
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
182 [mpGLView check_events];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
183 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
184
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
185 static void draw_osd(void)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
186 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
187 vo_draw_text(image_width, image_height, draw_alpha);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
188 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
189
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
190 static void flip_page(void)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
191 {
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
192 if(shared_buffer)
25157
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
193 [mplayerosxProto render];
25114
bed4188998ca Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents: 25078
diff changeset
194 else {
bed4188998ca Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents: 25078
diff changeset
195 [mpGLView setCurrentTexture];
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
196 [mpGLView render];
25114
bed4188998ca Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents: 25078
diff changeset
197 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
198 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
199
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16145
diff changeset
200 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
201 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
202 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
203 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
204
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
205
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16145
diff changeset
206 static int draw_frame(uint8_t *src[])
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
207 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
208 switch (image_format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
209 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
210 case IMGFMT_BGR32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
211 case IMGFMT_RGB32:
23457
a124f3abc1ec Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents: 23381
diff changeset
212 fast_memcpy(image_data, src[0], image_width*image_height*image_bytes);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
213 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
214
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
215 case IMGFMT_YUY2:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
216 memcpy_pic(image_data, src[0], image_width * 2, image_height, image_width * 2, image_width * 2);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
217 break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
218 }
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
219
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
220 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
221 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
222
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16145
diff changeset
223 static int query_format(uint32_t format)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
224 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
225 image_format = format;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
226
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
227 switch(format)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
228 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
229 case IMGFMT_YUY2:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
230 pixelFormat = kYUVSPixelFormat;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
231 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
232
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
233 case IMGFMT_RGB32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
234 case IMGFMT_BGR32:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
235 pixelFormat = k32ARGBPixelFormat;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
236 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
237 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
238 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
239 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
240
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
241 static void uninit(void)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
242 {
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
243 if(shared_buffer)
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
244 {
25157
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
245 [mplayerosxProto stop];
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 [mplayerosxProxy release];
cf3b6015735d Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents: 25137
diff changeset
248 mplayerosxProxy = nil;
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
249
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
250 if (shmdt(image_data) == -1)
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
251 mp_msg(MSGT_VO, MSGL_FATAL, "uninit: shmdt failed\n");
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
252
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
253 if (shmctl(shm_id, IPC_RMID, &shm_desc) == -1)
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
254 mp_msg(MSGT_VO, MSGL_FATAL, "uninit: shmctl failed\n");
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
255 }
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
256
21551
c35115c05c64 vo_macosx, fix crash when closing window
nplourde
parents: 21546
diff changeset
257 SetSystemUIMode( kUIModeNormal, 0);
c35115c05c64 vo_macosx, fix crash when closing window
nplourde
parents: 21546
diff changeset
258 CGDisplayShowCursor(kCGDirectMainDisplay);
c35115c05c64 vo_macosx, fix crash when closing window
nplourde
parents: 21546
diff changeset
259
c35115c05c64 vo_macosx, fix crash when closing window
nplourde
parents: 21546
diff changeset
260 if(mpGLView)
c35115c05c64 vo_macosx, fix crash when closing window
nplourde
parents: 21546
diff changeset
261 {
25136
e029d2fcd20f Fix warning:
ulion
parents: 25121
diff changeset
262 NSAutoreleasePool *finalPool;
24742
0bef706332b5 Fix deallocate bug which sometimes causes a crash when reinitializing.
nplourde
parents: 24698
diff changeset
263 mpGLView = nil;
21551
c35115c05c64 vo_macosx, fix crash when closing window
nplourde
parents: 21546
diff changeset
264 [autoreleasepool release];
25136
e029d2fcd20f Fix warning:
ulion
parents: 25121
diff changeset
265 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
266 [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
267 [finalPool release];
21551
c35115c05c64 vo_macosx, fix crash when closing window
nplourde
parents: 21546
diff changeset
268 }
25121
786b99c1ff94 Fix memory leak of image_data.
ulion
parents: 25120
diff changeset
269 if (!shared_buffer)
786b99c1ff94 Fix memory leak of image_data.
ulion
parents: 25120
diff changeset
270 {
786b99c1ff94 Fix memory leak of image_data.
ulion
parents: 25120
diff changeset
271 free(image_data);
786b99c1ff94 Fix memory leak of image_data.
ulion
parents: 25120
diff changeset
272 image_data = NULL;
786b99c1ff94 Fix memory leak of image_data.
ulion
parents: 25120
diff changeset
273 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
274 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
275
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16145
diff changeset
276 static int preinit(const char *arg)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
277 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
278 int parse_err = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
279
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
280 if(arg)
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
281 {
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
282 char *parse_pos = (char *)&arg[0];
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
283 while (parse_pos[0] && !parse_err)
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
284 {
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
285 if (strncmp (parse_pos, "device_id=", 10) == 0)
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
286 {
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
287 parse_pos = &parse_pos[10];
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
288 screen_id = strtol(parse_pos, &parse_pos, 0);
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
289 screen_force = YES;
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
290 }
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
291 if (strncmp (parse_pos, "shared_buffer", 13) == 0)
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
292 {
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
293 parse_pos = &parse_pos[13];
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
294 shared_buffer = YES;
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
295 }
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
296 if (parse_pos[0] == ':') parse_pos = &parse_pos[1];
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
297 else if (parse_pos[0]) parse_err = 1;
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
298 }
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
299 }
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
300
15737
0c3939433cef set nsapp and setup cocoa with NSApplicationLoad
nplourde
parents: 15736
diff changeset
301 NSApplicationLoad();
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
302 autoreleasepool = [[NSAutoreleasePool alloc] init];
15737
0c3939433cef set nsapp and setup cocoa with NSApplicationLoad
nplourde
parents: 15736
diff changeset
303 NSApp = [NSApplication sharedApplication];
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
304
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
305 if(!shared_buffer)
16144
6ea7c0735fce properly release window
nplourde
parents: 16081
diff changeset
306 {
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
307 #if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
308 //this chunk of code is heavily based off SDL_macosx.m from SDL
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
309 //it uses an Apple private function to request foreground operation
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
310 void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
311 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
312 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
313
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
314 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
315 {
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
316 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
317 {
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
318 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
319 {
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
320 CPSEnableForegroundOperation(&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
321 }
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
322 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
323 }
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
324 }
22ec2e9cb530 do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents: 16385
diff changeset
325 #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
326
16385
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
327 if(!mpGLView)
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
328 {
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
329 mpGLView = [[MPlayerOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:[MPlayerOpenGLView defaultPixelFormat]];
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
330 [mpGLView autorelease];
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
331 }
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
332
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
333 [mpGLView display];
35b310d35aa0 mplayer osx shared video buffer
nplourde
parents: 16171
diff changeset
334 [mpGLView preinit];
16144
6ea7c0735fce properly release window
nplourde
parents: 16081
diff changeset
335 }
6ea7c0735fce properly release window
nplourde
parents: 16081
diff changeset
336
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
337 return 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
338 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
339
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 16145
diff changeset
340 static int control(uint32_t request, void *data, ...)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
341 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
342 switch (request)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
343 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
344 case VOCTRL_PAUSE: return (int_pause=1);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
345 case VOCTRL_RESUME: return (int_pause=0);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
346 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
347 case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE;
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
348 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
349 case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); if(!shared_buffer){ [mpGLView fullscreen: NO]; } else { [mplayerosxProto toggleFullscreen]; } return VO_TRUE;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
350 case VOCTRL_GET_PANSCAN: return VO_TRUE;
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
351 case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
352 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
353 return VO_NOTIMPL;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
354 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
355
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
356 //////////////////////////////////////////////////////////////////////////
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
357 // NSOpenGLView Subclass
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
358 //////////////////////////////////////////////////////////////////////////
15611
2f77a2da1d82 Function name cleanup
nplourde
parents: 15610
diff changeset
359 @implementation MPlayerOpenGLView
24076
7ac48ed8c394 Functions that do not return a value must be void
reimar
parents: 24074
diff changeset
360 - (void) preinit
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
361 {
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
362 //init menu
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
363 [self initMenu];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
364
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
365 //create window
15747
fbf14e1ab725 osx 10.3 dont like to have a window init with no size
nplourde
parents: 15737
diff changeset
366 window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
367 styleMask:NSTitledWindowMask|NSTexturedBackgroundWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
368 backing:NSBackingStoreBuffered defer:NO];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
369
16144
6ea7c0735fce properly release window
nplourde
parents: 16081
diff changeset
370 [window autorelease];
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
371 [window setDelegate:mpGLView];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
372 [window setContentView:mpGLView];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
373 [window setInitialFirstResponder:mpGLView];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
374 [window setAcceptsMouseMovedEvents:YES];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
375 [window setTitle:@"MPlayer - The Movie Player"];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
376
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
377 isFullscreen = 0;
15855
1ca8b5873c3f keep window size when changing aspect
nplourde
parents: 15854
diff changeset
378 winSizeMult = 1;
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
379 }
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
380
24076
7ac48ed8c394 Functions that do not return a value must be void
reimar
parents: 24074
diff changeset
381 - (void) config
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
382 {
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
383 uint32_t d_width;
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
384 uint32_t d_height;
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
385
25137
6f2f5c2dea52 Fix warning on Leopard, tested ok on Tiger:
ulion
parents: 25136
diff changeset
386 GLint swapInterval = 1;
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
387
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
388 NSRect frame;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
389 CVReturn error = kCVReturnSuccess;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
390
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
391 //config window
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
392 aspect((int *)&d_width, (int *)&d_height,A_NOZOOM);
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
393 frame = NSMakeRect(0, 0, d_width, d_height);
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
394 [window setContentSize: frame.size];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
395
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
396 //create OpenGL Context
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
397 glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil];
15647
0968fd3d5675 Pure cosmetic
nplourde
parents: 15612
diff changeset
398
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
399 [self setOpenGLContext:glContext];
15647
0968fd3d5675 Pure cosmetic
nplourde
parents: 15612
diff changeset
400 [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
401 [glContext setView:self];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
402 [glContext makeCurrentContext];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
403
15647
0968fd3d5675 Pure cosmetic
nplourde
parents: 15612
diff changeset
404 error = CVPixelBufferCreateWithBytes( NULL, image_width, image_height, pixelFormat, image_data, image_width*image_bytes, NULL, NULL, NULL, &currentFrameBuffer);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
405 if(error != kCVReturnSuccess)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
406 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create Pixel Buffer(%d)\n", error);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
407
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
408 error = CVOpenGLTextureCacheCreate(NULL, 0, [glContext CGLContextObj], [[self pixelFormat] CGLPixelFormatObj], 0, &textureCache);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
409 if(error != kCVReturnSuccess)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
410 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture Cache(%d)\n", error);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
411
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
412 error = CVOpenGLTextureCacheCreateTextureFromImage( NULL, textureCache, currentFrameBuffer, 0, &texture);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
413 if(error != kCVReturnSuccess)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
414 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
415
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
416 //show window
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
417 [window center];
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
418 [window makeKeyAndOrderFront:mpGLView];
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
419
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
420 if(vo_rootwin)
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
421 [mpGLView rootwin];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
422
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
423 if(vo_fs)
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
424 [mpGLView fullscreen: NO];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
425
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
426 if(vo_ontop)
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
427 [mpGLView ontop];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
428 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
429
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
430 /*
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
431 Init Menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
432 */
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
433 - (void)initMenu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
434 {
21395
dd05dd9e3e7b Fix declarations vs statements warning.
diego
parents: 18878
diff changeset
435 NSMenu *menu, *aspectMenu;
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
436 NSMenuItem *menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
437
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
438 [NSApp setMainMenu:[[NSMenu alloc] init]];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
439
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
440 //Create Movie Menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
441 menu = [[NSMenu alloc] initWithTitle:@"Movie"];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
442 menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
443 kHalfScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
444 menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
445 kNormalScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
446 menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
447 kDoubleScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
448 menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
449 kFullScreenCmd = menuItem;
15909
b1bc923b38fe resize video after keep aspect menu item toggle
nplourde
parents: 15902
diff changeset
450 menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [menu addItem:menuItem];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
451
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
452 aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
453 menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
454 if(vo_keepaspect) [menuItem setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
455 kKeepAspectCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
456 menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
457 if(vo_panscan) [menuItem setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
458 kPanScanCmd = menuItem;
15909
b1bc923b38fe resize video after keep aspect menu item toggle
nplourde
parents: 15902
diff changeset
459 menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [aspectMenu addItem:menuItem];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
460 menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
461 kAspectOrgCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
462 menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
463 kAspectFullCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
464 menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
465 kAspectWideCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
466 menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
467 [menuItem setSubmenu:aspectMenu];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
468 [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
469 [aspectMenu release];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
470
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
471 //Add to menubar
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
472 menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
473 [menuItem setSubmenu:menu];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
474 [[NSApp mainMenu] addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
475
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
476 //Create Window Menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
477 menu = [[NSMenu alloc] initWithTitle:@"Window"];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
478
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
479 menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
480 menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
481
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
482 //Add to menubar
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
483 menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
484 [menuItem setSubmenu:menu];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
485 [[NSApp mainMenu] addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
486 [NSApp setWindowsMenu:menu];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
487
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
488 [menu release];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
489 [menuItem release];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
490 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
491
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
492 /*
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
493 Menu Action
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
494 */
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
495 - (void)menuAction:(id)sender
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
496 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
497 uint32_t d_width;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
498 uint32_t d_height;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
499 NSRect frame;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
500
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
501 aspect((int *)&d_width, (int *)&d_height,A_NOZOOM);
15731
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
502
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
503 if(sender == kQuitCmd)
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
504 {
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
505 mplayer_put_key(KEY_ESC);
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
506 }
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
507
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
508 if(sender == kHalfScreenCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
509 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
510 if(isFullscreen) {
21546
253a1e98bfe3 vo_macosx.m disable window animation when going to fullscreen
nplourde
parents: 21395
diff changeset
511 vo_fs = (!(vo_fs)); [self fullscreen:NO];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
512 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
513
15855
1ca8b5873c3f keep window size when changing aspect
nplourde
parents: 15854
diff changeset
514 winSizeMult = 0.5;
1ca8b5873c3f keep window size when changing aspect
nplourde
parents: 15854
diff changeset
515 frame.size.width = (d_width*winSizeMult);
1ca8b5873c3f keep window size when changing aspect
nplourde
parents: 15854
diff changeset
516 frame.size.height = ((d_width/movie_aspect)*winSizeMult);
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
517 [window setContentSize: frame.size];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
518 [self reshape];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
519 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
520 if(sender == kNormalScreenCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
521 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
522 if(isFullscreen) {
21546
253a1e98bfe3 vo_macosx.m disable window animation when going to fullscreen
nplourde
parents: 21395
diff changeset
523 vo_fs = (!(vo_fs)); [self fullscreen:NO];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
524 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
525
15855
1ca8b5873c3f keep window size when changing aspect
nplourde
parents: 15854
diff changeset
526 winSizeMult = 1;
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
527 frame.size.width = d_width;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
528 frame.size.height = d_width/movie_aspect;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
529 [window setContentSize: frame.size];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
530 [self reshape];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
531 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
532 if(sender == kDoubleScreenCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
533 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
534 if(isFullscreen) {
21546
253a1e98bfe3 vo_macosx.m disable window animation when going to fullscreen
nplourde
parents: 21395
diff changeset
535 vo_fs = (!(vo_fs)); [self fullscreen:NO];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
536 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
537
15855
1ca8b5873c3f keep window size when changing aspect
nplourde
parents: 15854
diff changeset
538 winSizeMult = 2;
1ca8b5873c3f keep window size when changing aspect
nplourde
parents: 15854
diff changeset
539 frame.size.width = d_width*winSizeMult;
1ca8b5873c3f keep window size when changing aspect
nplourde
parents: 15854
diff changeset
540 frame.size.height = (d_width/movie_aspect)*winSizeMult;
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
541 [window setContentSize: frame.size];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
542 [self reshape];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
543 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
544 if(sender == kFullScreenCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
545 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
546 vo_fs = (!(vo_fs));
21546
253a1e98bfe3 vo_macosx.m disable window animation when going to fullscreen
nplourde
parents: 21395
diff changeset
547 [self fullscreen:NO];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
548 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
549
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
550 if(sender == kKeepAspectCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
551 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
552 vo_keepaspect = (!(vo_keepaspect));
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
553 if(vo_keepaspect)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
554 [kKeepAspectCmd setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
555 else
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
556 [kKeepAspectCmd setState:NSOffState];
15909
b1bc923b38fe resize video after keep aspect menu item toggle
nplourde
parents: 15902
diff changeset
557
b1bc923b38fe resize video after keep aspect menu item toggle
nplourde
parents: 15902
diff changeset
558 [self reshape];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
559 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
560
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
561 if(sender == kPanScanCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
562 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
563 vo_panscan = (!(vo_panscan));
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
564 if(vo_panscan)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
565 [kPanScanCmd setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
566 else
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
567 [kPanScanCmd setState:NSOffState];
15902
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
568
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
569 [self panscan];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
570 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
571
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
572 if(sender == kAspectOrgCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
573 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
574 movie_aspect = old_movie_aspect;
15902
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
575
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
576 if(isFullscreen)
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
577 {
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
578 [self reshape];
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
579 }
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
580 else
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
581 {
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
582 frame.size.width = d_width*winSizeMult;
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
583 frame.size.height = (d_width/movie_aspect)*winSizeMult;
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
584 [window setContentSize: frame.size];
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
585 [self reshape];
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
586 }
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
587 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
588
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
589 if(sender == kAspectFullCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
590 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
591 movie_aspect = 4.0f/3.0f;
15882
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
592
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
593 if(isFullscreen)
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
594 {
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
595 [self reshape];
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
596 }
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
597 else
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
598 {
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
599 frame.size.width = d_width*winSizeMult;
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
600 frame.size.height = (d_width/movie_aspect)*winSizeMult;
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
601 [window setContentSize: frame.size];
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
602 [self reshape];
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
603 }
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
604 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
605
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
606 if(sender == kAspectWideCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
607 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
608 movie_aspect = 16.0f/9.0f;
15882
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
609
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
610 if(isFullscreen)
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
611 {
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
612 [self reshape];
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
613 }
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
614 else
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
615 {
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
616 frame.size.width = d_width*winSizeMult;
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
617 frame.size.height = (d_width/movie_aspect)*winSizeMult;
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
618 [window setContentSize: frame.size];
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
619 [self reshape];
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
620 }
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
621 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
622 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
623
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
624 /*
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
625 Setup OpenGL
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
626 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
627 - (void)prepareOpenGL
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
628 {
15339
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
629 glEnable(GL_BLEND);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
630 glDisable(GL_DEPTH_TEST);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
631 glDepthMask(GL_FALSE);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
632 glDisable(GL_CULL_FACE);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
633 [self reshape];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
634 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
635
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
636 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
637 reshape OpenGL viewport
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
638 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
639 - (void)reshape
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
640 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
641 uint32_t d_width;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
642 uint32_t d_height;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
643 float aspectX;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
644 float aspectY;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
645 int padding = 0;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
646
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
647 NSRect frame = [self frame];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
648
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
649 glViewport(0, 0, frame.size.width, frame.size.height);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
650 glMatrixMode(GL_PROJECTION);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
651 glLoadIdentity();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
652 glOrtho(0, frame.size.width, frame.size.height, 0, -1.0, 1.0);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
653 glMatrixMode(GL_MODELVIEW);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
654 glLoadIdentity();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
655
15729
55aaeb7b6aae new texture frame
nplourde
parents: 15728
diff changeset
656 //set texture frame
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
657 if(vo_keepaspect)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
658 {
15571
ab43da229a76 fix signess warning
nplourde
parents: 15570
diff changeset
659 aspect( (int *)&d_width, (int *)&d_height, A_NOZOOM);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
660 d_height = ((float)d_width/movie_aspect);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
661
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
662 aspectX = (float)((float)frame.size.width/(float)d_width);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
663 aspectY = (float)((float)(frame.size.height)/(float)d_height);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
664
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
665 if((d_height*aspectX)>(frame.size.height))
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
666 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
667 padding = (frame.size.width - d_width*aspectY)/2;
15729
55aaeb7b6aae new texture frame
nplourde
parents: 15728
diff changeset
668 textureFrame = NSMakeRect(padding, 0, d_width*aspectY+padding, d_height*aspectY);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
669 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
670 else
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
671 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
672 padding = ((frame.size.height) - d_height*aspectX)/2;
15729
55aaeb7b6aae new texture frame
nplourde
parents: 15728
diff changeset
673 textureFrame = NSMakeRect(0, padding, d_width*aspectX, d_height*aspectX+padding);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
674 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
675 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
676 else
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
677 {
15729
55aaeb7b6aae new texture frame
nplourde
parents: 15728
diff changeset
678 textureFrame = frame;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
679 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
680 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
681
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
682 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
683 Render frame
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
684 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
685 - (void) render
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
686 {
21395
dd05dd9e3e7b Fix declarations vs statements warning.
diego
parents: 18878
diff changeset
687 int curTime;
24953
aca7d0259d90 Fix the prevent system idle code. Original code also works, but not as expected.
ulion
parents: 24742
diff changeset
688 static int lastTime = 0;
21395
dd05dd9e3e7b Fix declarations vs statements warning.
diego
parents: 18878
diff changeset
689
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
690 glClear(GL_COLOR_BUFFER_BIT);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
691
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
692 glEnable(CVOpenGLTextureGetTarget(texture));
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
693 glBindTexture(CVOpenGLTextureGetTarget(texture), CVOpenGLTextureGetName(texture));
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
694
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
695 glColor3f(1,1,1);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
696 glBegin(GL_QUADS);
15729
55aaeb7b6aae new texture frame
nplourde
parents: 15728
diff changeset
697 glTexCoord2f(upperLeft[0], upperLeft[1]); glVertex2i( textureFrame.origin.x-(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1));
55aaeb7b6aae new texture frame
nplourde
parents: 15728
diff changeset
698 glTexCoord2f(lowerLeft[0], lowerLeft[1]); glVertex2i( textureFrame.origin.x-(vo_panscan_x >> 1), textureFrame.size.height+(vo_panscan_y >> 1));
55aaeb7b6aae new texture frame
nplourde
parents: 15728
diff changeset
699 glTexCoord2f(lowerRight[0], lowerRight[1]); glVertex2i( textureFrame.size.width+(vo_panscan_x >> 1), textureFrame.size.height+(vo_panscan_y >> 1));
55aaeb7b6aae new texture frame
nplourde
parents: 15728
diff changeset
700 glTexCoord2f(upperRight[0], upperRight[1]); glVertex2i( textureFrame.size.width+(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1));
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
701 glEnd();
15339
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
702 glDisable(CVOpenGLTextureGetTarget(texture));
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
703
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
704 //render resize box
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
705 if(!isFullscreen)
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
706 {
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
707 NSRect frame = [self frame];
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
708
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
709 glBegin(GL_LINES);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
710 glColor4f(0.2, 0.2, 0.2, 0.5);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
711 glVertex2i(frame.size.width-1, frame.size.height-1); glVertex2i(frame.size.width-1, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
712 glVertex2i(frame.size.width-1, frame.size.height-5); glVertex2i(frame.size.width-5, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
713 glVertex2i(frame.size.width-1, frame.size.height-9); glVertex2i(frame.size.width-9, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
714
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
715 glColor4f(0.4, 0.4, 0.4, 0.5);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
716 glVertex2i(frame.size.width-1, frame.size.height-2); glVertex2i(frame.size.width-2, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
717 glVertex2i(frame.size.width-1, frame.size.height-6); glVertex2i(frame.size.width-6, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
718 glVertex2i(frame.size.width-1, frame.size.height-10); glVertex2i(frame.size.width-10, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
719
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
720 glColor4f(0.6, 0.6, 0.6, 0.5);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
721 glVertex2i(frame.size.width-1, frame.size.height-3); glVertex2i(frame.size.width-3, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
722 glVertex2i(frame.size.width-1, frame.size.height-7); glVertex2i(frame.size.width-7, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
723 glVertex2i(frame.size.width-1, frame.size.height-11); glVertex2i(frame.size.width-11, frame.size.height-1);
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
724 glEnd();
606d1aac2d85 draw resize box
nplourde
parents: 15331
diff changeset
725 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
726
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
727 glFlush();
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
728
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
729 //auto hide mouse cursor and futur on-screen control?
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
730 if(isFullscreen && !mouseHide && !isRootwin)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
731 {
18057
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
732 int curTime = TickCount()/60;
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
733 static int lastTime = 0;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
734
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
735 if( ((curTime - lastTime) >= 5) || (lastTime == 0) )
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
736 {
18057
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
737 CGDisplayHideCursor(kCGDirectMainDisplay);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
738 mouseHide = YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
739 lastTime = curTime;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
740 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
741 }
17546
d878e3e313eb let osx sleep if video is paused
nplourde
parents: 17358
diff changeset
742
17725
d7dd016cb97a update activity every 30 sec
nplourde
parents: 17546
diff changeset
743 //update activity every 30 seconds to prevent
17546
d878e3e313eb let osx sleep if video is paused
nplourde
parents: 17358
diff changeset
744 //screensaver from starting up.
21395
dd05dd9e3e7b Fix declarations vs statements warning.
diego
parents: 18878
diff changeset
745 curTime = TickCount()/60;
18057
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
746
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
747 if( ((curTime - lastTime) >= 30) || (lastTime == 0) )
17546
d878e3e313eb let osx sleep if video is paused
nplourde
parents: 17358
diff changeset
748 {
d878e3e313eb let osx sleep if video is paused
nplourde
parents: 17358
diff changeset
749 UpdateSystemActivity(UsrActivity);
d878e3e313eb let osx sleep if video is paused
nplourde
parents: 17358
diff changeset
750 lastTime = curTime;
d878e3e313eb let osx sleep if video is paused
nplourde
parents: 17358
diff changeset
751 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
752 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
753
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
754 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
755 Create OpenGL texture from current frame & set texco
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
756 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
757 - (void) setCurrentTexture
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
758 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
759 CVReturn error = kCVReturnSuccess;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
760
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
761 error = CVOpenGLTextureCacheCreateTextureFromImage (NULL, textureCache, currentFrameBuffer, 0, &texture);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
762 if(error != kCVReturnSuccess)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
763 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
764
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
765 CVOpenGLTextureGetCleanTexCoords(texture, lowerLeft, lowerRight, upperRight, upperLeft);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
766 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
767
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
768 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
769 redraw win rect
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
770 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
771 - (void) drawRect: (NSRect *) bounds
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
772 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
773 [self render];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
774 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
775
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
776 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
777 Toggle Fullscreen
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
778 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
779 - (void) fullscreen: (BOOL) animate
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
780 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
781 static NSRect old_frame;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
782 static NSRect old_view_frame;
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
783
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
784 if(screen_force)
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
785 screen_frame = [screen_handle frame];
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
786 else
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
787 screen_frame = [[window screen] frame];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
788
15573
5db3dd72c876 Fix pan-scan in fullscreen mode
nplourde
parents: 15571
diff changeset
789 panscan_calc();
5db3dd72c876 Fix pan-scan in fullscreen mode
nplourde
parents: 15571
diff changeset
790
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
791 //go fullscreen
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
792 if(vo_fs)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
793 {
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
794 if(!isRootwin)
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
795 {
15882
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
796 SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
18057
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
797 CGDisplayHideCursor(kCGDirectMainDisplay);
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
798 mouseHide = YES;
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
799 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
800
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
801 old_frame = [window frame]; //save main window size & position
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
802 [window setFrame:screen_frame display:YES animate:animate]; //zoom-in window with nice useless sfx
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
803 old_view_frame = [self bounds];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
804
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
805 //fix origin for multi screen setup
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
806 screen_frame.origin.x = 0;
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
807 screen_frame.origin.y = 0;
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
808 [self setFrame:screen_frame];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
809 [self setNeedsDisplay:YES];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
810 [window setHasShadow:NO];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
811 isFullscreen = 1;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
812 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
813 else
15882
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
814 {
15902
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
815 SetSystemUIMode( kUIModeNormal, 0);
15882
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
816
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
817 isFullscreen = 0;
18057
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
818 CGDisplayShowCursor(kCGDirectMainDisplay);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
819 mouseHide = NO;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
820
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
821 //revert window to previous setting
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
822 [self setFrame:old_view_frame];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
823 [self setNeedsDisplay:YES];
16081
72c352edce8f restore window shadow when quitting fullscreen mode
nplourde
parents: 15909
diff changeset
824 [window setHasShadow:YES];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
825 [window setFrame:old_frame display:YES animate:animate];//zoom-out window with nice useless sfx
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
826 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
827 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
828
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
829 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
830 Toggle ontop
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
831 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
832 - (void) ontop
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
833 {
15320
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
834 if(vo_ontop)
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
835 {
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
836 [window setLevel:NSScreenSaverWindowLevel];
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
837 isOntop = YES;
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
838 }
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
839 else
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
840 {
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
841 [window setLevel:NSNormalWindowLevel];
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
842 isOntop = NO;
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
843 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
844 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
845
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
846 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
847 Toggle panscan
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
848 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
849 - (void) panscan
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
850 {
15331
7746903599b2 enable panscan
nplourde
parents: 15327
diff changeset
851 panscan_calc();
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
852 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
853
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
854 /*
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
855 Toggle rootwin
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
856 */
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
857 - (void) rootwin
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
858 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
859 if(vo_rootwin)
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
860 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
861 [window setLevel:CGWindowLevelForKey(kCGDesktopWindowLevelKey)];
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
862 [window orderBack:self];
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
863 isRootwin = YES;
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
864 }
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
865 else
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
866 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
867 [window setLevel:NSNormalWindowLevel];
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
868 isRootwin = NO;
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
869 }
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
870 }
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
871
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
872 /*
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
873 Check event for new event
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
874 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
875 - (void) check_events
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
876 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
877 event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.0001] inMode:NSEventTrackingRunLoopMode dequeue:YES];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
878 [NSApp sendEvent:event];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
879 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
880
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
881 /*
15731
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
882 From NSView, respond to key equivalents.
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
883 */
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
884 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
885 {
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
886 switch([theEvent keyCode])
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
887 {
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
888 case 0x21: [window setAlphaValue: winAlpha-=0.05]; return YES;
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
889 case 0x1e: [window setAlphaValue: winAlpha+=0.05]; return YES;
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
890 }
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
891 return NO;
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
892 }
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
893
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
894 /*
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
895 Process key event
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
896 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
897 - (void) keyDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
898 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
899 unsigned int key;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
900
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
901 switch([theEvent keyCode])
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
902 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
903 case 0x34:
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
904 case 0x24: key = KEY_ENTER; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
905 case 0x35: key = KEY_ESC; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
906 case 0x33: key = KEY_BACKSPACE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
907 case 0x3A: key = KEY_BACKSPACE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
908 case 0x3B: key = KEY_BACKSPACE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
909 case 0x38: key = KEY_BACKSPACE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
910 case 0x7A: key = KEY_F+1; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
911 case 0x78: key = KEY_F+2; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
912 case 0x63: key = KEY_F+3; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
913 case 0x76: key = KEY_F+4; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
914 case 0x60: key = KEY_F+5; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
915 case 0x61: key = KEY_F+6; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
916 case 0x62: key = KEY_F+7; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
917 case 0x64: key = KEY_F+8; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
918 case 0x65: key = KEY_F+9; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
919 case 0x6D: key = KEY_F+10; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
920 case 0x67: key = KEY_F+11; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
921 case 0x6F: key = KEY_F+12; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
922 case 0x72: key = KEY_INSERT; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
923 case 0x75: key = KEY_DELETE; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
924 case 0x73: key = KEY_HOME; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
925 case 0x77: key = KEY_END; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
926 case 0x45: key = '+'; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
927 case 0x4E: key = '-'; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
928 case 0x30: key = KEY_TAB; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
929 case 0x74: key = KEY_PAGE_UP; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
930 case 0x79: key = KEY_PAGE_DOWN; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
931 case 0x7B: key = KEY_LEFT; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
932 case 0x7C: key = KEY_RIGHT; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
933 case 0x7D: key = KEY_DOWN; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
934 case 0x7E: key = KEY_UP; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
935 case 0x43: key = '*'; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
936 case 0x4B: key = '/'; break;
24107
d4adc8503dd5 100l typo: ENTER --> KPENTER
diego
parents: 24106
diff changeset
937 case 0x4C: key = KEY_KPENTER; break;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
938 case 0x41: key = KEY_KPDEC; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
939 case 0x52: key = KEY_KP0; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
940 case 0x53: key = KEY_KP1; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
941 case 0x54: key = KEY_KP2; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
942 case 0x55: key = KEY_KP3; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
943 case 0x56: key = KEY_KP4; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
944 case 0x57: key = KEY_KP5; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
945 case 0x58: key = KEY_KP6; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
946 case 0x59: key = KEY_KP7; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
947 case 0x5B: key = KEY_KP8; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
948 case 0x5C: key = KEY_KP9; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
949 default: key = *[[theEvent characters] UTF8String]; break;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
950 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
951 mplayer_put_key(key);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
952 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
953
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
954 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
955 Process mouse button event
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
956 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
957 - (void) mouseMoved: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
958 {
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
959 if(isFullscreen && !isRootwin)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
960 {
18057
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
961 CGDisplayShowCursor(kCGDirectMainDisplay);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
962 mouseHide = NO;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
963 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
964 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
965
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
966 - (void) mouseDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
967 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
968 [self mouseEvent: theEvent];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
969 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
970
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
971 - (void) mouseUp: (NSEvent *) theEvent
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
972 {
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
973 [self mouseEvent: theEvent];
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
974 }
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
975
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
976 - (void) rightMouseDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
977 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
978 [self mouseEvent: theEvent];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
979 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
980
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
981 - (void) rightMouseUp: (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
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
986 - (void) otherMouseDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
987 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
988 [self mouseEvent: theEvent];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
989 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
990
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
991 - (void) otherMouseUp: (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
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
996 - (void) scrollWheel: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
997 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
998 if([theEvent deltaY] > 0)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
999 mplayer_put_key(MOUSE_BTN3);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1000 else
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1001 mplayer_put_key(MOUSE_BTN4);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1002 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1003
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1004 - (void) mouseEvent: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1005 {
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1006 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
1007 {
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1008 switch([theEvent type])
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1009 {
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1010 case NSLeftMouseDown:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1011 case NSRightMouseDown:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1012 case NSOtherMouseDown:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1013 mplayer_put_key((MOUSE_BTN0 + [theEvent buttonNumber]) | MP_KEY_DOWN);
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1014 break;
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1015 case NSLeftMouseUp:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1016 case NSRightMouseUp:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1017 case NSOtherMouseUp:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1018 mplayer_put_key(MOUSE_BTN0 + [theEvent buttonNumber]);
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1019 break;
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
1020 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1021 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1022 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1023
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1024 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1025 NSResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1026 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1027 - (BOOL) acceptsFirstResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1028 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1029 return YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1030 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1031
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1032 - (BOOL) becomeFirstResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1033 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1034 return YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1035 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1036
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1037 - (BOOL) resignFirstResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1038 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1039 return YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
1040 }
15325
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
1041
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
1042 - (void)windowWillClose:(NSNotification *)aNotification
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
1043 {
21551
c35115c05c64 vo_macosx, fix crash when closing window
nplourde
parents: 21546
diff changeset
1044 mpGLView = NULL;
15325
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
1045 mplayer_put_key(KEY_ESC);
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
1046 }
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
1047 @end