/*****************************************************************************
* vout.m: MacOS X video output module
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * Copyright (C) 2001-2005 the VideoLAN team
* $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
- * Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Derk-Jan Hartman <hartman at videolan dot org>
* Eric Petit <titer@m0k.org>
+ * Benjamin Pracht <bigben at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <stdlib.h> /* free() */
#include <string.h> /* strerror() */
+/* BeginFullScreen, EndFullScreen */
#include <QuickTime/QuickTime.h>
-#include <OpenGL/OpenGL.h>
-#include <OpenGL/gl.h>
-#include <OpenGL/glext.h>
-
#include <vlc_keys.h>
#include "intf.h"
#include "vout.h"
-#define QT_MAX_DIRECTBUFFERS 10
-#define VL_MAX_DISPLAYS 16
-
-#define OPENGL_EFFECT_NONE 1
-#define OPENGL_EFFECT_CUBE 2
-#define OPENGL_EFFECT_TRANSPARENT_CUBE 4
-
-struct picture_sys_t
-{
- void *p_info;
- unsigned int i_size;
-
- /* When using I420 output */
- PlanarPixmapInfoYUV420 pixmap_i420;
-};
/*****************************************************************************
- * Local prototypes
+ * DeviceCallback: Callback triggered when the video-device variable is changed
*****************************************************************************/
+int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ vlc_value_t val;
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
-static int vout_Init ( vout_thread_t * );
-static void vout_End ( vout_thread_t * );
-static int vout_Manage ( vout_thread_t * );
-static void vout_Display ( vout_thread_t *, picture_t * );
-
-static int CoSendRequest ( vout_thread_t *, SEL );
-static int CoCreateWindow ( vout_thread_t * );
-static int CoDestroyWindow ( vout_thread_t * );
-static int CoToggleFullscreen ( vout_thread_t * );
+ msg_Dbg( p_vout, "set %d", new_val.i_int );
+ var_Create( p_vout->p_vlc, "video-device", VLC_VAR_INTEGER );
+ var_Set( p_vout->p_vlc, "video-device", new_val );
-static void VLCHideMouse ( vout_thread_t *, BOOL );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_vout, "intf-change", val );
+ return VLC_SUCCESS;
+}
-static void QTScaleMatrix ( vout_thread_t * );
-static int QTCreateSequence ( vout_thread_t * );
-static void QTDestroySequence ( vout_thread_t * );
-static int QTNewPicture ( vout_thread_t *, picture_t * );
-static void QTFreePicture ( vout_thread_t *, picture_t * );
/*****************************************************************************
- * OpenVideo: allocates MacOS X video thread output method
- *****************************************************************************
- * This function allocates and initializes a MacOS X vout method.
+ * VLCEmbeddedList implementation
*****************************************************************************/
-int E_(OpenVideo) ( vlc_object_t *p_this )
-{
- vout_thread_t * p_vout = (vout_thread_t *)p_this;
- OSErr err;
- int i_timeout;
-
- p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
- if( p_vout->p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
- return( 1 );
- }
-
- memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
-
- /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */
- for( i_timeout = 20 ; i_timeout-- ; )
- {
- if( NSApp == NULL )
- {
- msleep( INTF_IDLE_SLEEP );
- }
- }
-
- if( NSApp == NULL )
- {
- /* no MacOS X intf, unable to communicate with MT */
- msg_Err( p_vout, "no MacOS X interface present" );
- free( p_vout->p_sys );
- return( 1 );
- }
+@implementation VLCEmbeddedList
- if( [NSApp respondsToSelector: @selector(getIntf)] )
- {
- intf_thread_t * p_intf;
-
- for( i_timeout = 10 ; i_timeout-- ; )
- {
- if( ( p_intf = [NSApp getIntf] ) == NULL )
- {
- msleep( INTF_IDLE_SLEEP );
- }
- }
-
- if( p_intf == NULL )
- {
- msg_Err( p_vout, "MacOS X intf has getIntf, but is NULL" );
- free( p_vout->p_sys );
- return( 1 );
- }
- }
-
- p_vout->p_sys->b_mouse_moved = VLC_TRUE;
- p_vout->p_sys->i_time_mouse_last_moved = mdate();
-
- /* set window size */
- p_vout->p_sys->s_rect.size.width = p_vout->i_window_width;
- p_vout->p_sys->s_rect.size.height = p_vout->i_window_height;
-
- /* Check if we should use QuickTime or OpenGL */
- p_vout->p_sys->i_opengl = config_GetInt( p_vout, "macosx-opengl" );
-
- if( !p_vout->p_sys->i_opengl )
- {
- /* Initialize QuickTime */
- p_vout->p_sys->h_img_descr =
- (ImageDescriptionHandle)NewHandleClear( sizeof(ImageDescription) );
- p_vout->p_sys->p_matrix =
- (MatrixRecordPtr)malloc( sizeof(MatrixRecord) );
- p_vout->p_sys->p_fullscreen_state = NULL;
-
- if( ( err = EnterMovies() ) != noErr )
- {
- msg_Err( p_vout, "EnterMovies failed: %d", err );
- free( p_vout->p_sys->p_matrix );
- DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
- free( p_vout->p_sys );
- return( 1 );
- }
-
- /* Damn QT isn't thread safe. so keep a lock in the p_vlc object */
- vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock );
-
- err = FindCodec( kYUV420CodecType, bestSpeedCodec,
- nil, &p_vout->p_sys->img_dc );
-
- vlc_mutex_unlock( &p_vout->p_vlc->quicktime_lock );
- if( err == noErr && p_vout->p_sys->img_dc != 0 )
- {
- p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0');
- p_vout->p_sys->i_codec = kYUV420CodecType;
- }
- else
- {
- msg_Err( p_vout, "failed to find an appropriate codec" );
- }
-
- if( p_vout->p_sys->img_dc == 0 )
- {
- free( p_vout->p_sys->p_matrix );
- DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
- free( p_vout->p_sys );
- return VLC_EGENERIC;
- }
- }
-
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
- NSArray * o_screens = [NSScreen screens];
- if( [o_screens count] > 0 && var_Type( p_vout, "video-device" ) == 0 )
- {
- int i = 1;
- vlc_value_t val, text;
- NSScreen * o_screen;
-
- int i_option = config_GetInt( p_vout, "macosx-vdev" );
-
- var_Create( p_vout, "video-device", VLC_VAR_INTEGER |
- VLC_VAR_HASCHOICE );
- text.psz_string = _("Video device");
- var_Change( p_vout, "video-device", VLC_VAR_SETTEXT, &text, NULL );
-
- NSEnumerator * o_enumerator = [o_screens objectEnumerator];
-
- while( (o_screen = [o_enumerator nextObject]) != NULL )
- {
- char psz_temp[255];
- NSRect s_rect = [o_screen frame];
-
- snprintf( psz_temp, sizeof(psz_temp)/sizeof(psz_temp[0])-1,
- "%s %d (%dx%d)", _("Screen"), i,
- (int)s_rect.size.width, (int)s_rect.size.height );
-
- text.psz_string = psz_temp;
- val.i_int = i;
- var_Change( p_vout, "video-device",
- VLC_VAR_ADDCHOICE, &val, &text );
-
- if( ( i - 1 ) == i_option )
- {
- var_Set( p_vout, "video-device", val );
- }
- i++;
- }
-
- var_AddCallback( p_vout, "video-device", vout_VarCallback,
- NULL );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "intf-change", val );
- }
- [o_pool release];
-
- if( CoCreateWindow( p_vout ) )
- {
- msg_Err( p_vout, "unable to create window" );
- if( !p_vout->p_sys->i_opengl )
- {
- free( p_vout->p_sys->p_matrix );
- DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
- }
- free( p_vout->p_sys );
- return( 1 );
- }
-
- p_vout->pf_init = vout_Init;
- p_vout->pf_end = vout_End;
- p_vout->pf_manage = vout_Manage;
- p_vout->pf_render = NULL;
- p_vout->pf_display = vout_Display;
-
- return( 0 );
+- (id)init
+{
+ [super init];
+ o_embedded_array = [NSMutableArray array];
+ return self;
}
-/*****************************************************************************
- * vout_Init: initialize video thread output method
- *****************************************************************************/
-static int vout_Init( vout_thread_t *p_vout )
+- (id)getEmbeddedVout
{
- int i_index;
- picture_t *p_pic;
-
- I_OUTPUTPICTURES = 0;
+ unsigned int i;
- /* Initialize the output structure; we already found a codec,
- * and the corresponding chroma we will be using. Since we can
- * arbitrary scale, stick to the coordinates and aspect. */
- p_vout->output.i_width = p_vout->render.i_width;
- p_vout->output.i_height = p_vout->render.i_height;
- p_vout->output.i_aspect = p_vout->render.i_aspect;
-
- if( !p_vout->p_sys->i_opengl )
+ for( i = 0; i < [o_embedded_array count]; i++ )
{
- SetPort( p_vout->p_sys->p_qdport );
- QTScaleMatrix( p_vout );
-
- if( QTCreateSequence( p_vout ) )
+ id o_vout_view = [o_embedded_array objectAtIndex: i];
+ if( ![o_vout_view isUsed] )
{
- msg_Err( p_vout, "unable to create sequence" );
- return( 1 );
+ [o_vout_view setUsed: YES];
+ return o_vout_view;
}
}
- else
- {
- p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2');
- p_vout->output.i_rmask = 0xFF0000;
- p_vout->output.i_gmask = 0x00FF00;
- p_vout->output.i_bmask = 0x0000FF;
- }
-
- /* Try to initialize up to QT_MAX_DIRECTBUFFERS direct buffers */
- while( I_OUTPUTPICTURES <
- p_vout->p_sys->i_opengl ? 1 : QT_MAX_DIRECTBUFFERS )
- {
- p_pic = NULL;
-
- /* Find an empty picture slot */
- for( i_index = 0; i_index < VOUT_MAX_PICTURES; i_index++ )
- {
- if( p_vout->p_picture[ i_index ].i_status == FREE_PICTURE )
- {
- p_pic = p_vout->p_picture + i_index;
- break;
- }
- }
-
- /* Allocate the picture */
- if( p_pic == NULL )
- {
- break;
- }
-
- if( !p_vout->p_sys->i_opengl )
- {
- if( QTNewPicture( p_vout, p_pic ) )
- {
- break;
- }
- }
- else
- {
- /* Nothing special to do, we just need a basic allocated
- picture_t */
- vout_AllocatePicture( VLC_OBJECT( p_vout ), p_pic,
- p_vout->output.i_chroma, p_vout->output.i_width,
- p_vout->output.i_height, p_vout->output.i_aspect );
- }
-
- p_pic->i_status = DESTROYED_PICTURE;
- p_pic->i_type = DIRECT_PICTURE;
-
- PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic;
-
- I_OUTPUTPICTURES++;
- }
-
- if( p_vout->p_sys->i_opengl )
- {
- [p_vout->p_sys->o_glview lockFocus];
- [p_vout->p_sys->o_glview initTextures];
- [p_vout->p_sys->o_glview reshape];
- [p_vout->p_sys->o_glview unlockFocus];
- }
-
- return( 0 );
+ return nil;
}
-/*****************************************************************************
- * vout_End: terminate video thread output method
- *****************************************************************************/
-static void vout_End( vout_thread_t *p_vout )
+- (void)releaseEmbeddedVout: (id)o_vout_view
{
- int i_index;
-
- if( !p_vout->p_sys->i_opengl )
+ if( [o_embedded_array containsObject: o_vout_view] )
{
- QTDestroySequence( p_vout );
+ [o_vout_view setUsed: NO];
}
else
{
- [p_vout->p_sys->o_glview cleanUp];
- }
-
- /* Free the direct buffers we allocated */
- for( i_index = I_OUTPUTPICTURES; i_index; )
- {
- i_index--;
- if( !p_vout->p_sys->i_opengl )
- {
- QTFreePicture( p_vout, PP_OUTPUTPICTURE[ i_index ] );
- }
- else
- {
- free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
- }
+ msg_Warn( VLCIntf, "Cannot find Video Output");
}
}
-/*****************************************************************************
- * CloseVideo: destroy video thread output method
- *****************************************************************************/
-void E_(CloseVideo) ( vlc_object_t *p_this )
-{
- vout_thread_t * p_vout = (vout_thread_t *)p_this;
-
- if( CoDestroyWindow( p_vout ) )
+- (void)addEmbeddedVout: (id)o_vout_view
+{
+ if( ![o_embedded_array containsObject: o_vout_view] )
{
- msg_Err( p_vout, "unable to destroy window" );
+ [o_embedded_array addObject: o_vout_view];
}
-
- if( !p_vout->p_sys->i_opengl )
- {
- if ( p_vout->p_sys->p_fullscreen_state != NULL )
- EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
-
- ExitMovies();
-
- free( p_vout->p_sys->p_matrix );
- DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
- }
-
- free( p_vout->p_sys );
}
-/*****************************************************************************
- * vout_Manage: handle events
- *****************************************************************************
- * This function should be called regularly by video output thread. It manages
- * console events. It returns a non null value on error.
- *****************************************************************************/
-static int vout_Manage( vout_thread_t *p_vout )
+- (BOOL)windowContainsEmbedded: (id)o_window
{
- if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
- {
- if( CoToggleFullscreen( p_vout ) )
- {
- return( 1 );
- }
-
- p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
- }
-
- if( p_vout->i_changes & VOUT_SIZE_CHANGE )
- {
- if( !p_vout->p_sys->i_opengl )
- {
- QTScaleMatrix( p_vout );
- SetDSequenceMatrix( p_vout->p_sys->i_seq,
- p_vout->p_sys->p_matrix );
- }
-
- p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
- }
-
- /* hide/show mouse cursor
- * this code looks unnecessarily complicated, but is necessary like this.
- * it has to deal with multiple monitors and therefore checks a lot */
- if( !p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen )
- {
- if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 3000000 )
- {
- VLCHideMouse( p_vout, YES );
- }
- }
- else if ( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen )
- {
- VLCHideMouse( p_vout, NO );
- }
-
- /* disable screen saver */
- UpdateSystemActivity( UsrActivity );
-
- return( 0 );
+ return ([self getViewForWindow: o_window] == nil ? NO : YES);
}
-/*****************************************************************************
- * vout_Display: displays previously rendered output
- *****************************************************************************
- * This function sends the currently rendered image to the display.
- *****************************************************************************/
-static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic )
+- (id)getViewForWindow: (id)o_window
{
- if( !p_vout->p_sys->i_opengl )
- {
- OSErr err;
- CodecFlags flags;
-
- if( ( err = DecompressSequenceFrameS(
- p_vout->p_sys->i_seq,
- p_pic->p_sys->p_info,
- p_pic->p_sys->i_size,
- codecFlagUseImageBuffer, &flags, nil ) != noErr ) )
- {
- msg_Warn( p_vout, "DecompressSequenceFrameS failed: %d", err );
- }
- else
- {
- QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil );
- }
- }
- else
+ id o_enumerator = [o_embedded_array objectEnumerator];
+ id o_current_embedded;
+
+ while( (o_current_embedded = [o_enumerator nextObject]) )
{
- if( [p_vout->p_sys->o_glview lockFocusIfCanDraw] )
+ if( [o_current_embedded getWindow] == o_window )
{
- /* Texture gotta be reload before the buffer is filled
- (thanks to gcc from arstechnica forums) */
- [p_vout->p_sys->o_glview drawRect:
- [p_vout->p_sys->o_glview bounds]];
- [p_vout->p_sys->o_glview reloadTexture];
- [p_vout->p_sys->o_glview unlockFocus];
+ return o_current_embedded;
}
}
+ return nil;
}
-/*****************************************************************************
- * CoSendRequest: send request to interface thread
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
- *****************************************************************************/
-static int CoSendRequest( vout_thread_t *p_vout, SEL sel )
-{
- int i_ret = 0;
- vlc_value_t val;
- intf_thread_t * p_intf;
-
- VLCVout * o_vlv = [[VLCVout alloc] init];
-
- if( ( i_ret = ExecuteOnMainThread( o_vlv, sel, (void *)p_vout ) ) )
- {
- msg_Err( p_vout, "SendRequest: no way to communicate with mt" );
- }
-
- [o_vlv release];
-
- /*This makes this function dependant of the presence of a macosx
- interface. We do not check if this interface exists, since it has
- already been done before.*/
-
- p_intf = [NSApp getIntf];
-
- val.b_bool = VLC_TRUE;
- var_Create(p_intf,"intf-change",VLC_VAR_BOOL);
- var_Set(p_intf, "intf-change",val);
-
- return( i_ret );
-}
+@end
/*****************************************************************************
- * CoCreateWindow: create new window
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
+ * VLCVoutView implementation
*****************************************************************************/
-static int CoCreateWindow( vout_thread_t *p_vout )
-{
- if( CoSendRequest( p_vout, @selector(createWindow:) ) )
- {
- msg_Err( p_vout, "CoSendRequest (createWindow) failed" );
- return( 1 );
- }
-
- return( 0 );
-}
+@implementation VLCVoutView
-/*****************************************************************************
- * CoDestroyWindow: destroy window
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
- *****************************************************************************/
-static int CoDestroyWindow( vout_thread_t *p_vout )
+- (id)initWithFrame:(NSRect)frameRect
{
+ [super initWithFrame: frameRect];
+ p_vout = NULL;
+ o_view = nil;
+ s_frame = &frameRect;
- VLCHideMouse( p_vout, NO );
-
- if( CoSendRequest( p_vout, @selector(destroyWindow:) ) )
- {
- msg_Err( p_vout, "CoSendRequest (destroyWindow) failed" );
- return( 1 );
- }
-
- return( 0 );
+ p_real_vout = NULL;
+ o_window = nil;
+ return self;
}
-/*****************************************************************************
- * CoToggleFullscreen: toggle fullscreen
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
- *****************************************************************************/
-static int CoToggleFullscreen( vout_thread_t *p_vout )
+- (BOOL)setVout: (vout_thread_t *) vout subView: (NSView *) view
+ frame: (NSRect *) frame
{
+ int i_device;
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ NSArray *o_screens = [NSScreen screens];
- vlc_value_t val;
- intf_thread_t * p_intf;
+ p_vout = vout;
+ o_view = view;
+ s_frame = frame;
- if( p_vout->p_sys->i_opengl )
+ if( [o_screens count] <= 0 )
{
- p_vout->b_fullscreen = !p_vout->b_fullscreen;
- if( p_vout->b_fullscreen )
- {
- [p_vout->p_sys->o_glview goFullScreen];
- }
- else
- {
- [p_vout->p_sys->o_glview exitFullScreen];
- }
- /*This makes this function dependant of the presence of a macosx
- interface. We do not check if this interface exists, since it has
- already been done before.*/
-
- p_intf = [NSApp getIntf];
-
- val.b_bool = VLC_TRUE;
- var_Create(p_intf,"intf-change",VLC_VAR_BOOL);
- var_Set(p_intf, "intf-change",val);
-
- return 0;
+ msg_Err( p_vout, "no OSX screens available" );
+ return NO;
}
-
- QTDestroySequence( p_vout );
- if( CoDestroyWindow( p_vout ) )
+ p_real_vout = [VLCVoutView getRealVout: p_vout];
+
+ /* Get the pref value when this is the first time, otherwise retrieve the device from the top level video-device var */
+ if( var_Type( p_real_vout->p_vlc, "video-device" ) == 0 )
{
- msg_Err( p_vout, "unable to destroy window" );
- return( 1 );
+ i_device = var_GetInteger( p_vout, "macosx-vdev" );
}
-
- p_vout->b_fullscreen = !p_vout->b_fullscreen;
-
- if( CoCreateWindow( p_vout ) )
+ else
{
- msg_Err( p_vout, "unable to create window" );
- return( 1 );
+ i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" );
}
- SetPort( p_vout->p_sys->p_qdport );
- QTScaleMatrix( p_vout );
-
- if( QTCreateSequence( p_vout ) )
+ /* Setup the menuitem for the multiple displays. */
+ if( var_Type( p_real_vout, "video-device" ) == 0 )
{
- msg_Err( p_vout, "unable to create sequence" );
- return( 1 );
- }
+ int i = 1;
+ vlc_value_t val2, text;
+ NSScreen * o_screen;
- return( 0 );
-}
+ var_Create( p_real_vout, "video-device", VLC_VAR_INTEGER |
+ VLC_VAR_HASCHOICE );
+ text.psz_string = _("Video Device");
+ var_Change( p_real_vout, "video-device", VLC_VAR_SETTEXT, &text, NULL );
-/*****************************************************************************
- * VLCHideMouse: if b_hide then hide the cursor
- *****************************************************************************/
-static void VLCHideMouse ( vout_thread_t *p_vout, BOOL b_hide )
-{
- BOOL b_inside;
- NSRect s_rect;
- NSPoint ml;
- NSWindow *o_window = p_vout->p_sys->o_window;
- NSView *o_contents = [o_window contentView];
-
- s_rect = [o_contents bounds];
- ml = [o_window convertScreenToBase:[NSEvent mouseLocation]];
- ml = [o_contents convertPoint:ml fromView:nil];
- b_inside = [o_contents mouse: ml inRect: s_rect];
-
- if ( b_hide && b_inside )
- {
- /* only hide if mouse over VLCQTView */
- [NSCursor setHiddenUntilMouseMoves: YES];
- }
- else if ( !b_hide )
- {
- [NSCursor setHiddenUntilMouseMoves: NO];
- }
- p_vout->p_sys->b_mouse_moved = NO;
- p_vout->p_sys->i_time_mouse_last_moved = mdate();
- return;
-}
+ NSEnumerator * o_enumerator = [o_screens objectEnumerator];
-/*****************************************************************************
- * QTScaleMatrix: scale matrix
- *****************************************************************************/
-static void QTScaleMatrix( vout_thread_t *p_vout )
-{
- Rect s_rect;
- unsigned int i_width, i_height;
- Fixed factor_x, factor_y;
- unsigned int i_offset_x = 0;
- unsigned int i_offset_y = 0;
+ val2.i_int = 0;
+ text.psz_string = _("Default");
+ var_Change( p_real_vout, "video-device",
+ VLC_VAR_ADDCHOICE, &val2, &text );
+ var_Set( p_real_vout, "video-device", val2 );
- GetPortBounds( p_vout->p_sys->p_qdport, &s_rect );
+ while( (o_screen = [o_enumerator nextObject]) != NULL )
+ {
+ char psz_temp[255];
+ NSRect s_rect = [o_screen frame];
- i_width = s_rect.right - s_rect.left;
- i_height = s_rect.bottom - s_rect.top;
+ snprintf( psz_temp, sizeof(psz_temp)/sizeof(psz_temp[0])-1,
+ "%s %d (%dx%d)", _("Screen"), i,
+ (int)s_rect.size.width, (int)s_rect.size.height );
- if( config_GetInt( p_vout, "macosx-stretch" ) )
- {
- factor_x = FixDiv( Long2Fix( i_width ),
- Long2Fix( p_vout->output.i_width ) );
- factor_y = FixDiv( Long2Fix( i_height ),
- Long2Fix( p_vout->output.i_height ) );
-
- }
- else if( i_height * p_vout->output.i_aspect < i_width * VOUT_ASPECT_FACTOR )
- {
- int i_adj_width = i_height * p_vout->output.i_aspect /
- VOUT_ASPECT_FACTOR;
+ text.psz_string = psz_temp;
+ val2.i_int = i;
+ var_Change( p_real_vout, "video-device",
+ VLC_VAR_ADDCHOICE, &val2, &text );
+ if( i == i_device )
+ {
+ var_Set( p_real_vout, "video-device", val2 );
+ }
+ i++;
+ }
- factor_x = FixDiv( Long2Fix( i_adj_width ),
- Long2Fix( p_vout->output.i_width ) );
- factor_y = FixDiv( Long2Fix( i_height ),
- Long2Fix( p_vout->output.i_height ) );
+ var_AddCallback( p_real_vout, "video-device", DeviceCallback,
+ NULL );
- i_offset_x = (i_width - i_adj_width) / 2;
+ val2.b_bool = VLC_TRUE;
+ var_Set( p_real_vout, "intf-change", val2 );
}
- else
- {
- int i_adj_height = i_width * VOUT_ASPECT_FACTOR /
- p_vout->output.i_aspect;
- factor_x = FixDiv( Long2Fix( i_width ),
- Long2Fix( p_vout->output.i_width ) );
- factor_y = FixDiv( Long2Fix( i_adj_height ),
- Long2Fix( p_vout->output.i_height ) );
+ /* Add the view. It's automatically resized to fit the window */
+ [self addSubview: o_view];
+ [self setAutoresizesSubviews: YES];
+ [o_pool release];
- i_offset_y = (i_height - i_adj_height) / 2;
- }
-
- SetIdentityMatrix( p_vout->p_sys->p_matrix );
-
- ScaleMatrix( p_vout->p_sys->p_matrix,
- factor_x, factor_y,
- Long2Fix(0), Long2Fix(0) );
-
- TranslateMatrix( p_vout->p_sys->p_matrix,
- Long2Fix(i_offset_x), Long2Fix(i_offset_y) );
+ return YES;
}
-/*****************************************************************************
- * QTCreateSequence: create a new sequence
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
- *****************************************************************************/
-static int QTCreateSequence( vout_thread_t *p_vout )
+- (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize
{
- OSErr err;
- ImageDescriptionPtr p_descr;
-
- HLock( (Handle)p_vout->p_sys->h_img_descr );
- p_descr = *p_vout->p_sys->h_img_descr;
-
- p_descr->idSize = sizeof(ImageDescription);
- p_descr->cType = p_vout->p_sys->i_codec;
- p_descr->version = 1;
- p_descr->revisionLevel = 0;
- p_descr->vendor = 'appl';
- p_descr->width = p_vout->output.i_width;
- p_descr->height = p_vout->output.i_height;
- p_descr->hRes = Long2Fix(72);
- p_descr->vRes = Long2Fix(72);
- p_descr->spatialQuality = codecLosslessQuality;
- p_descr->frameCount = 1;
- p_descr->clutID = -1;
- p_descr->dataSize = 0;
- p_descr->depth = 24;
-
- HUnlock( (Handle)p_vout->p_sys->h_img_descr );
-
- if( ( err = DecompressSequenceBeginS(
- &p_vout->p_sys->i_seq,
- p_vout->p_sys->h_img_descr,
- NULL, 0,
- p_vout->p_sys->p_qdport,
- NULL, NULL,
- p_vout->p_sys->p_matrix,
- 0, NULL,
- codecFlagUseImageBuffer,
- codecLosslessQuality,
- p_vout->p_sys->img_dc ) ) )
- {
- msg_Err( p_vout, "DecompressSequenceBeginS failed: %d", err );
- return( 1 );
- }
-
- return( 0 );
+ [super resizeSubviewsWithOldSize: oldBoundsSize];
+ [o_view setFrameSize: [self frame].size];
}
-/*****************************************************************************
- * QTDestroySequence: destroy sequence
- *****************************************************************************/
-static void QTDestroySequence( vout_thread_t *p_vout )
+- (void)closeVout
{
- CDSequenceEnd( p_vout->p_sys->i_seq );
+ [o_view removeFromSuperview];
+ o_view = nil;
+ p_vout = NULL;
+ s_frame = nil;
+ o_window = nil;
+ p_real_vout = NULL;
}
-/*****************************************************************************
- * QTNewPicture: allocate a picture
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
- *****************************************************************************/
-static int QTNewPicture( vout_thread_t *p_vout, picture_t *p_pic )
+- (void)updateTitle
{
- int i_width = p_vout->output.i_width;
- int i_height = p_vout->output.i_height;
-
- /* We know the chroma, allocate a buffer which will be used
- * directly by the decoder */
- p_pic->p_sys = malloc( sizeof( picture_sys_t ) );
+ NSMutableString * o_title = nil, * o_mrl = nil;
+ input_thread_t * p_input;
- if( p_pic->p_sys == NULL )
+ if( p_vout == NULL )
{
- return( -1 );
+ return;
}
- switch( p_vout->output.i_chroma )
- {
- case VLC_FOURCC('I','4','2','0'):
-
- p_pic->p_sys->p_info = (void *)&p_pic->p_sys->pixmap_i420;
- p_pic->p_sys->i_size = sizeof(PlanarPixmapInfoYUV420);
-
- /* Allocate the memory buffer */
- p_pic->p_data = vlc_memalign( &p_pic->p_data_orig,
- 16, i_width * i_height * 3 / 2 );
-
- /* Y buffer */
- p_pic->Y_PIXELS = p_pic->p_data;
- p_pic->p[Y_PLANE].i_lines = i_height;
- p_pic->p[Y_PLANE].i_pitch = i_width;
- p_pic->p[Y_PLANE].i_pixel_pitch = 1;
- p_pic->p[Y_PLANE].i_visible_pitch = i_width;
-
- /* U buffer */
- p_pic->U_PIXELS = p_pic->Y_PIXELS + i_height * i_width;
- p_pic->p[U_PLANE].i_lines = i_height / 2;
- p_pic->p[U_PLANE].i_pitch = i_width / 2;
- p_pic->p[U_PLANE].i_pixel_pitch = 1;
- p_pic->p[U_PLANE].i_visible_pitch = i_width / 2;
-
- /* V buffer */
- p_pic->V_PIXELS = p_pic->U_PIXELS + i_height * i_width / 4;
- p_pic->p[V_PLANE].i_lines = i_height / 2;
- p_pic->p[V_PLANE].i_pitch = i_width / 2;
- p_pic->p[V_PLANE].i_pixel_pitch = 1;
- p_pic->p[V_PLANE].i_visible_pitch = i_width / 2;
-
- /* We allocated 3 planes */
- p_pic->i_planes = 3;
-
-#define P p_pic->p_sys->pixmap_i420
- P.componentInfoY.offset = (void *)p_pic->Y_PIXELS
- - p_pic->p_sys->p_info;
- P.componentInfoCb.offset = (void *)p_pic->U_PIXELS
- - p_pic->p_sys->p_info;
- P.componentInfoCr.offset = (void *)p_pic->V_PIXELS
- - p_pic->p_sys->p_info;
-
- P.componentInfoY.rowBytes = i_width;
- P.componentInfoCb.rowBytes = i_width / 2;
- P.componentInfoCr.rowBytes = i_width / 2;
-#undef P
-
- break;
+ p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
- default:
- /* Unknown chroma, tell the guy to get lost */
- free( p_pic->p_sys );
- msg_Err( p_vout, "never heard of chroma 0x%.8x (%4.4s)",
- p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma );
- p_pic->i_planes = 0;
- return( -1 );
+ if( p_input == NULL )
+ {
+ return;
}
- return( 0 );
-}
+ if( p_input->input.p_item->psz_name != NULL )
+ o_title = [NSMutableString stringWithUTF8String:
+ p_input->input.p_item->psz_name];
+ if( p_input->input.p_item->psz_uri != NULL )
+ o_mrl = [NSMutableString stringWithUTF8String:
+ p_input->input.p_item->psz_uri];
+ if( o_title == nil )
+ o_title = o_mrl;
-/*****************************************************************************
- * QTFreePicture: destroy a picture allocated with QTNewPicture
- *****************************************************************************/
-static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
-{
- switch( p_vout->output.i_chroma )
+ if( o_mrl != nil )
{
- case VLC_FOURCC('I','4','2','0'):
- free( p_pic->p_data_orig );
- break;
+ if( p_input->input.p_access && !strcmp( p_input->input.p_access->p_module->psz_shortname, "File" ) )
+ {
+ NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
+ if( prefix_range.location != NSNotFound )
+ [o_mrl deleteCharactersInRange: prefix_range];
+ [o_window setRepresentedFilename: o_mrl];
+ }
+ [o_window setTitle: o_title];
}
-
- free( p_pic->p_sys );
+ else
+ {
+ [o_window setTitle: [NSString stringWithCString: VOUT_TITLE]];
+ }
+ vlc_object_release( p_input );
}
-/*****************************************************************************
- * VLCWindow implementation
- *****************************************************************************/
-@implementation VLCWindow
-
-- (void)setVout:(vout_thread_t *)_p_vout
-{
- p_vout = _p_vout;
-}
-- (vout_thread_t *)getVout
+- (void)setOnTop:(BOOL)b_on_top
{
- return( p_vout );
+ if( b_on_top )
+ {
+ [o_window setLevel: NSStatusWindowLevel];
+ }
+ else
+ {
+ [o_window setLevel: NSNormalWindowLevel];
+ }
}
- (void)scaleWindowWithFactor: (float)factor
int i_corrected_height, i_corrected_width;
NSPoint topleftbase;
NSPoint topleftscreen;
-
+
if ( !p_vout->b_fullscreen )
{
+ NSRect new_frame;
topleftbase.x = 0;
- topleftbase.y = [self frame].size.height;
- topleftscreen = [self convertBaseToScreen: topleftbase];
-
- if( p_vout->output.i_height * p_vout->output.i_aspect >
- p_vout->output.i_width * VOUT_ASPECT_FACTOR )
+ topleftbase.y = [o_window frame].size.height;
+ topleftscreen = [o_window convertBaseToScreen: topleftbase];
+
+ if( p_vout->render.i_height * p_vout->render.i_aspect >
+ p_vout->render.i_width * VOUT_ASPECT_FACTOR )
{
- i_corrected_width = p_vout->output.i_height * p_vout->output.i_aspect /
+ i_corrected_width = p_vout->render.i_height * p_vout->render.i_aspect /
VOUT_ASPECT_FACTOR;
newsize.width = (int) ( i_corrected_width * factor );
newsize.height = (int) ( p_vout->render.i_height * factor );
}
else
{
- i_corrected_height = p_vout->output.i_width * VOUT_ASPECT_FACTOR /
- p_vout->output.i_aspect;
+ i_corrected_height = p_vout->render.i_width * VOUT_ASPECT_FACTOR /
+ p_vout->render.i_aspect;
newsize.width = (int) ( p_vout->render.i_width * factor );
newsize.height = (int) ( i_corrected_height * factor );
}
-
- [self setContentSize: newsize];
-
- [self setFrameTopLeftPoint: topleftscreen];
+
+ /* Calculate the window's new size */
+ new_frame.size.width = [o_window frame].size.width -
+ [self frame].size.width + newsize.width;
+ new_frame.size.height = [o_window frame].size.height -
+ [self frame].size.height + newsize.height;
+
+ new_frame.origin.x = topleftscreen.x;
+ new_frame.origin.y = topleftscreen.y - new_frame.size.height;
+
+ [o_window setFrame: new_frame display: YES];
+
p_vout->i_changes |= VOUT_SIZE_CHANGE;
}
}
- (void)toggleFloatOnTop
{
- if( config_GetInt( p_vout, "video-on-top" ) )
+ vlc_value_t val;
+
+ if( var_Get( p_real_vout, "video-on-top", &val )>=0 && val.b_bool)
{
- config_PutInt( p_vout, "video-on-top", 0 );
- [p_vout->p_sys->o_window setLevel: NSNormalWindowLevel];
+ val.b_bool = VLC_FALSE;
}
else
{
- config_PutInt( p_vout, "video-on-top", 1 );
- [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
+ val.b_bool = VLC_TRUE;
}
+ var_Set( p_real_vout, "video-on-top", val );
}
- (void)toggleFullscreen
{
- config_PutInt(p_vout, "fullscreen", !p_vout->b_fullscreen);
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
+ vlc_value_t val;
+ var_Get( p_real_vout, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_real_vout, "fullscreen", val );
}
- (BOOL)isFullscreen
{
- return( p_vout->b_fullscreen );
+ vlc_value_t val;
+ var_Get( p_real_vout, "fullscreen", &val );
+ return( val.b_bool );
}
-- (BOOL)canBecomeKeyWindow
+- (void)snapshot
+{
+ vout_Control( p_real_vout, VOUT_SNAPSHOT );
+}
+
+- (void)manage
{
- return( YES );
+ /* Disable Screensaver */
+ UpdateSystemActivity( UsrActivity );
+}
+
+- (id)getWindow
+{
+ return o_window;
}
- (void)keyDown:(NSEvent *)o_event
vlc_value_t val;
unsigned int i_pressed_modifiers = 0;
val.i_int = 0;
-
+
i_pressed_modifiers = [o_event modifierFlags];
if( i_pressed_modifiers & NSShiftKeyMask )
if( key )
{
- /* Escape should always get you out of fullscreen */
- if( key == (unichar) 0x1b )
- {
- if( [self isFullscreen] )
- {
- [self toggleFullscreen];
- }
- }
- else if ( key == ' ' )
- {
- playlist_t *p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if ( p_playlist != NULL )
- {
- playlist_Pause( p_playlist );
- vlc_object_release( p_playlist);
- }
- }
- else
- {
- val.i_int |= CocoaKeyToVLC( key );
- var_Set( p_vout->p_vlc, "key-pressed", val );
- }
- }
- else
- {
- [super keyDown: o_event];
- }
-}
-
-- (void)updateTitle
-{
- NSMutableString * o_title;
- playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist == NULL )
- {
- return;
- }
-
- vlc_mutex_lock( &p_playlist->object_lock );
- o_title = [NSMutableString stringWithUTF8String:
- p_playlist->pp_items[p_playlist->i_index]->psz_uri];
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- vlc_object_release( p_playlist );
-
- if( o_title != nil )
- {
- NSRange prefix_range = [o_title rangeOfString: @"file:"];
- if( prefix_range.location != NSNotFound )
- {
- [o_title deleteCharactersInRange: prefix_range];
- }
-
- [self setTitleWithRepresentedFilename: o_title];
- }
- else
- {
- [self setTitle:
- [NSString stringWithCString: VOUT_TITLE " (QuickTime)"]];
- }
-}
-
-/* This is actually the same as VLCControls::stop. */
-- (BOOL)windowShouldClose:(id)sender
-{
- playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
- {
- return NO;
- }
-
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
-
- /* The window will be closed by the intf later. */
- return NO;
-}
-
-@end
-
-/*****************************************************************************
- * VLCQTView implementation
- *****************************************************************************/
-@implementation VLCQTView
-
-- (void)drawRect:(NSRect)rect
-{
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
-
- [[NSColor blackColor] set];
- NSRectFill( rect );
- [super drawRect: rect];
-
- p_vout->i_changes |= VOUT_SIZE_CHANGE;
-}
-
-- (BOOL)acceptsFirstResponder
-{
- return( YES );
-}
-
-- (BOOL)becomeFirstResponder
-{
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
-
- [o_window setAcceptsMouseMovedEvents: YES];
- return( YES );
-}
-
-- (BOOL)resignFirstResponder
-{
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
-
- [o_window setAcceptsMouseMovedEvents: NO];
- VLCHideMouse( p_vout, NO );
- return( YES );
+ /* Escape should always get you out of fullscreen */
+ if( key == (unichar) 0x1b )
+ {
+ if( [self isFullscreen] )
+ {
+ [self toggleFullscreen];
+ }
+ }
+ else if ( key == ' ' )
+ {
+ vlc_value_t val;
+ val.i_int = config_GetInt( p_vout, "key-play-pause" );
+ var_Set( p_vout->p_vlc, "key-pressed", val );
+ }
+ else
+ {
+ val.i_int |= CocoaKeyToVLC( key );
+ var_Set( p_vout->p_vlc, "key-pressed", val );
+ }
+ }
+ else
+ {
+ [super keyDown: o_event];
+ }
}
- (void)mouseDown:(NSEvent *)o_event
{
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
vlc_value_t val;
- switch( [o_event type] )
- {
- case NSLeftMouseDown:
+ if( p_vout )
+ {
+ switch( [o_event type] )
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int |= 1;
- var_Set( p_vout, "mouse-button-down", val );
+ case NSLeftMouseDown:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 1;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseDown: o_event];
+ break;
}
- break;
-
- default:
- [super mouseDown: o_event];
- break;
}
}
- (void)otherMouseDown:(NSEvent *)o_event
{
- /* This is not the the wheel button. you need to poll the
- * mouseWheel event for that. other is a third, forth or fifth button */
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
vlc_value_t val;
- switch( [o_event type] )
+ if( p_vout )
{
- case NSOtherMouseDown:
+ switch( [o_event type] )
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int |= 2;
- var_Set( p_vout, "mouse-button-down", val );
+ case NSOtherMouseDown:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 2;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseDown: o_event];
+ break;
}
- break;
-
- default:
- [super mouseDown: o_event];
- break;
}
}
- (void)rightMouseDown:(NSEvent *)o_event
{
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
vlc_value_t val;
- switch( [o_event type] )
+ if( p_vout )
{
- case NSRightMouseDown:
+ switch( [o_event type] )
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int |= 4;
- var_Set( p_vout, "mouse-button-down", val );
+ case NSRightMouseDown:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 4;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseDown: o_event];
+ break;
}
- break;
-
- default:
- [super mouseDown: o_event];
- break;
}
}
- (void)mouseUp:(NSEvent *)o_event
{
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
vlc_value_t val;
- switch( [o_event type] )
+ if( p_vout )
{
- case NSLeftMouseUp:
+ switch( [o_event type] )
{
- vlc_value_t b_val;
- b_val.b_bool = VLC_TRUE;
- var_Set( p_vout, "mouse-clicked", b_val );
-
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int &= ~1;
- var_Set( p_vout, "mouse-button-down", val );
+ case NSLeftMouseUp:
+ {
+ vlc_value_t b_val;
+ b_val.b_bool = VLC_TRUE;
+ var_Set( p_vout, "mouse-clicked", b_val );
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~1;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseUp: o_event];
+ break;
}
- break;
-
- default:
- [super mouseUp: o_event];
- break;
}
}
- (void)otherMouseUp:(NSEvent *)o_event
{
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
vlc_value_t val;
- switch( [o_event type] )
+ if( p_vout )
{
- case NSOtherMouseUp:
+ switch( [o_event type] )
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int &= ~2;
- var_Set( p_vout, "mouse-button-down", val );
+ case NSOtherMouseUp:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~2;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseUp: o_event];
+ break;
}
- break;
-
- default:
- [super mouseUp: o_event];
- break;
}
}
- (void)rightMouseUp:(NSEvent *)o_event
{
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
vlc_value_t val;
- switch( [o_event type] )
+ if( p_vout )
{
- case NSRightMouseUp:
+ switch( [o_event type] )
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int &= ~4;
- var_Set( p_vout, "mouse-button-down", val );
+ case NSRightMouseUp:
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~4;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseUp: o_event];
+ break;
}
- break;
-
- default:
- [super mouseUp: o_event];
- break;
}
}
- (void)mouseDragged:(NSEvent *)o_event
{
- [self mouseMoved:o_event];
+ [self mouseMoved: o_event];
}
- (void)otherMouseDragged:(NSEvent *)o_event
{
- [self mouseMoved:o_event];
+ [self mouseMoved: o_event];
}
- (void)rightMouseDragged:(NSEvent *)o_event
{
- [self mouseMoved:o_event];
+ [self mouseMoved: o_event];
}
- (void)mouseMoved:(NSEvent *)o_event
NSRect s_rect;
BOOL b_inside;
- vout_thread_t * p_vout;
- id o_window = [self window];
- p_vout = (vout_thread_t *)[o_window getVout];
+ if( p_vout )
+ {
+ s_rect = [o_view bounds];
+ ml = [o_view convertPoint: [o_event locationInWindow] fromView: nil];
+ b_inside = [o_view mouse: ml inRect: s_rect];
+
+ if( b_inside )
+ {
+ vlc_value_t val;
+ unsigned int i_width, i_height, i_x, i_y;
- s_rect = [self bounds];
- ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
- b_inside = [self mouse: ml inRect: s_rect];
+ vout_PlacePicture( p_vout, (unsigned int)s_rect.size.width,
+ (unsigned int)s_rect.size.height,
+ &i_x, &i_y, &i_width, &i_height );
- if( b_inside )
- {
- vlc_value_t val;
- int i_width, i_height, i_x, i_y;
-
- vout_PlacePicture( p_vout, (unsigned int)s_rect.size.width,
- (unsigned int)s_rect.size.height,
- &i_x, &i_y, &i_width, &i_height );
-
- val.i_int = ( ((int)ml.x) - i_x ) *
- p_vout->render.i_width / i_width;
- var_Set( p_vout, "mouse-x", val );
-
- val.i_int = ( ((int)ml.y) - i_y ) *
- p_vout->render.i_height / i_height;
- var_Set( p_vout, "mouse-y", val );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "mouse-moved", val );
- p_vout->p_sys->i_time_mouse_last_moved = mdate();
- p_vout->p_sys->b_mouse_moved = YES;
- }
+ val.i_int = ( ((int)ml.x) - i_x ) *
+ p_vout->render.i_width / i_width;
+ var_Set( p_vout, "mouse-x", val );
+
+ if( [[o_view className] isEqualToString: @"VLCGLView"] )
+ {
+ val.i_int = ( ((int)(s_rect.size.height - ml.y)) - i_y ) *
+ p_vout->render.i_height / i_height;
+ }
+ else
+ {
+ val.i_int = ( ((int)ml.y) - i_y ) *
+ p_vout->render.i_height / i_height;
+ }
+ var_Set( p_vout, "mouse-y", val );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_vout, "mouse-moved", val );
+ }
+ }
[super mouseMoved: o_event];
}
-@end
+- (BOOL)acceptsFirstResponder
+{
+ return YES;
+}
-/*****************************************************************************
- * VLCGLView implementation
- *****************************************************************************/
-@implementation VLCGLView
+- (BOOL)becomeFirstResponder
+{
+ return YES;
+}
+
+- (BOOL)resignFirstResponder
+{
+ /* We need to stay the first responder or we'll miss some
+ events */
+ return NO;
+}
+/* Class methods used by the different vout modules */
-- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) _p_vout
++ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout
{
- char * psz_effect;
- p_vout = _p_vout;
-
- NSOpenGLPixelFormatAttribute attribs[] =
+ /* p_real_vout: the vout we have to use to check for video-on-top
+ and a few other things. If we are the QuickTime output, it's us.
+ It we are the OpenGL provider, it is our parent. */
+ if( p_vout->i_object_type == VLC_OBJECT_OPENGL )
{
- NSOpenGLPFAAccelerated,
- NSOpenGLPFANoRecovery,
- NSOpenGLPFADoubleBuffer,
- NSOpenGLPFAColorSize, 24,
- NSOpenGLPFAAlphaSize, 8,
- NSOpenGLPFADepthSize, 24,
- NSOpenGLPFAWindow,
- 0
- };
-
- NSOpenGLPixelFormat * fmt = [[NSOpenGLPixelFormat alloc]
- initWithAttributes: attribs];
-
- if( !fmt )
+ return (vout_thread_t *) p_vout->p_parent;
+ }
+ else
{
- msg_Warn( p_vout, "Cannot create NSOpenGLPixelFormat" );
- return nil;
+ return p_vout;
}
- self = [super initWithFrame:frame pixelFormat: fmt];
+}
- currentContext = [self openGLContext];
- [currentContext makeCurrentContext];
- [currentContext update];
++ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *)view
+ frame: (NSRect *)s_frame
+{
+ vlc_value_t value_drawable;
+ int i_timeout;
+ id o_return = nil;
+ vout_thread_t * p_real_vout = [VLCVoutView getRealVout: p_vout];
- /* Black background */
- glClearColor( 0.0, 0.0, 0.0, 0.0 );
+ var_Get( p_vout->p_vlc, "drawable", &value_drawable );
- /* Check if the user asked for useless visual effects */
- psz_effect = config_GetPsz( p_vout, "macosx-opengl-effect" );
- if( !strcmp( psz_effect, "none" ) )
- {
- i_effect = OPENGL_EFFECT_NONE;
- }
- else if( !strcmp( psz_effect, "cube" ) )
- {
- i_effect = OPENGL_EFFECT_CUBE;
+ var_Create( p_vout, "macosx-vdev", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "macosx-fill", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "macosx-stretch", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "macosx-background", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "macosx-embedded", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- glEnable( GL_DEPTH_TEST );
- }
- else if( !strcmp( psz_effect, "transparent-cube" ) )
- {
- i_effect = OPENGL_EFFECT_TRANSPARENT_CUBE;
- glDisable( GL_DEPTH_TEST );
- glEnable( GL_BLEND );
- glBlendFunc( GL_SRC_ALPHA, GL_ONE );
- }
- else
+ /* We only wait for NSApp to initialise if we're not embedded (as in the
+ * case of the Mozilla plugin). We can tell whether we're embedded or not
+ * by examining the "drawable" value: if it's zero, we're running in the
+ * main Mac intf; if it's non-zero, we're embedded. */
+ if( value_drawable.i_int == 0 )
{
- msg_Warn( p_vout, "no valid opengl effect provided, using "
- "\"none\"" );
- i_effect = OPENGL_EFFECT_NONE;
+ /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */
+ for( i_timeout = 20 ; i_timeout-- ; )
+ {
+ if( NSApp == NULL )
+ {
+ msleep( INTF_IDLE_SLEEP );
+ }
+ }
+
+ if( NSApp == NULL )
+ {
+ /* No MacOS X intf, unable to communicate with MT */
+ msg_Err( p_vout, "no MacOS X interface present" );
+ return nil;
+ }
+ else
+ {
+ if ( VLCIntf && !(p_vout->b_fullscreen) &&
+ !(var_GetBool( p_real_vout, "macosx-background" )) &&
+ var_GetBool( p_vout, "macosx-embedded") )
+ {
+ o_return = [[[VLCMain sharedInstance] getEmbeddedList]
+ getEmbeddedVout];
+ }
+ }
}
- if( i_effect & ( OPENGL_EFFECT_CUBE |
- OPENGL_EFFECT_TRANSPARENT_CUBE ) )
+ /* No embedded vout is available */
+ if( o_return == nil )
{
- /* Set the perpective */
- glMatrixMode( GL_PROJECTION );
- glLoadIdentity();
- glFrustum( -1.0, 1.0, -1.0, 1.0, 3.0, 20.0 );
- glMatrixMode( GL_MODELVIEW );
- glLoadIdentity();
- glTranslatef( 0.0, 0.0, - 5.0 );
+ NSRect null_rect;
+ bzero( &null_rect, sizeof( NSRect ) );
+ o_return = [[VLCDetachedVoutView alloc] initWithFrame: null_rect ];
}
+ [o_return setVout: p_vout subView: view frame: s_frame];
+ return o_return;
+}
- i_texture = 0;
- initDone = 0;
- isFullScreen = 0;
+@end
+
+/*****************************************************************************
+ * VLCDetachedVoutView implementation
+ *****************************************************************************/
+@implementation VLCDetachedVoutView
+- (id)initWithFrame: (NSRect)frameRect
+{
+ [super initWithFrame: frameRect];
+ i_time_mouse_last_moved = 0;
return self;
}
-- (void) reshape
+- (bool)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
+ frame: (NSRect *) s_arg_frame
{
- if( !initDone )
- {
- return;
- }
-
- [currentContext makeCurrentContext];
-
- NSRect bounds = [self bounds];
- glViewport( 0, 0, (GLint) bounds.size.width,
- (GLint) bounds.size.height );
-
- /* Quad size is set in order to preserve the aspect ratio */
- if( config_GetInt( p_vout, "macosx-stretch" ) )
- {
- f_x = 1.0;
- f_y = 1.0;
- }
- else if( bounds.size.height * p_vout->output.i_aspect <
- bounds.size.width * VOUT_ASPECT_FACTOR )
- {
- f_x = bounds.size.height * p_vout->output.i_aspect /
- VOUT_ASPECT_FACTOR / bounds.size.width;
- f_y = 1.0;
- }
- else
- {
- f_x = 1.0;
- f_y = bounds.size.width * VOUT_ASPECT_FACTOR /
- p_vout->output.i_aspect / bounds.size.height;
- }
+ BOOL b_return = [super setVout: p_arg_vout subView: view frame:s_arg_frame];
+ i_time_mouse_last_moved = mdate();
+ o_window = [[VLCWindow alloc] initWithVout: p_arg_vout view: self
+ frame: s_arg_frame];
+ [self updateTitle];
+ [view setFrame: [self frame]];
+ [o_window setAcceptsMouseMovedEvents: TRUE];
+ return b_return;
}
-- (void) initTextures
+- (void)closeVout
{
- [currentContext makeCurrentContext];
-
- /* Free previous texture if any */
- if( i_texture )
- {
- glDeleteTextures( 1, &i_texture );
- }
-
- /* Create textures */
- glGenTextures( 1, &i_texture );
-
- glEnable( GL_TEXTURE_RECTANGLE_EXT );
- glEnable( GL_UNPACK_CLIENT_STORAGE_APPLE );
-
- glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
-
- /* Use VRAM texturing */
- glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
- GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE );
-
- /* Tell the driver not to make a copy of the texture but to use
- our buffer */
- glPixelStorei( GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE );
-
- /* Linear interpolation */
- glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
- GL_TEXTURE_MIN_FILTER, GL_LINEAR );
- glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
- GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-
- /* I have no idea what this exactly does, but it seems to be
- necessary for scaling */
- glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
- GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
- glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
- GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 );
-
- glTexImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGBA,
- p_vout->output.i_width, p_vout->output.i_height, 0,
- GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE,
- PP_OUTPUTPICTURE[0]->p_data );
-
- initDone = 1;
+ [o_window closeWindow];
+ [o_window setAcceptsMouseMovedEvents: NO];
+ i_time_mouse_last_moved = 0;
+ [super closeVout];
}
-- (void) reloadTexture
+- (void)mouseMoved:(NSEvent *)o_event
{
- if( !initDone )
- {
- return;
- }
-
- [currentContext makeCurrentContext];
-
- glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
-
- /* glTexSubImage2D is faster than glTexImage2D
- http://developer.apple.com/samplecode/Sample_Code/Graphics_3D/
- TextureRange/MainOpenGLView.m.htm */
- glTexSubImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, 0, 0,
- p_vout->output.i_width, p_vout->output.i_height,
- GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE,
- PP_OUTPUTPICTURE[0]->p_data );
+ i_time_mouse_last_moved = mdate();
+ [super mouseMoved: o_event];
}
-- (void) goFullScreen
+- (void)hideMouse:(BOOL)b_hide
{
- /* Create the new pixel format */
- NSOpenGLPixelFormatAttribute attribs[] =
- {
- NSOpenGLPFAAccelerated,
- NSOpenGLPFANoRecovery,
- NSOpenGLPFADoubleBuffer,
- NSOpenGLPFAColorSize, 24,
- NSOpenGLPFAAlphaSize, 8,
- NSOpenGLPFADepthSize, 24,
- NSOpenGLPFAFullScreen,
- NSOpenGLPFAScreenMask,
- /* TODO handle macosxx-vdev */
- CGDisplayIDToOpenGLDisplayMask( kCGDirectMainDisplay ),
- 0
- };
- NSOpenGLPixelFormat * fmt = [[NSOpenGLPixelFormat alloc]
- initWithAttributes: attribs];
- if( !fmt )
- {
- msg_Warn( p_vout, "Cannot create NSOpenGLPixelFormat" );
- return;
- }
+ BOOL b_inside;
+ NSPoint ml;
+ NSView *o_contents = [o_window contentView];
- /* Create the new OpenGL context */
- fullScreenContext = [[NSOpenGLContext alloc]
- initWithFormat: fmt shareContext: nil];
- if( !fullScreenContext )
- {
- msg_Warn( p_vout, "Failed to create new NSOpenGLContext" );
- return;
- }
- currentContext = fullScreenContext;
+ ml = [o_window convertScreenToBase:[NSEvent mouseLocation]];
+ ml = [o_contents convertPoint:ml fromView:nil];
+ b_inside = [o_contents mouse: ml inRect: [o_contents bounds]];
- /* Capture display, switch to fullscreen */
- if( CGCaptureAllDisplays() != CGDisplayNoErr )
+ if( b_hide && b_inside )
{
- msg_Warn( p_vout, "CGCaptureAllDisplays() failed" );
- return;
+ [NSCursor setHiddenUntilMouseMoves: YES];
}
- [fullScreenContext setFullScreen];
- [fullScreenContext makeCurrentContext];
-
- /* Ratio */
- unsigned width = CGDisplayPixelsWide( kCGDirectMainDisplay );
- unsigned height = CGDisplayPixelsHigh( kCGDirectMainDisplay );
- int stretch = config_GetInt( p_vout, "macosx-stretch" );
- int fill = config_GetInt( p_vout, "macosx-fill" );
- int bigRatio = ( height * p_vout->output.i_aspect <
- width * VOUT_ASPECT_FACTOR );
- if( stretch )
+ else if( !b_hide )
{
- f_x = 1.0;
- f_y = 1.0;
+ [NSCursor setHiddenUntilMouseMoves: NO];
}
- else if( ( bigRatio && !fill ) || ( !bigRatio && fill ) )
+}
+
+- (void)manage
+{
+ [super manage];
+ if( p_vout->b_fullscreen )
{
- f_x = (float) height * p_vout->output.i_aspect /
- width / VOUT_ASPECT_FACTOR;
- f_y = 1.0;
+ if( mdate() - i_time_mouse_last_moved > 3000000 )
+ {
+ [self hideMouse: YES];
+ }
}
else
{
- f_x = 1.0;
- f_y = (float) width * VOUT_ASPECT_FACTOR /
- p_vout->output.i_aspect / height;
+ [self hideMouse: NO];
}
-
- /* Update viewport, re-init textures */
- glViewport( 0, 0, width, height );
- [self initTextures];
-
- /* Redraw the last picture */
- [self setNeedsDisplay: YES];
-
- isFullScreen = 1;
}
-- (void) exitFullScreen
-{
- /* Free current OpenGL context */
- [NSOpenGLContext clearCurrentContext];
- [fullScreenContext clearDrawable];
- [fullScreenContext release];
- CGReleaseAllDisplays();
+@end
- currentContext = [self openGLContext];
- [self initTextures];
- [self reshape];
+/*****************************************************************************
+ * VLCEmbeddedVoutView implementation
+ *****************************************************************************/
- /* Redraw the last picture */
- [self setNeedsDisplay: YES];
+@implementation VLCEmbeddedVoutView
- isFullScreen = 0;
+- (id)initWithFrame: (NSRect)frameRect
+{
+ [super initWithFrame: frameRect];
+ b_used = NO;
+ [[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self];
+ return self;
}
-- (void) cleanUp
+- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
+ frame: (NSRect *) s_arg_frame
+
{
- if( isFullScreen )
+ BOOL b_return;
+ b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame];
+ if( b_return )
{
- [self exitFullScreen];
+ o_window = [self window];
+ [o_window makeKeyAndOrderFront: self];
+ [o_window setAcceptsMouseMovedEvents: TRUE];
+ [view setFrameSize: [self frame].size];
}
- initDone = 0;
+ return b_return;
}
-- (void) drawQuad
+- (void)setUsed: (BOOL)b_new_used
{
- glBegin( GL_QUADS );
- /* Top left */
- glTexCoord2f( 0.0, 0.0 );
- glVertex2f( - f_x, f_y );
- /* Bottom left */
- glTexCoord2f( 0.0, (float) p_vout->output.i_height );
- glVertex2f( - f_x, - f_y );
- /* Bottom right */
- glTexCoord2f( (float) p_vout->output.i_width,
- (float) p_vout->output.i_height );
- glVertex2f( f_x, - f_y );
- /* Top right */
- glTexCoord2f( (float) p_vout->output.i_width, 0.0 );
- glVertex2f( f_x, f_y );
- glEnd();
+ b_used = b_new_used;
}
-- (void) drawCube
+- (BOOL)isUsed
{
- glBegin( GL_QUADS );
- /* Front */
- glTexCoord2f( 0.0, 0.0 );
- glVertex3f( - 1.0, 1.0, 1.0 );
- glTexCoord2f( 0.0, (float) p_vout->output.i_height );
- glVertex3f( - 1.0, - 1.0, 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width,
- (float) p_vout->output.i_height );
- glVertex3f( 1.0, - 1.0, 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width, 0.0 );
- glVertex3f( 1.0, 1.0, 1.0 );
-
- /* Left */
- glTexCoord2f( 0.0, 0.0 );
- glVertex3f( - 1.0, 1.0, - 1.0 );
- glTexCoord2f( 0.0, (float) p_vout->output.i_height );
- glVertex3f( - 1.0, - 1.0, - 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width,
- (float) p_vout->output.i_height );
- glVertex3f( - 1.0, - 1.0, 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width, 0.0 );
- glVertex3f( - 1.0, 1.0, 1.0 );
-
- /* Back */
- glTexCoord2f( 0.0, 0.0 );
- glVertex3f( 1.0, 1.0, - 1.0 );
- glTexCoord2f( 0.0, (float) p_vout->output.i_height );
- glVertex3f( 1.0, - 1.0, - 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width,
- (float) p_vout->output.i_height );
- glVertex3f( - 1.0, - 1.0, - 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width, 0.0 );
- glVertex3f( - 1.0, 1.0, - 1.0 );
-
- /* Right */
- glTexCoord2f( 0.0, 0.0 );
- glVertex3f( 1.0, 1.0, 1.0 );
- glTexCoord2f( 0.0, (float) p_vout->output.i_height );
- glVertex3f( 1.0, - 1.0, 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width,
- (float) p_vout->output.i_height );
- glVertex3f( 1.0, - 1.0, - 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width, 0.0 );
- glVertex3f( 1.0, 1.0, - 1.0 );
-
- /* Top */
- glTexCoord2f( 0.0, 0.0 );
- glVertex3f( - 1.0, 1.0, - 1.0 );
- glTexCoord2f( 0.0, (float) p_vout->output.i_height );
- glVertex3f( - 1.0, 1.0, 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width,
- (float) p_vout->output.i_height );
- glVertex3f( 1.0, 1.0, 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width, 0.0 );
- glVertex3f( 1.0, 1.0, - 1.0 );
-
- /* Bottom */
- glTexCoord2f( 0.0, 0.0 );
- glVertex3f( - 1.0, - 1.0, 1.0 );
- glTexCoord2f( 0.0, (float) p_vout->output.i_height );
- glVertex3f( - 1.0, - 1.0, - 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width,
- (float) p_vout->output.i_height );
- glVertex3f( 1.0, - 1.0, - 1.0 );
- glTexCoord2f( (float) p_vout->output.i_width, 0.0 );
- glVertex3f( 1.0, - 1.0, 1.0 );
- glEnd();
+ return b_used;
}
-- (void) drawRect: (NSRect) rect
+- (void)closeVout
{
- [currentContext makeCurrentContext];
-
- /* Swap buffers only during the vertical retrace of the monitor.
- http://developer.apple.com/documentation/GraphicsImaging/
- Conceptual/OpenGL/chap5/chapter_5_section_44.html */
- long params[] = { 1 };
- CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval,
- params );
-
- /* Black background */
- glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-
- if( !initDone )
- {
- [currentContext flushBuffer];
- return;
- }
+ [super closeVout];
+ [o_window setAcceptsMouseMovedEvents: NO];
+ [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self];
+}
- /* Draw */
- glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
- if( i_effect & ( OPENGL_EFFECT_CUBE |
- OPENGL_EFFECT_TRANSPARENT_CUBE ) )
- {
- glRotatef( 1.0, 0.3, 0.5, 0.7 );
- [self drawCube];
- }
- else
+
+@end
+
+@implementation VLCDetachedEmbeddedVoutView
+
+- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
+ frame: (NSRect *) s_arg_frame
+{
+ BOOL b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame];
+
+ if( b_return )
{
- [self drawQuad];
+ [o_window setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )];
+ [self updateTitle];
+ [self scaleWindowWithFactor: 1.0];
+ [o_window makeKeyAndOrderFront: self];
}
+ return b_return;
+}
- /* Wait for the job to be done */
- [currentContext flushBuffer];
+- (void)closeVout
+{
+ [o_window orderOut: self];
+ [super closeVout];
}
@end
/*****************************************************************************
- * VLCVout implementation
+ * VLCWindow implementation
*****************************************************************************/
-@implementation VLCVout
+@implementation VLCWindow
-- (void)createWindow:(NSValue *)o_value
+- (id) initWithVout: (vout_thread_t *) vout view: (VLCVoutView *) view
+ frame: (NSRect *) frame
{
- vlc_value_t val;
- VLCQTView * o_view;
- NSScreen * o_screen;
- vout_thread_t * p_vout;
- vlc_bool_t b_main_screen;
-
- p_vout = (vout_thread_t *)[o_value pointerValue];
-
- p_vout->p_sys->o_window = [VLCWindow alloc];
- [p_vout->p_sys->o_window setVout: p_vout];
- [p_vout->p_sys->o_window setReleasedWhenClosed: YES];
-
- if( var_Get( p_vout, "video-device", &val ) < 0 )
+ p_vout = vout;
+ o_view = view;
+ s_frame = frame;
+
+ [self performSelectorOnMainThread: @selector(initReal:)
+ withObject: NULL waitUntilDone: YES];
+
+ if( !b_init_ok )
+ {
+ return NULL;
+ }
+
+ return self;
+}
+
+- (id)initReal: (id) sender
+{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ NSArray *o_screens = [NSScreen screens];
+ NSScreen *o_screen;
+ vlc_bool_t b_menubar_screen = VLC_FALSE;
+ int i_device;
+
+ b_init_ok = VLC_FALSE;
+
+ p_fullscreen_state = NULL;
+
+ p_real_vout = [VLCVoutView getRealVout: p_vout];
+ i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" );
+
+ /* Find out on which screen to open the window */
+ if( i_device <= 0 || i_device > (int)[o_screens count] )
{
+ /* No preference specified. Use the main screen */
o_screen = [NSScreen mainScreen];
- b_main_screen = 1;
+ if( o_screen == [o_screens objectAtIndex: 0] )
+ b_menubar_screen = VLC_TRUE;
}
else
{
- NSArray *o_screens = [NSScreen screens];
- unsigned int i_index = val.i_int;
-
- if( [o_screens count] < i_index )
- {
- o_screen = [NSScreen mainScreen];
- b_main_screen = 1;
- }
- else
- {
- i_index--;
- o_screen = [o_screens objectAtIndex: i_index];
- config_PutInt( p_vout, "macosx-vdev", i_index );
- b_main_screen = (i_index == 0);
- }
- }
+ i_device--;
+ o_screen = [o_screens objectAtIndex: i_device];
+ b_menubar_screen = ( i_device == 0 );
+ }
- if( p_vout->b_fullscreen && !p_vout->p_sys->i_opengl )
+ if( p_vout->b_fullscreen )
{
NSRect screen_rect = [o_screen frame];
screen_rect.origin.x = screen_rect.origin.y = 0;
- if ( b_main_screen && p_vout->p_sys->p_fullscreen_state == NULL )
- BeginFullScreen( &p_vout->p_sys->p_fullscreen_state, NULL, 0, 0,
+ /* Creates a window with size: screen_rect on o_screen */
+ [self initWithContentRect: screen_rect
+ styleMask: NSBorderlessWindowMask
+ backing: NSBackingStoreBuffered
+ defer: YES screen: o_screen];
+
+ if( b_menubar_screen )
+ {
+ BeginFullScreen( &p_fullscreen_state, NULL, 0, 0,
NULL, NULL, fullScreenAllowEvents );
+ }
+ }
+ else if( var_GetBool( p_real_vout, "macosx-background" ) )
+ {
+ NSRect screen_rect = [o_screen frame];
+ screen_rect.origin.x = screen_rect.origin.y = 0;
- [p_vout->p_sys->o_window
- initWithContentRect: screen_rect
- styleMask: NSBorderlessWindowMask
- backing: NSBackingStoreBuffered
- defer: NO screen: o_screen];
+ /* Creates a window with size: screen_rect on o_screen */
+ [self initWithContentRect: screen_rect
+ styleMask: NSBorderlessWindowMask
+ backing: NSBackingStoreBuffered
+ defer: YES screen: o_screen];
- //[p_vout->p_sys->o_window setLevel: NSPopUpMenuWindowLevel - 1];
- p_vout->p_sys->b_mouse_moved = YES;
- p_vout->p_sys->i_time_mouse_last_moved = mdate();
+ [self setLevel: CGWindowLevelForKey(kCGDesktopWindowLevelKey)];
}
else
{
NSMiniaturizableWindowMask |
NSClosableWindowMask |
NSResizableWindowMask;
-
- if( !p_vout->p_sys->i_opengl )
+
+ NSRect s_rect;
+ if( !s_frame )
+ {
+ s_rect.size.width = p_vout->i_window_width;
+ s_rect.size.height = p_vout->i_window_height;
+ }
+ else
{
- if ( p_vout->p_sys->p_fullscreen_state != NULL )
- EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
- p_vout->p_sys->p_fullscreen_state = NULL;
+ s_rect = *s_frame;
}
- [p_vout->p_sys->o_window
- initWithContentRect: p_vout->p_sys->s_rect
- styleMask: i_stylemask
- backing: NSBackingStoreBuffered
- defer: NO screen: o_screen];
+ [self initWithContentRect: s_rect
+ styleMask: i_stylemask
+ backing: NSBackingStoreBuffered
+ defer: YES screen: o_screen];
- [p_vout->p_sys->o_window setAlphaValue: config_GetFloat( p_vout, "macosx-opaqueness" )];
-
- if( config_GetInt( p_vout, "video-on-top" ) )
+ [self setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )];
+
+ if( var_GetBool( p_real_vout, "video-on-top" ) )
{
- [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
+ [self setLevel: NSStatusWindowLevel];
}
-
- if( !p_vout->p_sys->b_pos_saved )
+
+ if( !s_frame )
{
- [p_vout->p_sys->o_window center];
+ [self center];
}
}
- if( !p_vout->p_sys->i_opengl )
- {
- o_view = [[VLCQTView alloc] init];
- /* FIXME: [o_view setMenu:] */
- [p_vout->p_sys->o_window setContentView: o_view];
- [o_view autorelease];
-
- [o_view lockFocus];
- p_vout->p_sys->p_qdport = [o_view qdPort];
- [o_view unlockFocus];
- }
- else
- {
-#define o_glview p_vout->p_sys->o_glview
- o_glview = [[VLCGLView alloc] initWithFrame: p_vout->p_sys->s_rect vout: p_vout];
- [p_vout->p_sys->o_window setContentView: o_glview];
- [o_glview autorelease];
-#undef o_glview
- }
-
- [p_vout->p_sys->o_window updateTitle];
- [p_vout->p_sys->o_window makeKeyAndOrderFront: nil];
+ [self makeKeyAndOrderFront: nil];
+ [self setReleasedWhenClosed: YES];
+
+ /* We'll catch mouse events */
+ [self makeFirstResponder: o_view];
+
+ /* Add the view. It's automatically resized to fit the window */
+ [self setContentView: o_view];
+
+ [o_pool release];
+ b_init_ok = VLC_TRUE;
+ return self;
}
-- (void)destroyWindow:(NSValue *)o_value
+- (void)close
{
- vout_thread_t * p_vout;
+ [o_view closeVout];
+}
- p_vout = (vout_thread_t *)[o_value pointerValue];
+- (void) closeWindow
+{
+ /* XXX waitUntilDone = NO to avoid a possible deadlock when hitting
+ Command-Q */
+ [self setContentView: NULL];
+ [self performSelectorOnMainThread: @selector(closeReal:)
+ withObject: NULL waitUntilDone: NO];
+}
- if( !p_vout->b_fullscreen )
+- (id) closeReal: (id) sender
+{
+ [super close];
+ if( p_fullscreen_state )
{
- NSRect s_rect;
+ EndFullScreen( p_fullscreen_state, 0 );
+ }
+ return NULL;
+}
+
+- (id)getVoutView
+{
+ return o_view;
+}
+
+- (BOOL)canBecomeKeyWindow
+{
+ return YES;
+}
- s_rect = [[p_vout->p_sys->o_window contentView] frame];
- p_vout->p_sys->s_rect.size = s_rect.size;
+/* Sometimes crashes VLC....
+- (BOOL)performKeyEquivalent:(NSEvent *)o_event
+{
+ return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event];
+}*/
- s_rect = [p_vout->p_sys->o_window frame];
- p_vout->p_sys->s_rect.origin = s_rect.origin;
+/* This is actually the same as VLCControls::stop. */
- p_vout->p_sys->b_pos_saved = YES;
+- (BOOL)windowShouldClose:(id)sender
+{
+ playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist == NULL )
+ {
+ return NO;
}
-
- p_vout->p_sys->p_qdport = nil;
- [p_vout->p_sys->o_window close];
- p_vout->p_sys->o_window = nil;
+
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
+
+ /* The window will be closed by the intf later. */
+ return NO;
}
+
@end
projects / vlc / blobdiff