Fix main screen detection on Mac OS X.

diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 7510e787671dfbf5631eb1b561bd7180ff0d9a4b..02c848814f1d321522f0810f58a7589e9183a56f 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -193,7 +193,7 @@
             CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
             CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
             
-            if (screen == [NSScreen mainScreen])
+            if ([screen isMainScreen])
                 SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
             
             [[self contentView] replaceSubview:o_view with:o_temp_view];
@@ -239,7 +239,7 @@
         [o_fullscreen_anim2 release];
     }
  
-    if (screen == [NSScreen mainScreen])
+    if ([screen isMainScreen])
         SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
 
     dict1 = [[NSMutableDictionary alloc] initWithCapacity:2];

diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h
index 9cb548e1096956813ef1bc9a10a4676baa95d2e1..6a636d81c21d30ff66241e4a8946d17bd07cefab 100644 (file)
--- a/modules/gui/macosx/misc.h
+++ b/modules/gui/macosx/misc.h
@@ -41,6 +41,7 @@
 @interface NSScreen (VLCAdditions)
 
 + (NSScreen *)screenWithDisplayID: (CGDirectDisplayID)displayID;
+- (BOOL)isMainScreen;
 - (CGDirectDisplayID)displayID;
 - (void)blackoutOtherScreens;
 + (void)unblackoutScreens;

diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index b60ec2e564d0457f1b971050b394c2431c6d95ec..b61c60107a2d9a463cd453b395fb8863d22fe368 100644 (file)
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -90,6 +90,11 @@ static NSMutableArray *blackoutWindows = NULL;
     return nil;
 }
 
+- (BOOL)isMainScreen
+{
+    return ([self displayID] == [[[NSScreen screens] objectAtIndex:0] displayID]);
+}
+
 - (CGDirectDisplayID)displayID
 {
     return (CGDirectDisplayID)_screenNumber;