casa-mp-base

--- modules/gui/macosx/orig.open.m  2016-12-17 19:55:54.000000000 +0100

+++ modules/gui/macosx/open.m   2016-12-17 20:26:12.000000000 +0100

@@ -40,7 +40,14 @@

 #import <IOKit/storage/IODVDMedia.h>

 #import <IOKit/storage/IOBDMedia.h>

 #import <Cocoa/Cocoa.h>

+#import <AvailabilityMacros.h>

+#if defined(MAC_OS_X_VERSION_10_12) \

+    && ((MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12))

+#warning "Excluding all code and features based on QTKit"

+#else

 #import <QTKit/QTKit.h>

+#define HAVE_QTKIT

+#endif

 #import "intf.h"

 #import "playlist.h"

@@ -51,8 +58,10 @@

 #import <vlc_url.h>

+#ifdef HAVE_QTKIT

 NSArray *qtkvideoDevices;

 NSArray *qtkaudioDevices;

+#endif

 #define setEyeTVUnconnected \

 [o_capture_lbl setStringValue: _NS("No device is selected")]; \

 [o_capture_long_lbl setStringValue: _NS("No device is selected.\n\nChoose available device in above pull-down menu.\n")]; \

@@ -207,7 +216,9 @@

     [o_screen_width_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Subscreen width")]];

     [o_screen_height_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Subscreen height")]];

     [o_screen_follow_mouse_ckb setTitle: _NS("Follow the mouse")];

+#ifdef HAVE_QTKIT

     [o_screen_qtk_audio_ckb setTitle: _NS("Capture Audio")];

+#endif

     [o_eyetv_currentChannel_lbl setStringValue: _NS("Current channel:")];

     [o_eyetv_previousProgram_btn setTitle: _NS("Previous Channel")];

     [o_eyetv_nextProgram_btn setTitle: _NS("Next Channel")];

@@ -223,6 +234,7 @@

     [o_file_starttime_fld setFormatter:[[[PositionFormatter alloc] init] autorelease]];

     [o_file_stoptime_fld setFormatter:[[[PositionFormatter alloc] init] autorelease]];

+#ifdef HAVE_QTKIT

     [self qtkvideoDevices];

     [o_qtk_video_device_pop removeAllItems];

     msg_Dbg(VLCIntf, "Found %lu video capture devices", [qtkvideoDevices count]);

@@ -275,6 +287,7 @@

         [o_screen_qtk_audio_pop addItemWithTitle: _NS("None")];

         [qtkaudio_currdevice_uid release];

     }

+#endif

     [self setSubPanel];

@@ -321,7 +334,9 @@

     [[sharedWorkspace notificationCenter] addObserver:self selector:@selector(scanOpticalMedia:) name:NSWorkspaceDidMountNotification object:nil];

     [[sharedWorkspace notificationCenter] addObserver:self selector:@selector(scanOpticalMedia:) name:NSWorkspaceDidUnmountNotification object:nil];

+#ifdef HAVE_QTKIT

     [self qtkToggleUIElements:nil];

+#endif

     [self scanOpticalMedia:nil];

     [self setMRL: @""];

@@ -504,16 +519,20 @@

                     [o_options addObject: @"screen-follow-mouse"];

                 else

                     [o_options addObject: @"no-screen-follow-mouse"];

+#ifdef HAVE_QTKIT

                 if ([o_screen_qtk_audio_ckb state] && qtkaudio_currdevice_uid)

                    [o_options addObject: [NSString stringWithFormat: @"input-slave=qtsound://%@", qtkaudio_currdevice_uid]];

+#endif

             }

             else if ([[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Input Devices")]) {

+#ifdef HAVE_QTKIT

                 if ([o_qtk_video_ckb state]) {

                     [o_options addObject: [NSString stringWithFormat: @"qtcapture-width=%i", [o_capture_width_fld intValue]]];

                     [o_options addObject: [NSString stringWithFormat: @"qtcapture-height=%i", [o_capture_height_fld intValue]]];

                     if ([o_qtk_audio_ckb state] && qtkaudio_currdevice_uid)

                        [o_options addObject: [NSString stringWithFormat: @"input-slave=qtsound://%@", qtkaudio_currdevice_uid]];

                 }

+#endif

             }

         }

@@ -539,11 +558,14 @@

     [o_screen_width_stp setMaxValue: item->rect.size.width];

     [o_screen_height_stp setMaxValue: item->rect.size.height];

+#ifdef HAVE_QTKIT

     [o_screen_qtk_audio_pop setEnabled: [o_screen_qtk_audio_ckb state]];