From 6fe2115d77b2c67bf5f12a52f456f92496e6556a Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 1 Jan 2014 12:10:01 -0800
Subject: [PATCH] osxvideo: Assume SDK and deployment target are at least Snow
 Leopard

---
 sys/osxvideo/cocoawindow.m  | 48 ---------------------------------------------
 sys/osxvideo/osxvideosink.h | 14 -------------
 2 files changed, 62 deletions(-)

diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m
index 75b43cd..5f1f6f3 100644
--- a/sys/osxvideo/cocoawindow.m
+++ b/sys/osxvideo/cocoawindow.m
@@ -41,54 +41,6 @@
 /* Debugging category */
 #include <gst/gstinfo.h>
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-#define kVK_ANSI_Keypad0 0x52
-#define kVK_ANSI_Keypad1 0x53
-#define kVK_ANSI_Keypad2 0x54
-#define kVK_ANSI_Keypad3 0x55
-#define kVK_ANSI_Keypad4 0x56
-#define kVK_ANSI_Keypad5 0x57
-#define kVK_ANSI_Keypad6 0x58
-#define kVK_ANSI_Keypad7 0x59
-#define kVK_ANSI_Keypad8 0x5b
-#define kVK_ANSI_Keypad9 0x5c
-#define kVK_ANSI_KeypadDecimal 0x41
-#define kVK_ANSI_KeypadDivide 0x4b
-#define kVK_ANSI_KeypadEnter 0x4c
-#define kVK_ANSI_KeypadMinus 0x4e
-#define kVK_ANSI_KeypadMultiply 0x43
-#define kVK_ANSI_KeypadPlus 0x45
-#define kVK_Control 0x3b
-#define kVK_Delete 0x33
-#define kVK_DownArrow 0x7d
-#define kVK_End 0x77
-#define kVK_Escape 0x35
-#define kVK_F1 0x7a
-#define kVK_F10 0x6d
-#define kVK_F11 0x67
-#define kVK_F12 0x6f
-#define kVK_F2 0x78
-#define kVK_F3 0x63
-#define kVK_F4 0x76
-#define kVK_F5 0x60
-#define kVK_F6 0x61
-#define kVK_F7 0x62
-#define kVK_F8 0x64
-#define kVK_F9 0x65
-#define kVK_ForwardDelete 0x75
-#define kVK_Help 0x72
-#define kVK_Home 0x73
-#define kVK_LeftArrow 0x7b
-#define kVK_Option 0x3a
-#define kVK_PageDown 0x79
-#define kVK_PageUp 0x74
-#define kVK_Return 0x24
-#define kVK_RightArrow 0x7c
-#define kVK_Shift 0x38
-#define kVK_Tab 0x30
-#define kVK_UpArrow 0x7e
-#endif /* MAC_OS_X_VERSION_MAX_ALLOWED < 1050 */
-
 static
 const gchar* gst_keycode_to_keyname(gint16 keycode)
 {
diff --git a/sys/osxvideo/osxvideosink.h b/sys/osxvideo/osxvideosink.h
index dcdd746..92e318f 100644
--- a/sys/osxvideo/osxvideosink.h
+++ b/sys/osxvideo/osxvideosink.h
@@ -40,14 +40,6 @@
 GST_DEBUG_CATEGORY_EXTERN (gst_debug_osx_video_sink);
 #define GST_CAT_DEFAULT gst_debug_osx_video_sink
 
-/* The hack doesn't work on leopard, the _CFMainPThread symbol
- * is doesn't exist in the CoreFoundation library */
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-#ifdef RUN_NS_APP_THREAD
-#undef RUN_NS_APP_THREAD
-#endif
-#endif
-
 G_BEGIN_DECLS
 
 #define GST_TYPE_OSX_VIDEO_SINK \
@@ -106,11 +98,9 @@ struct _GstOSXVideoSinkClass {
 
 GType gst_osx_video_sink_get_type(void);
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
 @interface NSApplication(AppleMenu)
 - (void)setAppleMenu:(NSMenu *)menu;
 @end
-#endif
 
 @interface GstBufferObject : NSObject
 {
@@ -122,11 +112,7 @@ GType gst_osx_video_sink_get_type(void);
 @end
 
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-@interface GstWindowDelegate : NSObject
-#else
 @interface GstWindowDelegate : NSObject <NSWindowDelegate>
-#endif
 {
   @public
   GstOSXVideoSink *osxvideosink;
-- 
2.7.4