[osx] prep for sdk bump

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
index 18cacab..628ba76 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
@@ -79,8 +79,8 @@
    (field_pic_flag: 1 would indicate a normal interlaced frame).
 */
 
-// missing in 10.4/10.5 SDKs.
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060)
+// missing in 10.4 SDK
+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
 #include "dlfcn.h"
 enum {
   // component Y'CbCr 8-bit 4:2:2, ordered Cb Y'0 Cr Y'1 .

diff --git a/xbmc/linux/PlatformDefs.h b/xbmc/linux/PlatformDefs.h
index dabc680..b5e52ac 100644 (file)
--- a/xbmc/linux/PlatformDefs.h
+++ b/xbmc/linux/PlatformDefs.h
@@ -343,27 +343,20 @@ typedef int (*LPTHREAD_START_ROUTINE)(void *);
 #define _off_t off_t
 
 #if defined(__APPLE__)
-#include <sched.h>
-#include <AvailabilityMacros.h>
-typedef int64_t   off64_t;
-typedef off_t     __off_t;
-typedef off64_t   __off64_t;
-typedef fpos_t fpos64_t;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
-#define __stat64 stat
-#define stat64 stat
-#define statfs64 statfs
-#define fstat64 fstat
-#elif defined(__arm__) 
-#define __stat64 stat
-#define stat64 stat
-#define statfs64 statfs
-#define fstat64 fstat
+  #include <sched.h>
+  #include <AvailabilityMacros.h>
+  typedef int64_t   off64_t;
+  typedef off_t     __off_t;
+  typedef off64_t   __off64_t;
+  typedef fpos_t fpos64_t;
+  #define __stat64 stat
+  #define stat64 stat
+  #if (MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
+    #define statfs64 statfs
+  #endif
+  #define fstat64 fstat
 #else
-#define fstat64 fstat
-#endif
-#else
-#define __stat64 stat64
+  #define __stat64 stat64
 #endif
 
 struct _stati64 {

diff --git a/xbmc/osx/CocoaInterface.h b/xbmc/osx/CocoaInterface.h
index 59ba4ac..0376cbe 100644 (file)
--- a/xbmc/osx/CocoaInterface.h
+++ b/xbmc/osx/CocoaInterface.h
@@ -23,9 +23,6 @@
 
 #include <string>
 #include "utils/StdString.h"
-#if !defined(__arm__)
-#include <Carbon/Carbon.h>
-#endif
 #include "AutoPool.h"
 
 #ifdef __cplusplus
@@ -76,12 +73,6 @@ extern "C"
 
   const char *Cocoa_Paste() ;  
 
-#if !defined(__arm__)
-  // helper from QA 1134
-  // http://developer.apple.com/mac/library/qa/qa2001/qa1134.html
-  OSStatus SendAppleEventToSystemProcess(AEEventID EventToSend);
-#endif
-
   void Cocoa_ResetAudioDevices();
 
 #ifdef __cplusplus

diff --git a/xbmc/osx/CocoaInterface.mm b/xbmc/osx/CocoaInterface.mm
index f2f6267..21f312d 100644 (file)
--- a/xbmc/osx/CocoaInterface.mm
+++ b/xbmc/osx/CocoaInterface.mm
@@ -626,46 +626,6 @@ const char *Cocoa_Paste()
   return NULL;
 }
 
-OSStatus SendAppleEventToSystemProcess(AEEventID EventToSend)
-{
-  AEAddressDesc targetDesc;
-  static const ProcessSerialNumber kPSNOfSystemProcess = { 0, kSystemProcess };
-  AppleEvent eventReply = {typeNull, NULL};
-  AppleEvent appleEventToSend = {typeNull, NULL};
-
-  OSStatus error = noErr;
-
-  error = AECreateDesc(typeProcessSerialNumber, &kPSNOfSystemProcess, 
-                       sizeof(kPSNOfSystemProcess), &targetDesc);
-
-  if (error != noErr)
-  {
-    return(error);
-  }
-
-  error = AECreateAppleEvent(kCoreEventClass, EventToSend, &targetDesc, 
-                             kAutoGenerateReturnID, kAnyTransactionID, &appleEventToSend);
-
-  AEDisposeDesc(&targetDesc);
-  if (error != noErr)
-  {
-    return(error);
-  }
-
-  error = AESend(&appleEventToSend, &eventReply, kAENoReply, 
-                 kAENormalPriority, kAEDefaultTimeout, NULL, NULL);
-
-  AEDisposeDesc(&appleEventToSend);
-  if (error != noErr)
-  {
-    return(error);
-  }
-
-  AEDisposeDesc(&eventReply);
-
-  return(error); 
-}
-
 void Cocoa_ResetAudioDevices()
 {
   // Reset any devices with an AC3/DTS/SPDIF stream back to a Linear PCM

diff --git a/xbmc/powermanagement/osx/CocoaPowerSyscall.cpp b/xbmc/powermanagement/osx/CocoaPowerSyscall.cpp
index f6c359c..b92d738 100644 (file)
--- a/xbmc/powermanagement/osx/CocoaPowerSyscall.cpp
+++ b/xbmc/powermanagement/osx/CocoaPowerSyscall.cpp
@@ -44,6 +44,50 @@ typedef unsigned char   BYTE;
 
 #include "CocoaInterface.h"
 
+#if defined(TARGET_DARWIN_OSX)
+#include <Carbon/Carbon.h>
+
+OSErr SendAppleEventToSystemProcess(AEEventID EventToSend)
+{
+  AEAddressDesc targetDesc;
+  static const ProcessSerialNumber kPSNOfSystemProcess = { 0, kSystemProcess };
+  AppleEvent eventReply = {typeNull, NULL};
+  AppleEvent appleEventToSend = {typeNull, NULL};
+
+  OSStatus error = noErr;
+
+  error = AECreateDesc(typeProcessSerialNumber, &kPSNOfSystemProcess, 
+                       sizeof(kPSNOfSystemProcess), &targetDesc);
+
+  if (error != noErr)
+  {
+    return(error);
+  }
+
+  error = AECreateAppleEvent(kCoreEventClass, EventToSend, &targetDesc, 
+                             kAutoGenerateReturnID, kAnyTransactionID, &appleEventToSend);
+
+  AEDisposeDesc(&targetDesc);
+  if (error != noErr)
+  {
+    return(error);
+  }
+
+  error = AESend(&appleEventToSend, &eventReply, kAENoReply, 
+                 kAENormalPriority, kAEDefaultTimeout, NULL, NULL);
+
+  AEDisposeDesc(&appleEventToSend);
+  if (error != noErr)
+  {
+    return(error);
+  }
+
+  AEDisposeDesc(&eventReply);
+
+  return(error); 
+}
+#endif
+
 CCocoaPowerSyscall::CCocoaPowerSyscall()
 {
   m_OnResume = false;

diff --git a/xbmc/windowing/osx/WinSystemOSX.h b/xbmc/windowing/osx/WinSystemOSX.h
index ebfbe78..af15c93 100644 (file)
--- a/xbmc/windowing/osx/WinSystemOSX.h
+++ b/xbmc/windowing/osx/WinSystemOSX.h
@@ -1,3 +1,5 @@
+#pragma once
+
 /*
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
@@ -19,20 +21,16 @@
  *
  */
 
-#if !defined(__arm__)
-#ifndef WINDOW_SYSTEM_OSX_H
-#define WINDOW_SYSTEM_OSX_H
+#if defined(TARGET_DARWIN_OSX)
 
 #include "windowing/WinSystem.h"
 #include "threads/CriticalSection.h"
-#include <SDL/SDL_video.h>
 
-typedef struct _CGDirectDisplayID *CGDirectDisplayID;
-typedef u_int32_t CGDisplayChangeSummaryFlags;
+typedef struct SDL_Surface SDL_Surface;
 
 class IDispResource;
-
 class CWinEventsOSX;
+
 class CWinSystemOSX : public CWinSystemBase
 {
 public:
@@ -74,9 +72,6 @@ protected:
   void  FillInVideoModes();
   bool  FlushBuffer(void);
 
-  static void DisplayReconfigured(CGDirectDisplayID display, 
-    CGDisplayChangeSummaryFlags flags, void *userData);
-  
   void* m_glContext;
   static void* m_lastOwnedContext;
   SDL_Surface* m_SDLSurface;
@@ -90,5 +85,4 @@ protected:
   std::vector<IDispResource*>  m_resources;
 };
 
-#endif // WINDOW_SYSTEM_H
 #endif

diff --git a/xbmc/windowing/osx/WinSystemOSX.mm b/xbmc/windowing/osx/WinSystemOSX.mm
index e59c51b..b54d4eb 100644 (file)
--- a/xbmc/windowing/osx/WinSystemOSX.mm
+++ b/xbmc/windowing/osx/WinSystemOSX.mm
@@ -39,6 +39,7 @@
 #include "CocoaInterface.h"
 #undef BOOL
 
+#include <SDL/SDL_video.h>
 #include <SDL/SDL_events.h>
 
 #import <Cocoa/Cocoa.h>
@@ -449,6 +450,39 @@ CFDictionaryRef GetMode(int width, int height, double refreshrate, int screenIdx
 }
 
 //---------------------------------------------------------------------------------
+static void DisplayReconfigured(CGDirectDisplayID display, 
+  CGDisplayChangeSummaryFlags flags, void* userData)
+{
+  CWinSystemOSX *winsys = (CWinSystemOSX*)userData;
+       if (!winsys)
+    return;
+
+  if (flags & kCGDisplaySetModeFlag || flags & kCGDisplayBeginConfigurationFlag)
+  {
+    // pre/post-reconfiguration changes
+    RESOLUTION res = g_graphicsContext.GetVideoResolution();
+    NSScreen* pScreen = nil;
+    unsigned int screenIdx = g_settings.m_ResInfo[res].iScreen;
+    
+    if( screenIdx < [[NSScreen screens] count] )
+    {
+        pScreen = [[NSScreen screens] objectAtIndex:screenIdx];
+    }
+
+    if (pScreen)
+    {
+      CGDirectDisplayID xbmc_display = GetDisplayIDFromScreen(pScreen);
+      if (xbmc_display == display)
+      {
+        // we only respond to changes on the display we are running on.
+        CLog::Log(LOGDEBUG, "CWinSystemOSX::DisplayReconfigured");
+        winsys->CheckDisplayChanging(flags);
+      }
+    }
+  }
+}
+
+//---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 CWinSystemOSX::CWinSystemOSX() : CWinSystemBase()
 {
@@ -1049,10 +1083,12 @@ void CWinSystemOSX::GetScreenResolution(int* w, int* h, double* fps, int screenI
 void CWinSystemOSX::EnableVSync(bool enable)
 {
   // OpenGL Flush synchronised with vertical retrace                       
-  GLint swapInterval;
-  
-  swapInterval = enable ? 1 : 0;
-  [[NSOpenGLContext currentContext] setValues:(const long int*)&swapInterval forParameter:NSOpenGLCPSwapInterval];
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4
+  GLint swapInterval = enable ? 1 : 0;
+#else 
+  const long int swapInterval = enable ? 1 : 0;
+#endif
+  [[NSOpenGLContext currentContext] setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
 }
 
 bool CWinSystemOSX::SwitchToVideoMode(int width, int height, double refreshrate, int screenIdx)
@@ -1362,37 +1398,4 @@ void CWinSystemOSX::CheckDisplayChanging(u_int32_t flags)
   }
 }
 
-void CWinSystemOSX::DisplayReconfigured(CGDirectDisplayID display, 
-  CGDisplayChangeSummaryFlags flags, void* userData)
-{
-  CWinSystemOSX *winsys = (CWinSystemOSX*)userData;
-       if (!winsys)
-    return;
-
-  if (flags & kCGDisplaySetModeFlag || flags & kCGDisplayBeginConfigurationFlag)
-  {
-    // pre/post-reconfiguration changes
-    RESOLUTION res = g_graphicsContext.GetVideoResolution();
-    NSScreen* pScreen = nil;
-    unsigned int screenIdx = g_settings.m_ResInfo[res].iScreen;
-    
-    if( screenIdx < [[NSScreen screens] count] )
-    {
-        pScreen = [[NSScreen screens] objectAtIndex:screenIdx];
-    }
-
-    if (pScreen)
-    {
-      CGDirectDisplayID xbmc_display = GetDisplayIDFromScreen(pScreen);
-      if (xbmc_display == display)
-      {
-        // we only respond to changes on the display we are running on.
-        CSingleLock lock(winsys->m_resourceSection);
-        CLog::Log(LOGDEBUG, "CWinSystemOSX::DisplayReconfigured");
-        winsys->CheckDisplayChanging(flags);
-      }
-    }
-  }
-}
-
 #endif