6 files changed, 28 insertions, 4 deletions
diff --git a/macosx/HBAudio.h b/macosx/HBAudio.h
index 609f0fd2a..af37f4aa8 100644
--- a/macosx/HBAudio.h
+++ b/macosx/HBAudio.h
@@ -11,6 +11,8 @@
 @class HBAudioTrack;
 @class HBAudioDefaults;
 
+NS_ASSUME_NONNULL_BEGIN
+
 extern NSString *HBAudioChangedNotification;
 
 @interface HBAudio : NSObject <NSSecureCoding, NSCopying, HBPresetCoding>
@@ -26,7 +28,7 @@ extern NSString *HBAudioChangedNotification;
 
 - (BOOL)anyCodecMatches:(int)codec;
 - (void)settingTrackToNone:(HBAudioTrack *)newNoneTrack;
-- (void)switchingTrackFromNone:(HBAudioTrack *)noLongerNoneTrack;
+- (void)switchingTrackFromNone:(nullable HBAudioTrack *)noLongerNoneTrack;
 
 - (void)containerChanged:(int)container;
 
@@ -40,3 +42,5 @@ extern NSString *HBAudioChangedNotification;
 - (void)removeObjectFromTracksAtIndex:(NSUInteger)index;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/macosx/HBAudioDefaults.h b/macosx/HBAudioDefaults.h
index 114fee701..8042eeb32 100644
--- a/macosx/HBAudioDefaults.h
+++ b/macosx/HBAudioDefaults.h
@@ -7,6 +7,8 @@
 #import <Foundation/Foundation.h>
 #import "HBPresetCoding.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef NS_ENUM(NSUInteger, HBAudioTrackSelectionBehavior) {
     HBAudioTrackSelectionBehaviorNone,
     HBAudioTrackSelectionBehaviorFirst,
@@ -46,3 +48,5 @@ typedef NS_ENUM(NSUInteger, HBAudioTrackSelectionBehavior) {
 - (void)validateEncoderFallbackForVideoContainer:(int)container;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/macosx/HBAudioTrack.h b/macosx/HBAudioTrack.h
index f46f854f5..e1333678d 100644
--- a/macosx/HBAudioTrack.h
+++ b/macosx/HBAudioTrack.h
@@ -10,6 +10,8 @@
 @protocol HBAudioTrackDataSource;
 @protocol HBAudioTrackDelegate;
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  *  Audio track dicts keys.
  */
@@ -34,15 +36,15 @@ extern NSString *keyAudioBitrate;
 @interface HBAudioTrack : NSObject <NSSecureCoding, NSCopying>
 
 @property (nonatomic, strong) NSDictionary *track;
-@property (nonatomic, strong) NSDictionary *codec;
+@property (nonatomic, strong, nullable) NSDictionary *codec;
 @property (nonatomic, strong) NSDictionary *mixdown;
 @property (nonatomic, strong) NSDictionary *sampleRate;
 @property (nonatomic, strong) NSDictionary *bitRate;
 @property (nonatomic, strong) NSNumber *drc;
 @property (nonatomic, strong) NSNumber *gain;
 @property (nonatomic, strong) NSNumber *videoContainerTag;
-@property (nonatomic, weak) id<HBAudioTrackDataSource> dataSource;
-@property (nonatomic, weak) id<HBAudioTrackDelegate> delegate;
+@property (nonatomic, weak, nullable) id<HBAudioTrackDataSource> dataSource;
+@property (nonatomic, weak, nullable) id<HBAudioTrackDelegate> delegate;
 
 @property (nonatomic, strong) NSMutableArray *codecs;
 @property (nonatomic, strong) NSMutableArray *mixdowns;
@@ -68,3 +70,5 @@ extern NSString *keyAudioBitrate;
 - (void)switchingTrackFromNone:(HBAudioTrack *)noLongerNoneTrack;
 - (void)mixdownChanged;
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/macosx/HBAudioTrackPreset.h b/macosx/HBAudioTrackPreset.h
index a7d849757..f8f09ea14 100644
--- a/macosx/HBAudioTrackPreset.h
+++ b/macosx/HBAudioTrackPreset.h
@@ -6,6 +6,8 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 /**
  *  HBAudioTrackPreset
  *  a KVO enabled class used in the Audio Defaults panels,
@@ -37,6 +39,8 @@
 
 @end
 
+NS_ASSUME_NONNULL_END
+
 /**
  *  A series of value trasformers to bridge the libhb enums
  *  to the textual rapresentations used in the interface.
diff --git a/macosx/HBSubtitles.h b/macosx/HBSubtitles.h
index 3e8819e2b..29487dd6c 100644
--- a/macosx/HBSubtitles.h
+++ b/macosx/HBSubtitles.h
@@ -7,6 +7,8 @@
 #import <Foundation/Foundation.h>
 #import "HBPresetCoding.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 extern NSString *keySubTrackSelectionIndex;
 extern NSString *keySubTrackName;
 extern NSString *keySubTrackIndex;
@@ -68,3 +70,5 @@ extern NSString *keySubTrackLanguageIndex;
 
 @end
 
+NS_ASSUME_NONNULL_END
+
diff --git a/macosx/HBSubtitlesDefaults.h b/macosx/HBSubtitlesDefaults.h
index 273086d6e..8b3fa6d4f 100644
--- a/macosx/HBSubtitlesDefaults.h
+++ b/macosx/HBSubtitlesDefaults.h
@@ -7,6 +7,8 @@
 #import <Foundation/Foundation.h>
 #import "HBPresetCoding.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef NS_ENUM(NSUInteger, HBSubtitleTrackSelectionBehavior) {
     HBSubtitleTrackSelectionBehaviorNone,
     HBSubtitleTrackSelectionBehaviorFirst,
@@ -34,3 +36,5 @@ typedef NS_ENUM(NSUInteger, HBSubtitleTrackBurnInBehavior) {
 @property (nonatomic, readwrite) BOOL burnInBluraySubtitles;
 
 @end
+
+NS_ASSUME_NONNULL_END