1
mirror of https://code.videolan.org/videolan/vlc synced 2024-10-07 03:56:28 +02:00
- removed a bit too much code from the interface files previous commit.
    Menu's were enabled if there was no input.
  - removed a NSLog which was used for bugtracking
This commit is contained in:
Derk-Jan Hartman 2003-05-11 19:09:51 +00:00
parent 38cf397da0
commit b4080ac4fa
2 changed files with 19 additions and 4 deletions

View File

@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: intf.h,v 1.37 2003/05/11 18:40:11 hartman Exp $
* $Id: intf.h,v 1.38 2003/05/11 19:09:51 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
@ -230,6 +230,7 @@ struct intf_sys_t
- (void)updateMessageArray;
- (void)playStatusUpdated:(BOOL)b_pause;
- (void)setSubmenusEnabled:(BOOL)b_enabled;
- (void)manageVolumeSlider;
- (void)setupMenus:(input_thread_t *)p_input;

View File

@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.79 2003/05/11 18:40:11 hartman Exp $
* $Id: intf.m,v 1.80 2003/05/11 19:09:51 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
@ -391,6 +391,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
[o_info_window setTitle: _NS("Info")];
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider];
}
@ -687,7 +688,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
else
{
/* play status */
p_intf->p_sys->b_play_status = VLC_FALSE;
p_intf->p_sys->b_play_status = FALSE;
[self setSubmenusEnabled: FALSE];
}
[self playStatusUpdated: p_intf->p_sys->b_play_status];
@ -882,6 +884,19 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
}
}
- (void)setSubmenusEnabled:(BOOL)b_enabled
{
[o_mi_program setEnabled: b_enabled];
[o_mi_title setEnabled: b_enabled];
[o_mi_chapter setEnabled: b_enabled];
[o_mi_audiotrack setEnabled: b_enabled];
[o_mi_videotrack setEnabled: b_enabled];
[o_mi_subtitle setEnabled: b_enabled];
[o_mi_channels setEnabled: b_enabled];
[o_mi_device setEnabled: b_enabled];
[o_mi_screen setEnabled: b_enabled];
}
- (void)manageVolumeSlider
{
audio_volume_t i_volume;
@ -1081,7 +1096,6 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
{
NSMenuItem * o_lmi;
NSString * o_title;
NSLog(@"%d, %s", i_value, psz_variable);
if ( text.p_list->p_values[i].psz_string )
{