* Local prototypes
*****************************************************************************/
-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 InitVideo ( vout_thread_t * );
+static void EndVideo ( vout_thread_t * );
+static int ManageVideo ( vout_thread_t * );
+static void DisplayVideo ( vout_thread_t *, picture_t * );
+static int ControlVideo ( vout_thread_t *, int, va_list );
-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 * );
+static int CoCreateWindow ( vout_thread_t * );
+static int CoDestroyWindow ( vout_thread_t * );
-static void VLCHideMouse ( vout_thread_t *, BOOL );
+static int CoToggleFullscreen ( vout_thread_t * );
+static int CoSetWindowOnTop ( vout_thread_t *, BOOL );
+static void VLCHideMouse ( vout_thread_t *, BOOL );
-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 * );
+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
int E_(OpenVideo) ( vlc_object_t *p_this )
{
vout_thread_t * p_vout = (vout_thread_t *)p_this;
+ vlc_value_t val;
OSErr err;
int i_timeout;
return( 1 );
}
- 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->pf_init = InitVideo;
+ p_vout->pf_end = EndVideo;
+ p_vout->pf_manage = ManageVideo;
+ p_vout->pf_render = NULL;
+ p_vout->pf_display = DisplayVideo;
+ p_vout->pf_control = ControlVideo;
+ p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
p_vout->p_sys->b_mouse_moved = VLC_TRUE;
p_vout->p_sys->i_time_mouse_last_moved = mdate();
- /* set window size */
+ /* set original 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;
+ var_Create( p_vout, "macosx-vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ 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-opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+
/* Check if we should use QuickTime or OpenGL */
- p_vout->p_sys->i_opengl = config_GetInt( p_vout, "macosx-opengl" );
+ var_Get( p_vout, "macosx-vout", &val);
+ if( !strncmp( val.psz_string, "auto", 4 ) )
+ {
+ p_vout->p_sys->i_opengl = CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay );
+ }
+ else if( !strncmp( val.psz_string, "opengl", 6 ) )
+ {
+ p_vout->p_sys->i_opengl = VLC_TRUE;
+ }
+ else
+ {
+ p_vout->p_sys->i_opengl = VLC_FALSE;
+ }
+ free( val.psz_string );
+
if( !p_vout->p_sys->i_opengl )
{
/* Initialize QuickTime */
free( p_vout->p_sys->p_matrix );
DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
free( p_vout->p_sys );
- return( 1 );
- }
+ return VLC_EGENERIC;
+ }
/* Damn QT isn't thread safe. so keep a lock in the p_vlc object */
vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock );
+ /* Can we find the right chroma ? */
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');
free( p_vout->p_sys );
return VLC_EGENERIC;
}
+ msg_Dbg( p_vout, "using Quartz mode" );
+ }
+ else
+ {
+ p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2');
+ msg_Dbg( p_vout, "using OpenGL mode" );
}
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ /* Setup the menuitem for the multiple displays. Read the vlc preference (macosx-vdev) for the primary display */
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;
+ vlc_value_t val2, text;
NSScreen * o_screen;
- int i_option = config_GetInt( p_vout, "macosx-vdev" );
+ var_Get( p_vout, "macosx-vdev", &val );
var_Create( p_vout, "video-device", VLC_VAR_INTEGER |
VLC_VAR_HASCHOICE );
(int)s_rect.size.width, (int)s_rect.size.height );
text.psz_string = psz_temp;
- val.i_int = i;
+ val2.i_int = i;
var_Change( p_vout, "video-device",
- VLC_VAR_ADDCHOICE, &val, &text );
+ VLC_VAR_ADDCHOICE, &val2, &text );
- if( ( i - 1 ) == i_option )
+ if( ( i - 1 ) == val.i_int )
{
- var_Set( p_vout, "video-device", val );
+ var_Set( p_vout, "video-device", val2 );
}
i++;
}
var_AddCallback( p_vout, "video-device", vout_VarCallback,
NULL );
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "intf-change", val );
+ val2.b_bool = VLC_TRUE;
+ var_Set( p_vout, "intf-change", val2 );
}
- [o_pool release];
+ /* Spawn window */
if( CoCreateWindow( p_vout ) )
{
- msg_Err( p_vout, "unable to create window" );
+ msg_Err( p_vout, "unable to create a 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 );
+ return VLC_EGENERIC;
}
- 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 );
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * vout_Init: initialize video thread output method
+ * CloseVideo: destroy video thread output method
*****************************************************************************/
-static int vout_Init( vout_thread_t *p_vout )
+void E_(CloseVideo) ( vlc_object_t *p_this )
{
- int i_index;
- picture_t *p_pic;
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ vout_thread_t * p_vout = (vout_thread_t *)p_this;
+
+ if( CoDestroyWindow( p_vout ) )
+ {
+ msg_Err( p_vout, "unable to destroy window" );
+ }
+
+ if ( p_vout->p_sys->p_fullscreen_state != NULL )
+ {
+ EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
+ }
+
+ if( !p_vout->p_sys->i_opengl )
+ {
+ /* Clean Up Quicktime environment */
+ ExitMovies();
+ free( p_vout->p_sys->p_matrix );
+ DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
+ }
+ else
+ {
+ [p_vout->p_sys->o_glview cleanUp];
+ }
+
+ [o_pool release];
+ free( p_vout->p_sys );
+}
+/*****************************************************************************
+ * InitVideo: initialize video thread output method
+ *****************************************************************************/
+static int InitOpenGL ( vout_thread_t *p_vout );
+static int InitQuickTime( vout_thread_t *p_vout );
+static int InitVideo ( vout_thread_t *p_vout )
+{
I_OUTPUTPICTURES = 0;
/* Initialize the output structure; we already found a codec,
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 )
+ if( p_vout->p_sys->i_opengl )
{
- SetPort( p_vout->p_sys->p_qdport );
- QTScaleMatrix( p_vout );
-
- if( QTCreateSequence( p_vout ) )
- {
- msg_Err( p_vout, "unable to create sequence" );
- return( 1 );
- }
+ return InitOpenGL( p_vout );
}
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;
+ return InitQuickTime( p_vout );
}
+}
- /* Try to initialize up to QT_MAX_DIRECTBUFFERS direct buffers */
- while( I_OUTPUTPICTURES <
- p_vout->p_sys->i_opengl ? 1 : QT_MAX_DIRECTBUFFERS )
+static int InitOpenGL( vout_thread_t *p_vout )
+{
+ picture_t *p_pic = NULL;
+ int i_bytes;
+ int i_index;
+
+ /* Apple OpenGL extensions only accept YUV as YUY2 */
+ 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;
+
+ /* Allocate our 2 picture buffers */
+ i_bytes = 2 * p_vout->output.i_width * p_vout->output.i_height;
+ p_vout->p_sys->p_data[0] = vlc_memalign(
+ &p_vout->p_sys->p_data_orig[0], 16, i_bytes );
+ p_vout->p_sys->p_data[1] = vlc_memalign(
+ &p_vout->p_sys->p_data_orig[1], 16, i_bytes );
+ p_vout->p_sys->i_cur_pic = 1;
+
+ /* We declare only one picture and will switch buffers manually */
+ while( I_OUTPUTPICTURES < 1 )
{
- p_pic = NULL;
-
/* Find an empty picture slot */
for( i_index = 0; i_index < VOUT_MAX_PICTURES; i_index++ )
{
break;
}
}
-
- /* Allocate the picture */
if( p_pic == NULL )
{
break;
}
- if( !p_vout->p_sys->i_opengl )
+ vout_InitPicture( 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->p_data = p_vout->p_sys->p_data[0];
+ p_pic->p[0].p_pixels = p_pic->p_data;
+ for( i_index = 1; i_index < p_pic->i_planes; i_index++ )
+ {
+ p_pic->p[i_index].p_pixels =
+ p_pic->p[i_index-1].p_pixels +
+ p_pic->p[i_index-1].i_lines *
+ p_pic->p[i_index-1].i_pitch;
+ }
+
+ p_pic->i_status = DESTROYED_PICTURE;
+ p_pic->i_type = DIRECT_PICTURE;
+
+ PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic;
+ I_OUTPUTPICTURES++;
+ }
+
+ [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;
+}
+
+static int InitQuickTime( vout_thread_t *p_vout )
+{
+ picture_t *p_pic;
+ int i_index;
+
+ SetPort( p_vout->p_sys->p_qdport );
+ QTScaleMatrix( p_vout );
+
+ if( QTCreateSequence( p_vout ) )
+ {
+ msg_Err( p_vout, "unable to create sequence" );
+ return( 1 );
+ }
+
+ /* Try to initialize up to QT_MAX_DIRECTBUFFERS direct buffers */
+ while( I_OUTPUTPICTURES < QT_MAX_DIRECTBUFFERS )
+ {
+ p_pic = NULL;
+
+ /* Find an empty picture slot */
+ for( i_index = 0; i_index < VOUT_MAX_PICTURES; i_index++ )
{
- if( QTNewPicture( p_vout, p_pic ) )
+ if( p_vout->p_picture[ i_index ].i_status == FREE_PICTURE )
{
+ p_pic = p_vout->p_picture + i_index;
break;
}
}
- else
+
+ /* Allocate the picture */
+ if( p_pic == NULL || QTNewPicture( p_vout, p_pic ) )
{
- /* 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 );
+ break;
}
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 0;
}
/*****************************************************************************
- * vout_End: terminate video thread output method
+ * EndVideo: terminate video thread output method
*****************************************************************************/
-static void vout_End( vout_thread_t *p_vout )
+static void EndVideo( vout_thread_t *p_vout )
{
int i_index;
{
QTDestroySequence( p_vout );
}
- else
- {
- [p_vout->p_sys->o_glview cleanUp];
- }
/* Free the direct buffers we allocated */
for( i_index = I_OUTPUTPICTURES; i_index; )
}
else
{
- free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
+ free( p_vout->p_sys->p_data_orig[0] );
+ free( p_vout->p_sys->p_data_orig[1] );
}
}
}
/*****************************************************************************
- * 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 ) )
- {
- msg_Err( p_vout, "unable to destroy window" );
- }
-
- 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
+ * ManageVideo: 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 )
+static int ManageVideo( vout_thread_t *p_vout )
{
if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
{
*****************************************************************************
* This function sends the currently rendered image to the display.
*****************************************************************************/
-static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic )
+static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
{
if( !p_vout->p_sys->i_opengl )
{
{
if( [p_vout->p_sys->o_glview lockFocusIfCanDraw] )
{
- /* Texture gotta be reload before the buffer is filled
- (thanks to gcc from arstechnica forums) */
+ int i_index;
+ int i_old = p_vout->p_sys->i_cur_pic;
+ int i_new = ( i_old + 1 ) % 2;
+
+ /* Draw the new picture */
+ p_vout->p_sys->i_cur_pic = i_new;
[p_vout->p_sys->o_glview drawRect:
[p_vout->p_sys->o_glview bounds]];
- [p_vout->p_sys->o_glview reloadTexture];
+
+ /* Reload the other texture. Textures have to be reloaded
+ before the buffer is filled (thanks to gcc from
+ arstechnica forums) */
+ [p_vout->p_sys->o_glview reloadTexture: i_old];
+
+ /* Switch buffers */
+ p_pic->p_data = p_vout->p_sys->p_data[i_old];
+ p_pic->p[0].p_pixels = p_pic->p_data;
+ for( i_index = 1; i_index < p_pic->i_planes; i_index++ )
+ {
+ p_pic->p[i_index].p_pixels =
+ p_pic->p[i_index-1].p_pixels +
+ p_pic->p[i_index-1].i_lines *
+ p_pic->p[i_index-1].i_pitch;
+ }
[p_vout->p_sys->o_glview unlockFocus];
}
}
}
/*****************************************************************************
- * CoSendRequest: send request to interface thread
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
+ * ControlVideo: control facility for the vout
*****************************************************************************/
-static int CoSendRequest( vout_thread_t *p_vout, SEL sel )
+static int ControlVideo( vout_thread_t *p_vout, int i_query, va_list args )
{
- int i_ret = 0;
- vlc_value_t val;
- intf_thread_t * p_intf;
-
- VLCVout * o_vlv = [[VLCVout alloc] init];
+ vlc_bool_t b_arg;
- if( ( i_ret = ExecuteOnMainThread( o_vlv, sel, (void *)p_vout ) ) )
+ switch( i_query )
{
- msg_Err( p_vout, "SendRequest: no way to communicate with mt" );
- }
-
- [o_vlv release];
+ case VOUT_SET_STAY_ON_TOP:
+ b_arg = va_arg( args, vlc_bool_t );
+ CoSetWindowOnTop( p_vout, b_arg );
+ return VLC_SUCCESS;
- /*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 );
+ case VOUT_CLOSE:
+ case VOUT_REPARENT:
+ default:
+ return vout_vaControlDefault( p_vout, i_query, args );
+ }
}
/*****************************************************************************
*****************************************************************************/
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 );
-}
-
-/*****************************************************************************
- * CoDestroyWindow: destroy window
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
- *****************************************************************************/
-static int CoDestroyWindow( vout_thread_t *p_vout )
-{
+ vlc_value_t val;
+ NSScreen * o_screen;
+ vlc_bool_t b_main_screen;
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
- VLCHideMouse( p_vout, NO );
+ /* Allocate the window. It will be autoreleased when it receives 'close' */
+ p_vout->p_sys->o_window = [VLCWindow alloc];
+ [p_vout->p_sys->o_window setReleasedWhenClosed: YES];
- if( CoSendRequest( p_vout, @selector(destroyWindow:) ) )
+ /* Find out on which screen to open the window */
+ var_Get( p_vout, "video-device", &val );
+ if( val.i_int < 0 )
{
- msg_Err( p_vout, "CoSendRequest (destroyWindow) failed" );
- return( 1 );
+ /* No preference specified. Use the main screen */
+ o_screen = [NSScreen mainScreen];
+ b_main_screen = 1;
}
-
- return( 0 );
-}
-
-/*****************************************************************************
- * CoToggleFullscreen: toggle fullscreen
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
- *****************************************************************************/
-static int CoToggleFullscreen( vout_thread_t *p_vout )
-{
-
- vlc_value_t val;
- intf_thread_t * p_intf;
-
- if( p_vout->p_sys->i_opengl )
+ else
{
- p_vout->b_fullscreen = !p_vout->b_fullscreen;
- if( p_vout->b_fullscreen )
+ NSArray *o_screens = [NSScreen screens];
+ unsigned int i_index = val.i_int;
+
+ if( [o_screens count] < i_index )
{
- [p_vout->p_sys->o_glview goFullScreen];
+ o_screen = [NSScreen mainScreen];
+ b_main_screen = 1;
}
else
{
- [p_vout->p_sys->o_glview exitFullScreen];
+ i_index--;
+ o_screen = [o_screens objectAtIndex: i_index];
+ val.i_int = i_index;
+ var_Set( p_vout, "macosx-vdev", val );
+ b_main_screen = (i_index == 0);
}
- /*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];
+ if( p_vout->b_fullscreen )
+ {
+ NSRect screen_rect = [o_screen frame];
+ screen_rect.origin.x = screen_rect.origin.y = 0;
- val.b_bool = VLC_TRUE;
- var_Create(p_intf,"intf-change",VLC_VAR_BOOL);
- var_Set(p_intf, "intf-change",val);
+ if ( b_main_screen && p_vout->p_sys->p_fullscreen_state == NULL )
+ BeginFullScreen( &p_vout->p_sys->p_fullscreen_state, NULL, 0, 0,
+ NULL, NULL, fullScreenAllowEvents );
- return 0;
- }
-
- QTDestroySequence( p_vout );
+ /* Creates a window with size: screen_rect on o_screen */
+ [p_vout->p_sys->o_window
+ initWithContentRect: screen_rect
+ styleMask: NSBorderlessWindowMask
+ backing: NSBackingStoreBuffered
+ defer: NO screen: o_screen];
- if( CoDestroyWindow( p_vout ) )
- {
- msg_Err( p_vout, "unable to destroy window" );
- return( 1 );
+ [p_vout->p_sys->o_window setVout: p_vout];
+ p_vout->p_sys->b_mouse_moved = YES;
+ p_vout->p_sys->i_time_mouse_last_moved = mdate();
}
-
- p_vout->b_fullscreen = !p_vout->b_fullscreen;
-
- if( CoCreateWindow( p_vout ) )
+ else
{
- msg_Err( p_vout, "unable to create window" );
+ unsigned int i_stylemask = NSTitledWindowMask |
+ NSMiniaturizableWindowMask |
+ NSClosableWindowMask |
+ NSResizableWindowMask;
+
+ 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;
+
+ [p_vout->p_sys->o_window
+ initWithContentRect: p_vout->p_sys->s_rect
+ styleMask: i_stylemask
+ backing: NSBackingStoreBuffered
+ defer: NO screen: o_screen];
+
+ [p_vout->p_sys->o_window setVout: p_vout];
+ var_Get( p_vout, "macosx-opaqueness", &val);
+ [p_vout->p_sys->o_window setAlphaValue: val.f_float];
+
+ var_Get( p_vout, "video-on-top", &val );
+ if( val.b_bool ) [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
+
+ if( !p_vout->p_sys->b_pos_saved ) [p_vout->p_sys->o_window center];
+ }
+
+ if( !p_vout->p_sys->i_opengl )
+ {
+#define o_qtview p_vout->p_sys->o_qtview
+ o_qtview = [[VLCQTView alloc] init];
+ [p_vout->p_sys->o_window setContentView: o_qtview];
+ [o_qtview autorelease];
+
+ /* Retrieve the QuickDraw port */
+ [o_qtview lockFocus];
+ p_vout->p_sys->p_qdport = [o_qtview qdPort];
+ [o_qtview unlockFocus];
+#undef o_qtview
+ }
+ 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];
+
+ [o_pool release];
+ return( 0);
+}
+
+/*****************************************************************************
+ * CoDestroyWindow: destroy window
+ *****************************************************************************
+ * Returns 0 on success, 1 otherwise
+ *****************************************************************************/
+static int CoDestroyWindow( vout_thread_t *p_vout )
+{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ VLCHideMouse( p_vout, NO );
+
+ if( !p_vout->b_fullscreen )
+ {
+ NSRect s_rect;
+
+ /* remember the window position before we enter fullscreen */
+ s_rect = [[p_vout->p_sys->o_window contentView] frame];
+ p_vout->p_sys->s_rect.size = s_rect.size;
+
+ s_rect = [p_vout->p_sys->o_window frame];
+ p_vout->p_sys->s_rect.origin = s_rect.origin;
+
+ p_vout->p_sys->b_pos_saved = YES;
+ }
+
+ p_vout->p_sys->p_qdport = nil;
+ [p_vout->p_sys->o_window close];
+ p_vout->p_sys->o_window = nil;
+ [o_pool release];
+ return 0;
+}
+
+/*****************************************************************************
+ * CoToggleFullscreen: toggle fullscreen
+ *****************************************************************************
+ * Returns 0 on success, 1 otherwise
+ *****************************************************************************/
+static int CoToggleFullscreen( vout_thread_t *p_vout )
+{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+
+ if( !p_vout->p_sys->i_opengl )
+ {
+ QTDestroySequence( p_vout );
+ }
+
+ if( CoDestroyWindow( p_vout ) )
+ {
+ msg_Err( p_vout, "unable to destroy window" );
return( 1 );
}
+
+ p_vout->b_fullscreen = !p_vout->b_fullscreen;
- SetPort( p_vout->p_sys->p_qdport );
- QTScaleMatrix( p_vout );
+ if( CoCreateWindow( p_vout ) )
+ {
+ msg_Err( p_vout, "unable to create window" );
+ return( 1 );
+ }
- if( QTCreateSequence( p_vout ) )
+ if( p_vout->p_sys->i_opengl )
{
- msg_Err( p_vout, "unable to create sequence" );
- return( 1 );
- }
+ [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 drawRect:
+ [p_vout->p_sys->o_glview bounds]];
+ [p_vout->p_sys->o_glview unlockFocus];
+ }
+ else
+ {
+ SetPort( p_vout->p_sys->p_qdport );
+ QTScaleMatrix( p_vout );
- return( 0 );
+ if( QTCreateSequence( p_vout ) )
+ {
+ msg_Err( p_vout, "unable to create sequence" );
+ return( 1 );
+ }
+ }
+
+ [o_pool release];
+ return 0;
+}
+
+/*****************************************************************************
+ * CoSetWindowOnTop: Switches the "always on top" state of the video window
+ *****************************************************************************
+ * Returns 0 on success, 1 otherwise
+ *****************************************************************************/
+static int CoSetWindowOnTop( vout_thread_t *p_vout, BOOL b_on_top )
+{
+ if( p_vout->p_sys->o_window )
+ {
+ if( b_on_top )
+ {
+ [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
+ }
+ else
+ {
+ [p_vout->p_sys->o_window setLevel: NSNormalWindowLevel];
+ }
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
}
/*****************************************************************************
static void QTScaleMatrix( vout_thread_t *p_vout )
{
Rect s_rect;
+ vlc_value_t val;
unsigned int i_width, i_height;
Fixed factor_x, factor_y;
unsigned int i_offset_x = 0;
i_width = s_rect.right - s_rect.left;
i_height = s_rect.bottom - s_rect.top;
- if( config_GetInt( p_vout, "macosx-stretch" ) )
+ var_Get( p_vout, "macosx-stretch", &val );
+ if( val.b_bool )
{
factor_x = FixDiv( Long2Fix( i_width ),
Long2Fix( p_vout->output.i_width ) );
- (void)toggleFloatOnTop
{
- if( config_GetInt( p_vout, "video-on-top" ) )
+ vlc_value_t val;
+ if( var_Get( p_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;
+ var_Set( p_vout, "video-on-top", val );
}
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_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;
+ val.b_bool = !p_vout->b_fullscreen;
+ var_Set( p_vout, "fullscreen", val );
}
- (BOOL)isFullscreen
- (BOOL)canBecomeKeyWindow
{
- return( YES );
+ return YES;
}
+/* Sometimes crashes VLC....
+- (BOOL)performKeyEquivalent:(NSEvent *)o_event
+{
+ return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event];
+}*/
+
- (void)keyDown:(NSEvent *)o_event
{
unichar key = 0;
}
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);
- }
+ vlc_value_t val;
+ val.i_int = config_GetInt( p_vout, "key-play-pause" );
+ var_Set( p_vout->p_vlc, "key-pressed", val );
}
else
{
- (void)updateTitle
{
NSMutableString * o_title;
- playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist;
+
+ if( p_vout == NULL )
+ {
+ return;
+ }
+
+ p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
if( p_playlist == NULL )
{
vlc_mutex_lock( &p_playlist->object_lock );
o_title = [NSMutableString stringWithUTF8String:
- p_playlist->pp_items[p_playlist->i_index]->psz_uri];
+ p_playlist->pp_items[p_playlist->i_index]->input.psz_uri];
vlc_mutex_unlock( &p_playlist->object_lock );
vlc_object_release( p_playlist );
@end
+/* Common QT and OpenGL code to catch mouse events */
+#define CATCH_MOUSE_EVENTS \
+- (BOOL)acceptsFirstResponder \
+{ \
+ return( YES ); \
+} \
+ \
+- (BOOL)becomeFirstResponder \
+{ \
+ id o_window = [self window]; \
+ \
+ [o_window setAcceptsMouseMovedEvents: YES]; \
+ return( YES ); \
+} \
+ \
+- (BOOL)resignFirstResponder \
+{ \
+ vout_thread_t * vout; \
+ id o_window = [self window]; \
+ vout = (vout_thread_t *)[o_window getVout]; \
+ \
+ [o_window setAcceptsMouseMovedEvents: NO]; \
+ VLCHideMouse( vout, NO ); \
+ return( YES ); \
+} \
+ \
+- (void)mouseDown:(NSEvent *)o_event \
+{ \
+ vout_thread_t * vout; \
+ id o_window = [self window]; \
+ vout = (vout_thread_t *)[o_window getVout]; \
+ vlc_value_t val; \
+ \
+ switch( [o_event type] ) \
+ { \
+ case NSLeftMouseDown: \
+ { \
+ var_Get( vout, "mouse-button-down", &val ); \
+ val.i_int |= 1; \
+ var_Set( vout, "mouse-button-down", val ); \
+ } \
+ break; \
+ \
+ default: \
+ [super mouseDown: o_event]; \
+ break; \
+ } \
+} \
+ \
+- (void)otherMouseDown:(NSEvent *)o_event \
+{ \
+ vout_thread_t * vout; \
+ id o_window = [self window]; \
+ vout = (vout_thread_t *)[o_window getVout]; \
+ vlc_value_t val; \
+ \
+ switch( [o_event type] ) \
+ { \
+ case NSOtherMouseDown: \
+ { \
+ var_Get( vout, "mouse-button-down", &val ); \
+ val.i_int |= 2; \
+ var_Set( vout, "mouse-button-down", val ); \
+ } \
+ break; \
+ \
+ default: \
+ [super mouseDown: o_event]; \
+ break; \
+ } \
+} \
+ \
+- (void)rightMouseDown:(NSEvent *)o_event \
+{ \
+ vout_thread_t * vout; \
+ id o_window = [self window]; \
+ vout = (vout_thread_t *)[o_window getVout]; \
+ vlc_value_t val; \
+ \
+ switch( [o_event type] ) \
+ { \
+ case NSRightMouseDown: \
+ { \
+ var_Get( vout, "mouse-button-down", &val ); \
+ val.i_int |= 4; \
+ var_Set( vout, "mouse-button-down", val ); \
+ } \
+ break; \
+ \
+ default: \
+ [super mouseDown: o_event]; \
+ break; \
+ } \
+} \
+ \
+- (void)mouseUp:(NSEvent *)o_event \
+{ \
+ vout_thread_t * vout; \
+ id o_window = [self window]; \
+ vout = (vout_thread_t *)[o_window getVout]; \
+ vlc_value_t val; \
+ \
+ switch( [o_event type] ) \
+ { \
+ case NSLeftMouseUp: \
+ { \
+ vlc_value_t b_val; \
+ b_val.b_bool = VLC_TRUE; \
+ var_Set( vout, "mouse-clicked", b_val ); \
+ \
+ var_Get( vout, "mouse-button-down", &val ); \
+ val.i_int &= ~1; \
+ var_Set( vout, "mouse-button-down", val ); \
+ } \
+ break; \
+ \
+ default: \
+ [super mouseUp: o_event]; \
+ break; \
+ } \
+} \
+ \
+- (void)otherMouseUp:(NSEvent *)o_event \
+{ \
+ vout_thread_t * vout; \
+ id o_window = [self window]; \
+ vout = (vout_thread_t *)[o_window getVout]; \
+ vlc_value_t val; \
+ \
+ switch( [o_event type] ) \
+ { \
+ case NSOtherMouseUp: \
+ { \
+ var_Get( vout, "mouse-button-down", &val ); \
+ val.i_int &= ~2; \
+ var_Set( vout, "mouse-button-down", val ); \
+ } \
+ break; \
+ \
+ default: \
+ [super mouseUp: o_event]; \
+ break; \
+ } \
+} \
+ \
+- (void)rightMouseUp:(NSEvent *)o_event \
+{ \
+ vout_thread_t * vout; \
+ id o_window = [self window]; \
+ vout = (vout_thread_t *)[o_window getVout]; \
+ vlc_value_t val; \
+ \
+ switch( [o_event type] ) \
+ { \
+ case NSRightMouseUp: \
+ { \
+ var_Get( vout, "mouse-button-down", &val ); \
+ val.i_int &= ~4; \
+ var_Set( vout, "mouse-button-down", val ); \
+ } \
+ break; \
+ \
+ default: \
+ [super mouseUp: o_event]; \
+ break; \
+ } \
+} \
+ \
+- (void)mouseDragged:(NSEvent *)o_event \
+{ \
+ [self mouseMoved:o_event]; \
+} \
+ \
+- (void)otherMouseDragged:(NSEvent *)o_event \
+{ \
+ [self mouseMoved:o_event]; \
+} \
+ \
+- (void)rightMouseDragged:(NSEvent *)o_event \
+{ \
+ [self mouseMoved:o_event]; \
+}
+
/*****************************************************************************
* VLCQTView implementation
*****************************************************************************/
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 );
-}
-
-- (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:
- {
- 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;
- }
-}
-
-- (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] )
- {
- 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;
- }
-}
-
-- (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] )
- {
- 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;
- }
-}
-
-- (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] )
- {
- 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;
- }
-}
-
-- (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] )
- {
- 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;
- }
-}
-
-- (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] )
- {
- 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;
- }
-}
-
-- (void)mouseDragged:(NSEvent *)o_event
-{
- [self mouseMoved:o_event];
-}
-
-- (void)otherMouseDragged:(NSEvent *)o_event
-{
- [self mouseMoved:o_event];
-}
-
-- (void)rightMouseDragged:(NSEvent *)o_event
-{
- [self mouseMoved:o_event];
-}
+CATCH_MOUSE_EVENTS
- (void)mouseMoved:(NSEvent *)o_event
{
- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) _p_vout
{
- char * psz_effect;
+ vlc_value_t val;
p_vout = _p_vout;
NSOpenGLPixelFormatAttribute attribs[] =
{
NSOpenGLPFAAccelerated,
NSOpenGLPFANoRecovery,
- NSOpenGLPFADoubleBuffer,
NSOpenGLPFAColorSize, 24,
NSOpenGLPFAAlphaSize, 8,
NSOpenGLPFADepthSize, 24,
}
self = [super initWithFrame:frame pixelFormat: fmt];
+ [fmt release];
- currentContext = [self openGLContext];
- [currentContext makeCurrentContext];
- [currentContext update];
+ [[self openGLContext] makeCurrentContext];
+ [[self openGLContext] update];
/* Black background */
glClearColor( 0.0, 0.0, 0.0, 0.0 );
/* Check if the user asked for useless visual effects */
- psz_effect = config_GetPsz( p_vout, "macosx-opengl-effect" );
- if( !psz_effect || !strcmp( psz_effect, "none" ))
+ var_Get( p_vout, "macosx-opengl-effect", &val );
+ if( !val.psz_string || !strcmp( val.psz_string, "none" ))
{
i_effect = OPENGL_EFFECT_NONE;
}
- else if( !strcmp( psz_effect, "cube" ) )
+ else if( !strcmp( val.psz_string, "cube" ) )
{
i_effect = OPENGL_EFFECT_CUBE;
glEnable( GL_DEPTH_TEST );
}
- else if( !strcmp( psz_effect, "transparent-cube" ) )
+ else if( !strcmp( val.psz_string, "transparent-cube" ) )
{
i_effect = OPENGL_EFFECT_TRANSPARENT_CUBE;
"\"none\"" );
i_effect = OPENGL_EFFECT_NONE;
}
+ if( val.psz_string ) free( val.psz_string );
if( i_effect & ( OPENGL_EFFECT_CUBE |
OPENGL_EFFECT_TRANSPARENT_CUBE ) )
glTranslatef( 0.0, 0.0, - 5.0 );
}
- i_texture = 0;
- initDone = 0;
- isFullScreen = 0;
+ pi_textures[0] = 0;
+ pi_textures[1] = 0;
+ initDone = 0;
return self;
}
-- (void) reshape
+- (void)reshape
{
+ vlc_value_t val;
+ NSRect bounds;
+
if( !initDone )
{
return;
}
- [currentContext makeCurrentContext];
+ [[self openGLContext] makeCurrentContext];
- NSRect bounds = [self bounds];
+ 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" ) )
+ var_Get( p_vout, "macosx-stretch", &val );
+ if( val.b_bool )
{
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;
+ /* Quad size is set in order to preserve the aspect ratio */
+ var_Get( p_vout, "macosx-fill", &val );
+ int fill = ( val.b_bool && p_vout->b_fullscreen );
+ int large = ( bounds.size.height * p_vout->output.i_aspect <
+ bounds.size.width * VOUT_ASPECT_FACTOR );
+ if( ( large && !fill ) || ( !large && fill ) )
+ {
+ 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;
+ }
}
}
-- (void) initTextures
+- (void)initTextures
{
- [currentContext makeCurrentContext];
+ int i;
+ [[self openGLContext] makeCurrentContext];
/* Free previous texture if any */
- if( i_texture )
+ if( initDone )
{
- glDeleteTextures( 1, &i_texture );
+ glDeleteTextures( 2, pi_textures );
}
-
- /* 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 );
+ glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
+ glPixelStorei( GL_UNPACK_ROW_LENGTH, p_vout->output.i_width );
/* 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 );
+ /* Create textures */
+ glGenTextures( 2, pi_textures );
+
+ for( i = 0; i < 2; i++ )
+ {
+ glBindTexture( GL_TEXTURE_RECTANGLE_EXT, pi_textures[i] );
+ glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
+
+ /* Linear interpolation */
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+
+ /* Use VRAM texturing */
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE );
+
+ glTexImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGB8,
+ p_vout->output.i_width, p_vout->output.i_height, 0,
+ GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE,
+ p_vout->p_sys->p_data[i] );
+ }
+
+ /* 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 );
initDone = 1;
}
-- (void) reloadTexture
+- (void)reloadTexture: (int) index
{
if( !initDone )
{
return;
}
- [currentContext makeCurrentContext];
+ [[self openGLContext] makeCurrentContext];
- glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
+ glBindTexture( GL_TEXTURE_RECTANGLE_EXT, pi_textures[index] );
+ glPixelStorei( GL_UNPACK_ROW_LENGTH, p_vout->output.i_width );
/* glTexSubImage2D is faster than glTexImage2D
http://developer.apple.com/samplecode/Sample_Code/Graphics_3D/
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 );
-}
-
-- (void) goFullScreen
-{
- /* 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;
- }
-
- /* 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;
-
- /* Capture display, switch to fullscreen */
- if( CGCaptureAllDisplays() != CGDisplayNoErr )
- {
- msg_Warn( p_vout, "CGCaptureAllDisplays() failed" );
- return;
- }
- [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 )
- {
- f_x = 1.0;
- f_y = 1.0;
- }
- else if( ( bigRatio && !fill ) || ( !bigRatio && fill ) )
- {
- f_x = (float) height * p_vout->output.i_aspect /
- width / VOUT_ASPECT_FACTOR;
- f_y = 1.0;
- }
- else
- {
- f_x = 1.0;
- f_y = (float) width * VOUT_ASPECT_FACTOR /
- p_vout->output.i_aspect / height;
- }
-
- /* 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();
-
- currentContext = [self openGLContext];
- [self initTextures];
- [self reshape];
-
- /* Redraw the last picture */
- [self setNeedsDisplay: YES];
-
- isFullScreen = 0;
+ p_vout->p_sys->p_data[index] );
}
- (void) cleanUp
{
- if( isFullScreen )
- {
- [self exitFullScreen];
- }
initDone = 0;
}
- (void) drawRect: (NSRect) rect
{
- [currentContext makeCurrentContext];
+ [[self openGLContext] 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];
+ glFlush();
return;
}
/* Draw */
- glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
+ glBindTexture( GL_TEXTURE_RECTANGLE_EXT,
+ pi_textures[p_vout->p_sys->i_cur_pic] );
if( i_effect & ( OPENGL_EFFECT_CUBE |
OPENGL_EFFECT_TRANSPARENT_CUBE ) )
{
[self drawQuad];
}
- /* Wait for the job to be done */
- [currentContext flushBuffer];
+ /* Draw */
+ glFlush();
}
-@end
+CATCH_MOUSE_EVENTS
-/*****************************************************************************
- * VLCVout implementation
- *****************************************************************************/
-@implementation VLCVout
-
-- (void)createWindow:(NSValue *)o_value
+- (void)mouseMoved:(NSEvent *)o_event
{
- 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];
+ NSPoint ml;
+ NSRect s_rect;
+ BOOL b_inside;
- 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];
+ s_rect = [self bounds];
+ ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
+ b_inside = [self mouse: ml inRect: s_rect];
- if( var_Get( p_vout, "video-device", &val ) < 0 )
- {
- o_screen = [NSScreen mainScreen];
- b_main_screen = 1;
- }
- else
+ if( b_inside )
{
- NSArray *o_screens = [NSScreen screens];
- unsigned int i_index = val.i_int;
+ vlc_value_t val;
+ int i_width, i_height, i_x, i_y;
- 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);
- }
- }
-
- if( p_vout->b_fullscreen && !p_vout->p_sys->i_opengl )
- {
- 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,
- NULL, NULL, fullScreenAllowEvents );
+ vout_PlacePicture( p_vout, (unsigned int)s_rect.size.width,
+ (unsigned int)s_rect.size.height,
+ &i_x, &i_y, &i_width, &i_height );
- [p_vout->p_sys->o_window
- initWithContentRect: screen_rect
- styleMask: NSBorderlessWindowMask
- backing: NSBackingStoreBuffered
- defer: NO screen: o_screen];
+ val.i_int = ( (int)ml.x - i_x ) *
+ p_vout->render.i_width / i_width;
+ var_Set( p_vout, "mouse-x", val );
- //[p_vout->p_sys->o_window setLevel: NSPopUpMenuWindowLevel - 1];
- p_vout->p_sys->b_mouse_moved = YES;
+ /* Y coordinate is inverted in OpenGL */
+ val.i_int = ( ((int)(s_rect.size.height - 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;
}
- else
- {
- unsigned int i_stylemask = NSTitledWindowMask |
- NSMiniaturizableWindowMask |
- NSClosableWindowMask |
- NSResizableWindowMask;
-
- 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 );
- p_vout->p_sys->p_fullscreen_state = NULL;
- }
-
- [p_vout->p_sys->o_window
- initWithContentRect: p_vout->p_sys->s_rect
- styleMask: i_stylemask
- backing: NSBackingStoreBuffered
- defer: NO screen: o_screen];
-
- [p_vout->p_sys->o_window setAlphaValue: config_GetFloat( p_vout, "macosx-opaqueness" )];
-
- if( config_GetInt( p_vout, "video-on-top" ) )
- {
- [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
- }
-
- if( !p_vout->p_sys->b_pos_saved )
- {
- [p_vout->p_sys->o_window 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];
-
-}
-- (void)destroyWindow:(NSValue *)o_value
-{
- vout_thread_t * p_vout;
-
- p_vout = (vout_thread_t *)[o_value pointerValue];
-
- if( !p_vout->b_fullscreen )
- {
- NSRect s_rect;
-
- s_rect = [[p_vout->p_sys->o_window contentView] frame];
- p_vout->p_sys->s_rect.size = s_rect.size;
-
- s_rect = [p_vout->p_sys->o_window frame];
- p_vout->p_sys->s_rect.origin = s_rect.origin;
-
- p_vout->p_sys->b_pos_saved = YES;
- }
-
- p_vout->p_sys->p_qdport = nil;
- [p_vout->p_sys->o_window close];
- p_vout->p_sys->o_window = nil;
+ [super mouseMoved: o_event];
}
@end
projects / vlc / blobdiff