Commit c673b2b9 authored by Christophe Massiot's avatar Christophe Massiot

* Fixed Mac OS X resizing.

parent bdb82782
...@@ -316,15 +316,6 @@ static void vout_Destroy( vout_thread_t *p_vout ) ...@@ -316,15 +316,6 @@ static void vout_Destroy( vout_thread_t *p_vout )
*****************************************************************************/ *****************************************************************************/
static int vout_Manage( vout_thread_t *p_vout ) static int vout_Manage( vout_thread_t *p_vout )
{ {
if( p_vout->i_changes & VOUT_SIZE_CHANGE )
{
QTScaleMatrix( p_vout );
SetDSequenceMatrix( p_vout->p_sys->i_seq,
p_vout->p_sys->p_matrix );
p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
}
if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ) if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
{ {
if( CoToggleFullscreen( p_vout ) ) if( CoToggleFullscreen( p_vout ) )
...@@ -335,6 +326,15 @@ static int vout_Manage( vout_thread_t *p_vout ) ...@@ -335,6 +326,15 @@ static int vout_Manage( vout_thread_t *p_vout )
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
} }
if( p_vout->i_changes & VOUT_SIZE_CHANGE )
{
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 */ /* hide/show mouse cursor */
if( p_vout->p_sys->b_mouse_moved || if( p_vout->p_sys->b_mouse_moved ||
p_vout->p_sys->i_time_mouse_last_moved ) p_vout->p_sys->i_time_mouse_last_moved )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_qdview.c: MacOS X plugin for vlc * vout_qdview.c: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: vout_qdview.m,v 1.2 2002/05/15 21:14:18 massiot Exp $ * $Id: vout_qdview.m,v 1.3 2002/05/18 18:48:24 massiot Exp $
* *
* Authors: Florian G. Pflug <fgp@phlo.org> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
[[NSColor blackColor] set]; [[NSColor blackColor] set];
NSRectFill(rect); NSRectFill(rect);
[super drawRect: rect]; [super drawRect: rect];
[o_wrapper voutDidResize: p_vout ];
} }
@end @end
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_vlc_wrapper.h: MacOS X plugin for vlc * vout_vlc_wrapper.h: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: vout_vlc_wrapper.h,v 1.3 2002/05/12 20:56:34 massiot Exp $ * $Id: vout_vlc_wrapper.h,v 1.4 2002/05/18 18:48:24 massiot Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* *
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
- (void)mouseEvent:(unsigned int)ui_status forVout:(void *)_p_vout; - (void)mouseEvent:(unsigned int)ui_status forVout:(void *)_p_vout;
- (BOOL)keyDown:(NSEvent *)o_event forVout:(void *)_p_vout; - (BOOL)keyDown:(NSEvent *)o_event forVout:(void *)_p_vout;
- (void)voutDidResize:(void *)_p_vout;
@end @end
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_vlc_wrapper.c: MacOS X plugin for vlc * vout_vlc_wrapper.c: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: vout_vlc_wrapper.m,v 1.1 2002/05/12 20:56:34 massiot Exp $ * $Id: vout_vlc_wrapper.m,v 1.2 2002/05/18 18:48:24 massiot Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* *
...@@ -128,6 +128,13 @@ static Vout_VLCWrapper *o_vout = nil; ...@@ -128,6 +128,13 @@ static Vout_VLCWrapper *o_vout = nil;
return( YES ); return( YES );
} }
- (void)voutDidResize:(void *)_p_vout
{
vout_thread_t * p_vout = (vout_thread_t *)_p_vout;
p_vout->i_changes |= VOUT_SIZE_CHANGE;
}
@end @end
@implementation Vout_VLCWrapper (Internal) @implementation Vout_VLCWrapper (Internal)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment