Commit 6e5788c8 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Updated the Vout behaviour. Still a bit coupled to p_vout.

parent 7e6516d2
...@@ -422,6 +422,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) ...@@ -422,6 +422,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
{ {
unsigned int i_key = 0; unsigned int i_key = 0;
intf_thread_t * p_intf = [NSApp getIntf]; intf_thread_t * p_intf = [NSApp getIntf];
playlist_t *p_playlist;
vlc_value_t val; vlc_value_t val;
[self initStrings]; [self initStrings];
...@@ -481,27 +482,24 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) ...@@ -481,27 +482,24 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
[o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; [o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; [o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
var_Create (p_intf, "fullscreen", VLC_VAR_BOOL ); var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
var_Change (p_intf, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL );
[o_btn_fullscreen setState: val.b_bool];
var_Create(p_intf,"intf-change",VLC_VAR_BOOL );
[self setSubmenusEnabled: FALSE]; [self setSubmenusEnabled: FALSE];
[self manageVolumeSlider]; [self manageVolumeSlider];
/* Check if we need to start playing */ p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_intf->b_play )
if( p_playlist )
{ {
playlist_t *p_playlist = /* Check if we need to start playing */
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, if( p_intf->b_play )
FIND_ANYWHERE );
if( p_playlist )
{ {
playlist_Play( p_playlist ); playlist_Play( p_playlist );
vlc_object_release( p_playlist );
} }
var_Get( p_playlist, "fullscreen", &val );
[o_btn_fullscreen setState: val.b_bool];
vlc_object_release( p_playlist );
} }
} }
...@@ -864,11 +862,11 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) ...@@ -864,11 +862,11 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
p_intf->p_sys->b_intf_update = VLC_FALSE; p_intf->p_sys->b_intf_update = VLC_FALSE;
} }
if (p_intf->p_sys->b_fullscreen_update ) if( p_intf->p_sys->b_fullscreen_update )
{ {
vout_thread_t * p_vout; vout_thread_t * p_vout;
vlc_value_t val; vlc_value_t val;
if (var_Change (p_intf, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL)>=0 && val.b_bool ) if( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )
{ {
[o_btn_fullscreen setState:VLC_TRUE]; [o_btn_fullscreen setState:VLC_TRUE];
} }
...@@ -876,11 +874,11 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) ...@@ -876,11 +874,11 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
{ {
[o_btn_fullscreen setState:VLC_FALSE]; [o_btn_fullscreen setState:VLC_FALSE];
} }
p_vout = vlc_object_find(p_intf,VLC_OBJECT_VOUT,FIND_ANYWHERE); p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
if (p_vout != NULL) if( p_vout != NULL )
{ {
[o_btn_fullscreen setEnabled: VLC_TRUE]; [o_btn_fullscreen setEnabled: VLC_TRUE];
vlc_object_release(p_vout); vlc_object_release( p_vout );
} }
else else
{ {
......
...@@ -959,8 +959,9 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -959,8 +959,9 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
- (void)toggleFullscreen - (void)toggleFullscreen
{ {
config_PutInt(p_vout, "fullscreen", !p_vout->b_fullscreen); vlc_value_t val;
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; val.b_bool = !p_vout->b_fullscreen;
var_Set( p_vout, "fullscreen", val );
} }
- (BOOL)isFullscreen - (BOOL)isFullscreen
...@@ -1499,7 +1500,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1499,7 +1500,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
initDone = 1; initDone = 1;
} }
- (void) reloadTexture - (void)reloadTexture
{ {
if( !initDone ) if( !initDone )
{ {
...@@ -1519,7 +1520,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1519,7 +1520,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
PP_OUTPUTPICTURE[0]->p_data ); PP_OUTPUTPICTURE[0]->p_data );
} }
- (void) goFullScreen - (void)goFullScreen
{ {
/* Create the new pixel format */ /* Create the new pixel format */
NSOpenGLPixelFormatAttribute attribs[] = NSOpenGLPixelFormatAttribute attribs[] =
...@@ -1598,7 +1599,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1598,7 +1599,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
isFullScreen = 1; isFullScreen = 1;
} }
- (void) exitFullScreen - (void)exitFullScreen
{ {
/* Free current OpenGL context */ /* Free current OpenGL context */
[NSOpenGLContext clearCurrentContext]; [NSOpenGLContext clearCurrentContext];
......
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