From 9adb4abdcb43f433db00dc2abd33c0ff7ba04750 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Tue, 6 May 2003 20:12:28 +0000 Subject: [PATCH] * ALL: there were reports of crashes in the menucode. i think it was that the VLCWindow could suddenly disappear (the vout closed) and therefore we could no longer reference it. This should fix that. Also made this code more generic to avoid code duplication. --- .../English.lproj/MainMenu.nib/classes.nib | 6 +- .../English.lproj/MainMenu.nib/objects.nib | Bin 47090 -> 48080 bytes modules/gui/macosx/controls.h | 8 +- modules/gui/macosx/controls.m | 101 ++++++------------ modules/gui/macosx/intf.m | 22 ++-- 5 files changed, 47 insertions(+), 90 deletions(-) diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib index 2ae839d42f..1dcaa68891 100644 --- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib +++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib @@ -20,16 +20,11 @@ ACTIONS = { backward = id; deinterlace = id; - doubleWindow = id; faster = id; - floatOnTop = id; forward = id; - fullscreen = id; - halfWindow = id; loop = id; mute = id; next = id; - normalWindow = id; pause = id; play = id; prev = id; @@ -44,6 +39,7 @@ volumeDown = id; volumeSliderUpdated = id; volumeUp = id; + windowAction = id; }; CLASS = VLCControls; LANGUAGE = ObjC; diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib index 0ddfd0046f0f8802bd99acba1cabdd8e740c6e34..9b5231a2a04ed3ae69168d583bd300c5de4805d7 100644 GIT binary patch literal 48080 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 O14X#&J;-0}nfO0c)6TyD literal 47090 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 diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h index ae77743fdb..9d3437445f 100644 --- a/modules/gui/macosx/controls.h +++ b/modules/gui/macosx/controls.h @@ -2,7 +2,7 @@ * controls.h: MacOS X interface plugin ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: controls.h,v 1.2 2003/05/01 01:11:17 hartman Exp $ + * $Id: controls.h,v 1.3 2003/05/06 20:12:28 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -52,11 +52,7 @@ - (IBAction)volumeSliderUpdated:(id)sender; - (void)updateVolumeSlider; -- (IBAction)halfWindow:(id)sender; -- (IBAction)normalWindow:(id)sender; -- (IBAction)doubleWindow:(id)sender; -- (IBAction)fullscreen:(id)sender; -- (IBAction)floatOnTop:(id)sender; +- (IBAction)windowAction:(id)sender; - (IBAction)deinterlace:(id)sender; - (IBAction)toggleProgram:(id)sender; diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index 9b52acb0c9..51cc396b79 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -2,7 +2,7 @@ * controls.m: MacOS X interface plugin ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: controls.m,v 1.35 2003/05/05 22:04:11 hartman Exp $ + * $Id: controls.m,v 1.36 2003/05/06 20:12:28 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -324,79 +324,34 @@ [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)]; } -- (IBAction)halfWindow:(id)sender +- (IBAction)windowAction:(id)sender { id o_window = [NSApp keyWindow]; + NSString *o_title = [sender title]; NSArray *o_windows = [NSApp windows]; NSEnumerator *o_enumerator = [o_windows objectEnumerator]; - - while ((o_window = [o_enumerator nextObject])) - { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) - { - [o_window scaleWindowWithFactor: 0.5]; - } - } -} - -- (IBAction)normalWindow:(id)sender -{ - id o_window = [NSApp keyWindow]; - NSArray *o_windows = [NSApp windows]; - NSEnumerator *o_enumerator = [o_windows objectEnumerator]; - - while ((o_window = [o_enumerator nextObject])) - { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) - { - [o_window scaleWindowWithFactor: 1]; - } - } -} - -- (IBAction)doubleWindow:(id)sender -{ - id o_window = [NSApp keyWindow]; - NSArray *o_windows = [NSApp windows]; - NSEnumerator *o_enumerator = [o_windows objectEnumerator]; - - while ((o_window = [o_enumerator nextObject])) - { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) - { - [o_window scaleWindowWithFactor: 2]; - } - } -} - + vout_thread_t *p_vout = vlc_object_find( [NSApp getIntf], VLC_OBJECT_VOUT, + FIND_ANYWHERE ); -- (IBAction)fullscreen:(id)sender -{ - id o_window = [NSApp keyWindow]; - NSArray *o_windows = [NSApp windows]; - NSEnumerator *o_enumerator = [o_windows objectEnumerator]; - - while ((o_window = [o_enumerator nextObject])) + if( p_vout != NULL ) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) - { - [o_window toggleFullscreen]; - } - } -} - -- (IBAction)floatOnTop:(id)sender -{ - id o_window = [NSApp keyWindow]; - NSArray *o_windows = [NSApp windows]; - NSEnumerator *o_enumerator = [o_windows objectEnumerator]; - - while ((o_window = [o_enumerator nextObject])) - { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) + while ((o_window = [o_enumerator nextObject])) { - [o_window toggleFloatOnTop]; + if( [[o_window className] isEqualToString: @"VLCWindow"] ) + { + if( [o_title isEqualToString: _NS("Fullscreen") ] ) + [o_window toggleFullscreen]; + else if( [o_title isEqualToString: _NS("Half Size") ] ) + [o_window scaleWindowWithFactor: 0.5]; + else if( [o_title isEqualToString: _NS("Normal Size") ] ) + [o_window scaleWindowWithFactor: 1.0]; + else if( [o_title isEqualToString: _NS("Double Size") ] ) + [o_window scaleWindowWithFactor: 2.0]; + else if( [o_title isEqualToString: _NS("Float On Top") ] ) + [o_window toggleFloatOnTop]; + } } + vlc_object_release( (vlc_object_t *)p_vout ); } } @@ -734,13 +689,19 @@ [o_mi setState: i_state]; } - while ((o_window = [o_enumerator nextObject])) + vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + if( p_vout != NULL ) { - if( [[o_window className] isEqualToString: @"VLCWindow"] ) + while ((o_window = [o_enumerator nextObject])) { - bEnabled = TRUE; - break; + if( [[o_window className] isEqualToString: @"VLCWindow"] ) + { + bEnabled = TRUE; + break; + } } + vlc_object_release( (vlc_object_t *)p_vout ); } } else if( [[o_mi title] isEqualToString: _NS("Float On Top")] ) diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index f64393dc91..c5d9e4e3ab 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -2,7 +2,7 @@ * intf.m: MacOS X interface plugin ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: intf.m,v 1.74 2003/05/05 22:23:39 gbazin Exp $ + * $Id: intf.m,v 1.75 2003/05/06 20:12:28 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -636,18 +636,22 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) if( p_intf->p_sys->b_current_title_update ) { - id o_vout_wnd; - - NSEnumerator * o_enum = [[NSApp windows] objectEnumerator]; - - while( ( o_vout_wnd = [o_enum nextObject] ) ) + vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + if( p_vout != NULL ) { - if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] ) + id o_vout_wnd; + NSEnumerator * o_enum = [[NSApp windows] objectEnumerator]; + + while( ( o_vout_wnd = [o_enum nextObject] ) ) { - [o_vout_wnd updateTitle]; + if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] ) + { + [o_vout_wnd updateTitle]; + } } + vlc_object_release( (vlc_object_t *)p_vout ); } - [o_playlist updateRowSelection]; [o_info updateInfo]; -- 2.39.2