diff options
| author | Julien Isorce <j.isorce@samsung.com> | 2015-03-24 23:15:15 +0000 |
|---|---|---|
| committer | Julien Isorce <j.isorce@samsung.com> | 2015-03-24 23:16:26 +0000 |
| commit | d63c163335467caa58ce82521e5dc1a857a44c2f (patch) | |
| tree | e2b311ad498bf5d1d618cc68c074ba59abef45d1 | |
| parent | 8afc8c8f3bec494ebfcf1f46b61df0ee6e9ed423 (diff) | |
osxvideosink: check for deprecated constants prior to OSX 10.10
cocoawindow.m:339:5: error: 'NSOpenGLPFAWindow'
is deprecated: first deprecated in OS X 10.9
cocoawindow.m:576:7: error: 'NSOpenGLPFAFullScreen'
is deprecated: first deprecated in OS X 10.6
cocoawindow.m:605:24: error: 'setFullScreen'
is deprecated: first deprecated in OS X 10.7
| -rw-r--r-- | sys/osxvideo/cocoawindow.m | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m index 57d19a9bf..71e1ca050 100644 --- a/sys/osxvideo/cocoawindow.m +++ b/sys/osxvideo/cocoawindow.m @@ -336,7 +336,9 @@ const gchar* gst_keycode_to_keyname(gint16 keycode) NSOpenGLPFAColorSize, 24, NSOpenGLPFAAlphaSize, 8, NSOpenGLPFADepthSize, 24, +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090 NSOpenGLPFAWindow, +#endif 0 }; @@ -573,7 +575,9 @@ const gchar* gst_keycode_to_keyname(gint16 keycode) NSOpenGLPFAColorSize, 24, NSOpenGLPFAAlphaSize, 8, NSOpenGLPFADepthSize, 24, +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 NSOpenGLPFAFullScreen, +#endif NSOpenGLPFAScreenMask, CGDisplayIDToOpenGLDisplayMask (kCGDirectMainDisplay), 0 @@ -602,7 +606,9 @@ const gchar* gst_keycode_to_keyname(gint16 keycode) GST_WARNING ("CGCaptureAllDisplays() failed"); return; } +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 [fullScreenContext setFullScreen]; +#endif [fullScreenContext makeCurrentContext]; fullscreen = YES; |