darwin, fixed. Cocoa_GL_GetCurrentDisplayID returns an ID, not a CGDisplayModeRef
authorS. Davilla <davilla@4pi.com>
Fri, 1 Nov 2013 00:34:18 +0000 (20:34 -0400)
committerS. Davilla <davilla@4pi.com>
Fri, 1 Nov 2013 00:38:26 +0000 (20:38 -0400)
xbmc/osx/CocoaInterface.mm

index 75b5c0c..ef2f0e9 100644 (file)
@@ -50,7 +50,7 @@ static CVDisplayLinkRef displayLink = NULL;
 
 CGDirectDisplayID Cocoa_GetDisplayIDFromScreen(NSScreen *screen);
 
-int Cocoa_GL_GetCurrentDisplayID(void)
+uint32_t Cocoa_GL_GetCurrentDisplayID(void)
 {
   // Find which display we are on from the current context (default to main display)
   CGDirectDisplayID display_id = kCGDirectMainDisplay;
@@ -74,7 +74,7 @@ int Cocoa_GL_GetCurrentDisplayID(void)
     }
   }
   
-  return((int)display_id);
+  return((uint32_t)display_id);
 }
 
 bool Cocoa_CVDisplayLinkCreate(void *displayLinkcallback, void *displayLinkContext)
@@ -151,8 +151,9 @@ double Cocoa_GetCVDisplayLinkRefreshPeriod(void)
   }
   else
   {
+    
     CGDisplayModeRef display_mode;
-    display_mode = (CGDisplayModeRef)Cocoa_GL_GetCurrentDisplayID();
+    display_mode = CGDisplayCopyDisplayMode((CGDirectDisplayID)Cocoa_GL_GetCurrentDisplayID());
     fps = CGDisplayModeGetRefreshRate(display_mode);
     CGDisplayModeRelease(display_mode);
     if (fps <= 0.0)