mplayer.hg: libvo/vo_macosx.m annotate

annotate libvo/vo_macosx.m @ 29133:4486594b6687

Fix E-AC-3 channel ordering. E-AC-3 needs to use the same ordering as AC-3, not the standard ordering. patch by Andrew de Quincey, adq_dvb lidskialf net

author	diego
date	Sun, 12 Apr 2009 21:28:45 +0000 (2009-04-12)
parents	e5171567fe6c
children	0f6fc0df2c23

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

Mercurial > mplayer.hg

annotate libvo/vo_macosx.m @ 29133:4486594b6687