MacGui: fix another round of deprecation warnings. Remove drawer code.

16 files changed, 36 insertions, 55 deletions

diff --git a/macosx/DockTextField.m b/macosx/DockTextField.m
index bf6bc5444..04f39b8ce 100644
--- a/macosx/DockTextField.m
+++ b/macosx/DockTextField.m
@@ -24,7 +24,7 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
-        [[self cell] setBezelStyle:NSRoundedBezelStyle];
+        [[self cell] setBezelStyle:NSBezelStyleRounded];
         _textToDisplay = @"";
         _textAttributes = [self textAttributesWithFontSize:DOCK_TEXTFIELD_FONTSIZE];
         _smallTextAttributes = [self textAttributesWithFontSize:DOCK_TEXTFIELD_FONTSIZE - 2];
diff --git a/macosx/HBAdvancedController.m b/macosx/HBAdvancedController.m
index 49af2baf5..e4fbb775c 100644
--- a/macosx/HBAdvancedController.m
+++ b/macosx/HBAdvancedController.m
@@ -345,7 +345,7 @@
     /* Adaptive Quantization Strength fX264opAqSlider */
     [fX264optAqSlider setMinValue:0.0];
     [fX264optAqSlider setMaxValue:2.0];
-    [fX264optAqSlider setTickMarkPosition:NSTickMarkBelow];
+    [fX264optAqSlider setTickMarkPosition:NSTickMarkPositionBelow];
     [fX264optAqSlider setNumberOfTickMarks:21];
     [fX264optAqSlider setAllowsTickMarkValuesOnly:YES];
     [fX264optAqSlider setFloatValue:1.0];
@@ -357,7 +357,7 @@
     /* PsyRDO fX264optPsyRDSlider */
     [fX264optPsyRDSlider setMinValue:0.0];
     [fX264optPsyRDSlider setMaxValue:2.0];
-    [fX264optPsyRDSlider setTickMarkPosition:NSTickMarkBelow];
+    [fX264optPsyRDSlider setTickMarkPosition:NSTickMarkPositionBelow];
     [fX264optPsyRDSlider setNumberOfTickMarks:21];
     [fX264optPsyRDSlider setAllowsTickMarkValuesOnly:YES];
     [fX264optPsyRDSlider setFloatValue:1.0];
@@ -369,7 +369,7 @@
     /* PsyTrellis fX264optPsyRDSlider */
     [fX264optPsyTrellisSlider setMinValue:0.0];
     [fX264optPsyTrellisSlider setMaxValue:1.0];
-    [fX264optPsyTrellisSlider setTickMarkPosition:NSTickMarkBelow];
+    [fX264optPsyTrellisSlider setTickMarkPosition:NSTickMarkPositionBelow];
     [fX264optPsyTrellisSlider setNumberOfTickMarks:21];
     [fX264optPsyTrellisSlider setAllowsTickMarkValuesOnly:YES];
     [fX264optPsyTrellisSlider setFloatValue:0.0];
diff --git a/macosx/HBAppDelegate.m b/macosx/HBAppDelegate.m
index 53b89417c..72e3f3656 100644
--- a/macosx/HBAppDelegate.m
+++ b/macosx/HBAppDelegate.m
@@ -154,7 +154,7 @@
         [alert addButtonWithTitle:NSLocalizedString(@"Quit", @"Quit Alert -> first button")];
         [alert addButtonWithTitle:NSLocalizedString(@"Don't Quit", @"Quit Alert -> second button")];
         [alert.buttons[1] setKeyEquivalent:@"\E"];
-        [alert setAlertStyle:NSCriticalAlertStyle];
+        [alert setAlertStyle:NSAlertStyleCritical];
 
         NSInteger result = [alert runModal];
 
