annotate libvo/vo_corevideo.m @ 29564:4ae3d2d7946e

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