Commit b4080ac4 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* ALL:

  - 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
parent 38cf397d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin * intf.h: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -230,6 +230,7 @@ struct intf_sys_t ...@@ -230,6 +230,7 @@ struct intf_sys_t
- (void)updateMessageArray; - (void)updateMessageArray;
- (void)playStatusUpdated:(BOOL)b_pause; - (void)playStatusUpdated:(BOOL)b_pause;
- (void)setSubmenusEnabled:(BOOL)b_enabled;
- (void)manageVolumeSlider; - (void)manageVolumeSlider;
- (void)setupMenus:(input_thread_t *)p_input; - (void)setupMenus:(input_thread_t *)p_input;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin * intf.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -391,6 +391,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -391,6 +391,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
[o_info_window setTitle: _NS("Info")]; [o_info_window setTitle: _NS("Info")];
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider]; [self manageVolumeSlider];
} }
...@@ -687,7 +688,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -687,7 +688,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
else else
{ {
/* play status */ /* 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]; [self playStatusUpdated: p_intf->p_sys->b_play_status];
...@@ -882,6 +884,19 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -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 - (void)manageVolumeSlider
{ {
audio_volume_t i_volume; audio_volume_t i_volume;
...@@ -1081,7 +1096,6 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -1081,7 +1096,6 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
{ {
NSMenuItem * o_lmi; NSMenuItem * o_lmi;
NSString * o_title; NSString * o_title;
NSLog(@"%d, %s", i_value, psz_variable);
if ( text.p_list->p_values[i].psz_string ) if ( text.p_list->p_values[i].psz_string )
{ {
......
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