diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-25 21:12:01 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-25 21:12:01 +0200 |
| commit | 835511ac394d5283c9c449e6154ccb0db1365321 (patch) | |
| tree | c223ee6b82481a0030273cfae9e831dada249fd8 /libvo/vo_macosx.m | |
| parent | 6c712271ce9e8d4eb9cd615e920139ebcb1d1d49 (diff) | |
| parent | cc5e0406412a5f8b4e6e7094f6ffa18a65decd74 (diff) | |
| download | mpv-835511ac394d5283c9c449e6154ccb0db1365321.tar.bz2 mpv-835511ac394d5283c9c449e6154ccb0db1365321.tar.xz | |
Merge svn changes up to r28038
Diffstat (limited to 'libvo/vo_macosx.m')
| -rw-r--r-- | libvo/vo_macosx.m | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index 9cd0a1a008..50f1553c60 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -10,6 +10,12 @@ #include <sys/types.h> #include <sys/ipc.h> #include <sys/shm.h> +#include <CoreServices/CoreServices.h> +//special workaround for Apple bug #6267445 +//(OSServices Power API disabled in OSServices.h for 64bit systems) +#ifndef __POWER__ +#include <CoreServices/../Frameworks/OSServices.framework/Headers/Power.h> +#endif //MPLAYER #include "config.h" @@ -324,8 +330,6 @@ static int preinit(const char *arg) { #if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL) //this chunk of code is heavily based off SDL_macosx.m from SDL - //it uses an Apple private function to request foreground operation - void CPSEnableForegroundOperation(ProcessSerialNumber* psn); ProcessSerialNumber myProc, frProc; Boolean sameProc; @@ -335,7 +339,7 @@ static int preinit(const char *arg) { if (SameProcess(&frProc, &myProc, &sameProc) == noErr && !sameProc) { - CPSEnableForegroundOperation(&myProc); + TransformProcessType(&myProc, kProcessTransformToForegroundApplication); } SetFrontProcess(&myProc); } @@ -751,7 +755,7 @@ static int control(uint32_t request, void *data) glFlush(); - //auto hide mouse cursor and futur on-screen control? + //auto hide mouse cursor (and future on-screen control?) if(isFullscreen && !mouseHide && !isRootwin) { int curTime = TickCount()/60; |