diff --git a/macosx/HBChapterTitlesController.m b/macosx/HBChapterTitlesController.m
index 5cc567f91..5154f0af2 100644
--- a/macosx/HBChapterTitlesController.m
+++ b/macosx/HBChapterTitlesController.m
@@ -289,7 +289,7 @@
 
     [panel beginSheetModalForWindow:self.view.window completionHandler:^(NSInteger result)
     {
-        if (result == NSFileHandlingPanelOKButton)
+        if (result == NSModalResponseOK)
         {
             NSError *error;
             if ([self importChaptersFromURL:panel.URL error:&error] == NO)
@@ -311,7 +311,7 @@
 
     [panel beginSheetModalForWindow:self.view.window completionHandler:^(NSInteger result)
     {
-        if (result == NSFileHandlingPanelOKButton)
+        if (result == NSModalResponseOK)
         {
             NSError *saveError;
             NSMutableString *csv = [NSMutableString string];
diff --git a/macosx/HBController.m b/macosx/HBController.m
index 3c4d60c38..4e38c5852 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -34,7 +34,7 @@
 
 @import HandBrakeKit;
 
-@interface HBController () <HBPresetsViewControllerDelegate, HBTitleSelectionDelegate, NSDrawerDelegate, NSDraggingDestination, NSPopoverDelegate>
+@interface HBController () <HBPresetsViewControllerDelegate, HBTitleSelectionDelegate, NSDraggingDestination, NSPopoverDelegate>
 {
     IBOutlet NSTabView *fMainTabView;
 
@@ -93,7 +93,6 @@
 
 @property (nonatomic, strong) HBPresetsMenuBuilder *presetsMenuBuilder;
 @property (nonatomic, strong) IBOutlet NSPopUpButton *presetsPopup;
-@property (nonatomic, strong) IBOutlet NSDrawer *presetsDrawer;
 
 @property (nonatomic, strong) IBOutlet NSToolbarItem *presetsItem;
 @property (nonatomic, strong) NSPopover *presetsPopover;
@@ -355,11 +354,6 @@
     fPresetsView.enabled = enabled;
 }
 
-- (NSSize)drawerWillResizeContents:(NSDrawer *) drawer toSize:(NSSize)contentSize {
-    [[NSUserDefaults standardUserDefaults] setObject:NSStringFromSize(contentSize) forKey:@"HBDrawerSize"];
-    return contentSize;
-}
-
 - (void)setNilValueForKey:(NSString *)key
 {
     if ([key isEqualToString:@"scanSpecificTitleIdx"])
@@ -886,7 +880,7 @@
 
     [panel beginSheetModalForWindow:self.window completionHandler: ^(NSInteger result)
     {
-         if (result == NSFileHandlingPanelOKButton)
+        if (result == NSModalResponseOK)
          {
              NSInteger titleIdx = self.scanSpecificTitle ? self.scanSpecificTitleIdx : 0;
              [self openURL:panel.URL titleIndex:titleIdx];
@@ -912,7 +906,7 @@
 
     [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result)
      {
-         if (result == NSFileHandlingPanelOKButton)
+         if (result == NSModalResponseOK)
          {
              self.job.outputURL = panel.URL;
              self.currentDestination = panel.URL;
@@ -1096,7 +1090,7 @@
         [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to overwrite %@?", @"File already exists alert -> informative text"), job.completeOutputURL.path]];
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"File already exists alert -> first button")];
         [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"File already exists alert -> second button")];
-        [alert setAlertStyle:NSCriticalAlertStyle];
+        [alert setAlertStyle:NSAlertStyleCritical];
 
         [alert beginSheetModalForWindow:self.window completionHandler:handler];
     }
@@ -1107,7 +1101,7 @@
         [alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Do you want to overwrite %@?", @"File already exists in queue alert -> informative text"), job.completeOutputURL.path]];
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"File already exists in queue alert -> first button")];
         [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"File already exists in queue alert -> second button")];
-        [alert setAlertStyle:NSCriticalAlertStyle];
+        [alert setAlertStyle:NSAlertStyleCritical];
 
         [alert beginSheetModalForWindow:self.window completionHandler:handler];
     }
@@ -1270,7 +1264,7 @@
         [alert setInformativeText:NSLocalizedString(@"One or more file already exists. Do you want to overwrite?", @"File already exists alert -> informative text")];
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"File already exists alert -> first button")];
         [alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"File already exists alert -> second button")];
-        [alert setAlertStyle:NSCriticalAlertStyle];
+        [alert setAlertStyle:NSAlertStyleCritical];
 
         [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
             if (returnCode == NSAlertSecondButtonReturn)
@@ -1336,19 +1330,6 @@
             [self.presetsPopover close];
         }
     }
-    else
-    {
-        if (self.presetsDrawer.state == NSDrawerClosedState)
-        {
-            [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"HBDefaultPresetsDrawerShow"];
-        }
-        else
-        {
-            [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"HBDefaultPresetsDrawerShow"];
-        }
-
-        [self.presetsDrawer toggle:self];
-    }
 }
 
 - (void)setCurrentPreset:(HBPreset *)currentPreset
diff --git a/macosx/HBImageAndTextCell.m b/macosx/HBImageAndTextCell.m
index b0c400edb..5aebf9cf7 100644
--- a/macosx/HBImageAndTextCell.m
+++ b/macosx/HBImageAndTextCell.m
@@ -194,7 +194,7 @@ scaleProportionally(NSSize imageSize, NSRect canvasRect)
           
         }
 
