[vlc-commits] macosx: hide the screen access module on non-supported setups

[Felix Paul Kühne]

vlc/vlc-1.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed May 18 21:25:40 2011 +0200| [b2306f3f4a9e3855729f24a934ada84898f4c00d] | committer: Felix Paul Kühne

macosx: hide the screen access module on non-supported setups

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=b2306f3f4a9e3855729f24a934ada84898f4c00d
---

 modules/gui/macosx/intf.h |    7 +------
 modules/gui/macosx/open.m |    5 +++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 531dbe4..7e14eea 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * intf.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2011 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl at nanocrew.net>
@@ -51,11 +51,6 @@ unsigned int CocoaKeyToVLC( unichar i_key );
  * the translated string. the translation should be '1:translatedstring' though */
 #define _ANS(s) [[[VLCMain sharedInstance] localizedString: _(s)] substringFromIndex:2]
 
-#define MACOS_VERSION [[[NSDictionary dictionaryWithContentsOfFile: \
-            @"/System/Library/CoreServices/SystemVersion.plist"] \
-            objectForKey: @"ProductVersion"] floatValue]
-
-
 // You need to release those objects after use
 input_thread_t *getInput(void);
 vout_thread_t *getVout(void);
diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index ed810c0..5f048ae 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.m: Open dialogues for VLC's MacOS X port
  *****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2011 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl at nanocrew.net>
@@ -221,7 +221,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
     [o_capture_mode_pop removeAllItems];
     [o_capture_mode_pop addItemWithTitle: @"iSight"];
-    [o_capture_mode_pop addItemWithTitle: _NS("Screen")];
+    if( NSAppKitVersionNumber < 1115.2 )
+        [o_capture_mode_pop addItemWithTitle: _NS("Screen")];
     [o_capture_mode_pop addItemWithTitle: @"EyeTV"];
     [o_screen_lbl setStringValue: _NS("Screen Capture Input")];
     [o_screen_long_lbl setStringValue: _NS("This facility allows you to process your screen's output.")];