From b4080ac4fabf7c04ed706a55ed6a9f61404c1a5d Mon Sep 17 00:00:00 2001
From: Derk-Jan Hartman <hartman@videolan.org>
Date: Sun, 11 May 2003 19:09:51 +0000
Subject: [PATCH] * 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
---
modules/gui/macosx/intf.h | 3 ++-
modules/gui/macosx/intf.m | 20 +++++++++++++++++---
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 24c922a07c83..329f178fdbcd 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -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;
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 17afa7150f28..5e6c023a947f 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.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 )
{
--
GitLab