# HG changeset patch # User diego # Date 1269615734 0 # Node ID 7e3b047c51e7a68ae8a50c324414261247af7b74 # Parent 83faa3af5f608f5a3e743586087dde2572a98786 Refactor OS X foreground process setting into a separate function. diff -r 83faa3af5f60 -r 7e3b047c51e7 libvo/osx_common.c --- a/libvo/osx_common.c Fri Mar 26 12:12:25 2010 +0000 +++ b/libvo/osx_common.c Fri Mar 26 15:02:14 2010 +0000 @@ -19,6 +19,7 @@ // only to get keycode definitions from HIToolbox/Events.h #include +#include "config.h" #include "osx_common.h" #include "video_out.h" #include "osdep/keycodes.h" @@ -140,3 +141,25 @@ old_movie_aspect = config_aspect; our_aspect_change = 0; } + +/** This chunk of code is heavily based off SDL_macosx.m from SDL. + * The CPSEnableForegroundOperation that was here before is private + * and should not be used. + * Replaced by a call to the 10.3+ TransformProcessType. + */ +void osx_foreground_hack(void) +{ +#if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL) + ProcessSerialNumber myProc, frProc; + Boolean sameProc; + + if (GetFrontProcess(&frProc) == noErr && + GetCurrentProcess(&myProc) == noErr) { + if (SameProcess(&frProc, &myProc, &sameProc) == noErr && !sameProc) { + TransformProcessType(&myProc, + kProcessTransformToForegroundApplication); + } + SetFrontProcess(&myProc); + } +#endif +} diff -r 83faa3af5f60 -r 7e3b047c51e7 libvo/osx_common.h --- a/libvo/osx_common.h Fri Mar 26 12:12:25 2010 +0000 +++ b/libvo/osx_common.h Fri Mar 26 15:02:14 2010 +0000 @@ -22,5 +22,6 @@ int convert_key(unsigned key, unsigned charcode); void change_movie_aspect(float new_aspect); void config_movie_aspect(float config_aspect); +void osx_foreground_hack(void); #endif /* MPLAYER_OSX_COMMON_H */ diff -r 83faa3af5f60 -r 7e3b047c51e7 libvo/vo_corevideo.m --- a/libvo/vo_corevideo.m Fri Mar 26 12:12:25 2010 +0000 +++ b/libvo/vo_corevideo.m Fri Mar 26 15:02:14 2010 +0000 @@ -386,23 +386,7 @@ NSApp = [NSApplication sharedApplication]; isLeopardOrLater = floor(NSAppKitVersionNumber) > 824; - #if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL) - //this chunk of code is heavily based off SDL_macosx.m from SDL - ProcessSerialNumber myProc, frProc; - Boolean sameProc; - - if (GetFrontProcess(&frProc) == noErr) - { - if (GetCurrentProcess(&myProc) == noErr) - { - if (SameProcess(&frProc, &myProc, &sameProc) == noErr && !sameProc) - { - TransformProcessType(&myProc, kProcessTransformToForegroundApplication); - } - SetFrontProcess(&myProc); - } - } - #endif + osx_foreground_hack(); if(!mpGLView) { diff -r 83faa3af5f60 -r 7e3b047c51e7 libvo/vo_quartz.c --- a/libvo/vo_quartz.c Fri Mar 26 12:12:25 2010 +0000 +++ b/libvo/vo_quartz.c Fri Mar 26 15:02:14 2010 +0000 @@ -1088,27 +1088,7 @@ } } -#if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL) - // this chunk of code is heavily based off SDL_macosx.m from SDL - // the CPSEnableForegroundOperation that was here before is private and shouldn't be used - // replaced by a call to the 10.3+ TransformProcessType - { - ProcessSerialNumber myProc, frProc; - Boolean sameProc; - - if (GetFrontProcess(&frProc) == noErr) - { - if (GetCurrentProcess(&myProc) == noErr) - { - if (SameProcess(&frProc, &myProc, &sameProc) == noErr && !sameProc) - { - TransformProcessType(&myProc, kProcessTransformToForegroundApplication); - } - SetFrontProcess(&myProc); - } - } - } -#endif + osx_foreground_hack(); return 0; }