-        [image drawAtPoint:imageFrame.origin fromRect:imageFrame operation:NSCompositeSourceOver fraction:1.0];
+        [image drawAtPoint:imageFrame.origin fromRect:imageFrame operation:NSCompositingOperationSourceOver fraction:1.0];
     }
 
     [super drawWithFrame:cellFrame inView:controlView];
diff --git a/macosx/HBOutputPanelController.m b/macosx/HBOutputPanelController.m
index 1150e1939..5da8ebaf9 100644
--- a/macosx/HBOutputPanelController.m
+++ b/macosx/HBOutputPanelController.m
@@ -140,8 +140,8 @@
 - (IBAction)copyAllOutputToPasteboard:(id)sender
 {
 	NSPasteboard *pboard = [NSPasteboard generalPasteboard];
-	[pboard declareTypes:@[NSStringPboardType] owner:nil];
-	[pboard setString:[outputTextStorage string] forType:NSStringPboardType];
+    [pboard declareTypes:@[NSPasteboardTypeString] owner:nil];
+    [pboard setString:[outputTextStorage string] forType:NSPasteboardTypeString];
 }
 
 /**
diff --git a/macosx/HBPlayerHUDController.m b/macosx/HBPlayerHUDController.m
index b3b391cbd..82b68b494 100644
--- a/macosx/HBPlayerHUDController.m
+++ b/macosx/HBPlayerHUDController.m
@@ -303,11 +303,11 @@
             [self.player play];
             self.player.rate = rate;
         }
-        else if (event.modifierFlags & NSAlternateKeyMask && key == NSLeftArrowFunctionKey)
+        else if (event.modifierFlags & NSEventModifierFlagOption && key == NSLeftArrowFunctionKey)
         {
             [self.player gotoBeginning];
         }
-        else if (event.modifierFlags & NSAlternateKeyMask && key == NSRightArrowFunctionKey)
+        else if (event.modifierFlags & NSEventModifierFlagOption && key == NSRightArrowFunctionKey)
         {
             [self.player gotoEnd];
         }
diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index 57bf60627..753f371fb 100644
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -57,7 +57,6 @@
         @"HBShowOpenPanelAtLaunch":         @YES,
         @"DefaultMpegExtension":            @"Auto",
         @"UseDvdNav":                       @"YES",
-        @"HBDefaultPresetsDrawerShow":      @YES,
         // Archive the URL because they aren't supported in plist.
         @"HBLastDestinationDirectory":      [NSKeyedArchiver archivedDataWithRootObject:desktopURL],
         @"HBLastSourceDirectory":           [NSKeyedArchiver archivedDataWithRootObject:desktopURL],
@@ -72,7 +71,6 @@
         @"x264CqSliderFractional":          @"0.50",
         @"HBShowAdvancedTab":               @NO,
         @"HBAutoNamingFormat":              @[@"{Source}", @" ", @"{Title}"],
-        @"HBDrawerSize":                    NSStringFromSize(NSMakeSize(184, 591)),
         @"HBQueuePauseIfLowSpace":          @YES,
         @"HBQueueMinFreeSpace":             @"2"
         }];
@@ -222,11 +220,11 @@
 {
     if ([representedObject rangeOfString: @"{"].location == 0)
     {
-        return NSRoundedTokenStyle;
+        return NSTokenStyleRounded;
     }
     else
     {
-        return NSPlainTextTokenStyle;
+        return NSTokenStyleNone;
     }
 }
 
diff --git a/macosx/HBPresetsViewController.m b/macosx/HBPresetsViewController.m
index d2a22b378..17e174f56 100644
--- a/macosx/HBPresetsViewController.m
+++ b/macosx/HBPresetsViewController.m
@@ -164,7 +164,7 @@ static void *HBPresetsViewControllerContext = &HBPresetsViewControllerContext;
 
     [panel beginWithCompletionHandler:^(NSInteger result)
      {
-         if (result == NSFileHandlingPanelOKButton)
+         if (result == NSModalResponseOK)
          {
              NSURL *presetExportDirectory = [panel.URL URLByDeletingLastPathComponent];
              [[NSUserDefaults standardUserDefaults] setURL:presetExportDirectory forKey:@"LastPresetExportDirectoryURL"];
@@ -196,7 +196,7 @@ static void *HBPresetsViewControllerContext = &HBPresetsViewControllerContext;
      {
          [[NSUserDefaults standardUserDefaults] setURL:panel.directoryURL forKey:@"LastPresetImportDirectoryURL"];
 
-         if (result == NSFileHandlingPanelOKButton)
+         if (result == NSModalResponseOK)
          {
              for (NSURL *url in panel.URLs)
              {
@@ -262,7 +262,7 @@ static void *HBPresetsViewControllerContext = &HBPresetsViewControllerContext;
         alert.informativeText = NSLocalizedString(@"You can't undo this action.", @"Delete preset alert -> informative text");
         [alert addButtonWithTitle:NSLocalizedString(@"Delete Preset", @"Delete preset alert -> first button")];
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Delete preset alert -> second button")];
-        alert.alertStyle = NSCriticalAlertStyle;
+        alert.alertStyle = NSAlertStyleCritical;
 
         NSInteger status = [alert runModal];
 
diff --git a/macosx/HBPreviewController.m b/macosx/HBPreviewController.m
index f5c572cfd..cd30f8161 100644
--- a/macosx/HBPreviewController.m
+++ b/macosx/HBPreviewController.m
@@ -450,7 +450,7 @@
         CFRelease(fPreviewImage);
     }
 
-    if (self.previewView.fitToView == NO && !(self.window.styleMask & NSFullScreenWindowMask))
+    if (self.previewView.fitToView == NO && !(self.window.styleMask & NSWindowStyleMaskFullScreen))
     {
         // Get the optimal view size for the image
         NSSize imageScaledSize = [self.generator imageSize];
@@ -473,7 +473,7 @@
     else
     {
         self.previewView.fitToView = YES;
-        if (!(self.window.styleMask & NSFullScreenWindowMask))
+        if (!(self.window.styleMask & NSWindowStyleMaskFullScreen))
         {
             [self.window setFrame:self.window.screen.visibleFrame display:YES animate:YES];
         }
diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m
index fae219c20..0c7ad25e3 100644
--- a/macosx/HBQueueController.m
+++ b/macosx/HBQueueController.m
@@ -1084,7 +1084,7 @@
                 [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", @"Queue Stop Alert -> stop and remove informative text")];
                 [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", @"Queue Stop Alert -> stop and remove first button")];
                 [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Delete", @"Queue Stop Alert -> stop and remove second button")];
-                [alert setAlertStyle:NSCriticalAlertStyle];
+                [alert setAlertStyle:NSAlertStyleCritical];
 
                 [alert beginSheetModalForWindow:targetWindow completionHandler:^(NSModalResponse returnCode) {
                     if (returnCode == NSAlertSecondButtonReturn)
@@ -1208,7 +1208,7 @@
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Stop", @"Queue Alert -> cancel rip second button")];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel Current and Continue", @"Queue Alert -> cancel rip third button")];
     [alert addButtonWithTitle:NSLocalizedString(@"Finish Current and Stop", @"Queue Alert -> cancel rip fourth button")];
-    [alert setAlertStyle:NSCriticalAlertStyle];
+    [alert setAlertStyle:NSAlertStyleCritical];
 
     [alert beginSheetModalForWindow:window completionHandler:^(NSModalResponse returnCode) {
         if (returnCode == NSAlertSecondButtonReturn)
@@ -1359,7 +1359,7 @@
             [alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", @"Queue Edit Alert -> stop and edit informative text")];
             [alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", @"Queue Edit Alert -> stop and edit first button")];
             [alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Edit", @"Queue Edit Alert -> stop and edit second button")];
-            [alert setAlertStyle:NSCriticalAlertStyle];
+            [alert setAlertStyle:NSAlertStyleCritical];
 
             [alert beginSheetModalForWindow:docWindow completionHandler:^(NSModalResponse returnCode) {
                 if (returnCode == NSAlertSecondButtonReturn)
diff --git a/macosx/HBSubtitlesController.m b/macosx/HBSubtitlesController.m
index fd44ef59d..623f3053a 100644
--- a/macosx/HBSubtitlesController.m
+++ b/macosx/HBSubtitlesController.m
@@ -99,7 +99,7 @@
 
     [panel beginSheetModalForWindow:self.view.window completionHandler:^(NSInteger result)
     {
-        if (result == NSFileHandlingPanelOKButton)
+        if (result == NSModalResponseOK)
         {
             NSURL *importSrtFileURL = panel.URL;
             NSURL *importSrtDirectory = importSrtFileURL.URLByDeletingLastPathComponent;
diff --git a/macosx/HBToolbarBadgedItem.m b/macosx/HBToolbarBadgedItem.m
index 35fdf6808..dfce12f5b 100644
--- a/macosx/HBToolbarBadgedItem.m
+++ b/macosx/HBToolbarBadgedItem.m
@@ -139,7 +139,7 @@
         [NSGraphicsContext saveGraphicsState];
         [NSGraphicsContext setCurrentContext:ctx];
 
-        CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+        CGContextRef context = [[NSGraphicsContext currentContext] CGContext];
         CGContextSaveGState(context);
 
         NSRect imageRect = NSMakeRect(0, 0, size.width, size.height);
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 9141ccd8c..f22445fda 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -173,12 +173,12 @@
 		A91CE2FC1C7DB99D0068F46F /* HBPreset.h in Headers */ = {isa = PBXBuildFile; fileRef = A9CF25F21990D64E0023F727 /* HBPreset.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A91CE2FD1C7DB99D0068F46F /* HBMutablePreset.h in Headers */ = {isa = PBXBuildFile; fileRef = A96CD1741BCC5F9100F372F1 /* HBMutablePreset.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A91CE2FE1C7DB99D0068F46F /* HBTreeNode.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D488A31996270300E9B1BA /* HBTreeNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A91D54871E378ABD006D0997 /* HBSecurityAccessToken.h in Headers */ = {isa = PBXBuildFile; fileRef = A91D54851E378ABD006D0997 /* HBSecurityAccessToken.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A91D54871E378ABD006D0997 /* HBSecurityAccessToken.h in Headers */ = {isa = PBXBuildFile; fileRef = A91D54851E378ABD006D0997 /* HBSecurityAccessToken.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A91D54881E378ABD006D0997 /* HBSecurityAccessToken.m in Sources */ = {isa = PBXBuildFile; fileRef = A91D54861E378ABD006D0997 /* HBSecurityAccessToken.m */; };
 		A91F97351D7B2A4E00D82DCE /* HBAudioTransformers.h in Headers */ = {isa = PBXBuildFile; fileRef = A91F97331D7B2A4E00D82DCE /* HBAudioTransformers.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A91F97361D7B2A4E00D82DCE /* HBAudioTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = A91F97341D7B2A4E00D82DCE /* HBAudioTransformers.m */; };
 		A92268781A6E555500A8D5C5 /* HBAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A92268771A6E555500A8D5C5 /* HBAppDelegate.m */; };
-		A9294CC91DC4BBF7004D3415 /* HBJob+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A9294CC71DC4BBF7004D3415 /* HBJob+Private.h */; };
+		A9294CC91DC4BBF7004D3415 /* HBJob+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A9294CC71DC4BBF7004D3415 /* HBJob+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A92B148220CA9F7700146FD8 /* HBHUDView.m in Sources */ = {isa = PBXBuildFile; fileRef = A92B148120CA9F7600146FD8 /* HBHUDView.m */; };
 		A937EECB1C6C7C0300EEAE6D /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = A937EECA1C6C7C0300EEAE6D /* dsa_pub.pem */; };
 		A939DD8B1FC8826A00135F2A /* HBPresetsMenuBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = A939DD8A1FC8826A00135F2A /* HBPresetsMenuBuilder.m */; };
@@ -1325,13 +1325,13 @@
 				A91CE2EC1C7DAEEE0068F46F /* HBStateFormatter.h in Headers */,
 				A91CE2ED1C7DAEEE0068F46F /* HBUtilities.h in Headers */,
 				A91CE2FB1C7DB99D0068F46F /* HBPresetsManager.h in Headers */,
-				A9294CC91DC4BBF7004D3415 /* HBJob+Private.h in Headers */,
 				A91CE2FC1C7DB99D0068F46F /* HBPreset.h in Headers */,
 				A91CE2FD1C7DB99D0068F46F /* HBMutablePreset.h in Headers */,
-				A91D54871E378ABD006D0997 /* HBSecurityAccessToken.h in Headers */,
 				A91F97351D7B2A4E00D82DCE /* HBAudioTransformers.h in Headers */,
 				A98B8E241C7DD2A200B810C9 /* HBPresetCoding.h in Headers */,
+				A9294CC91DC4BBF7004D3415 /* HBJob+Private.h in Headers */,
 				A91CE2FE1C7DB99D0068F46F /* HBTreeNode.h in Headers */,
+				A91D54871E378ABD006D0997 /* HBSecurityAccessToken.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/macosx/HandBrakeKit/HandBrakeKit.h b/macosx/HandBrakeKit/HandBrakeKit.h
index 40d756e85..de6e1dfa0 100644
--- a/macosx/HandBrakeKit/HandBrakeKit.h
+++ b/macosx/HandBrakeKit/HandBrakeKit.h
@@ -49,3 +49,5 @@ FOUNDATION_EXPORT const unsigned char HandBrakeKitVersionString[];
 #import <HandBrakeKit/HBVideo+UIAdditions.h>
 #import <HandBrakeKit/HBPicture+UIAdditions.h>
 #import <HandBrakeKit/HBFilters+UIAdditions.h>
+#import <HandBrakeKit/HBAudioTransformers.h>
+