MacGui: Adds a new sheet for audio defaults (presets), uses the same preset keys as the LinGui.

The built-in presets still use the languages from the Audio preferences.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6264 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 5 insertions, 12 deletions

diff --git a/macosx/HBAudioController.h b/macosx/HBAudioController.h
index 959bdc63a..64928aba5 100644
--- a/macosx/HBAudioController.h
+++ b/macosx/HBAudioController.h
@@ -15,10 +15,11 @@ extern NSString *keyAudioInputSampleRate;
 extern NSString *keyAudioInputCodec;
 extern NSString *keyAudioInputCodecParam;
 extern NSString *keyAudioInputChannelLayout;
+
 extern NSString *HBMixdownChangedNotification;
 
 @class HBAudio;
-
+@class HBAudioSettings;
 /**
  *  HBAudioController
  *
@@ -29,23 +30,15 @@ extern NSString *HBMixdownChangedNotification;
 @property (nonatomic, readonly, retain) NSArray *masterTrackArray;
 @property (nonatomic, readonly) NSDictionary *noneTrack;
 
-@property(nonatomic, readwrite) BOOL allowAACPassCheck;
-@property(nonatomic, readwrite) BOOL allowAC3PassCheck;
-@property(nonatomic, readwrite) BOOL allowDTSHDPassCheck;
-@property(nonatomic, readwrite) BOOL allowDTSPassCheck;
-@property(nonatomic, readwrite) BOOL allowMP3PassCheck;
-
-@property(nonatomic, readwrite, assign) NSString *audioEncoderFallback;
-@property(nonatomic, readwrite) NSInteger audioEncoderFallbackTag;
+@property(nonatomic, readonly) HBAudioSettings *settings;
 
 - (void) enableUI: (BOOL) b;
-- (void) setHBController: (id) aController;
+
+- (void)applySettingsFromPreset:(NSDictionary *)preset;
 
 - (void) prepareAudioForQueueFileJob: (NSMutableDictionary *) aDict;
 - (void) prepareAudioForJobPreview: (hb_job_t *) aJob;
-- (void) prepareAudioForPreset: (NSMutableArray *) anArray;
 - (void) addTracksFromQueue: (NSMutableDictionary *) aQueue;
-- (void) addTracksFromPreset: (NSMutableDictionary *) aPreset;
 
 - (BOOL) anyCodecMatches: (int) aCodecValue;
 - (void) settingTrackToNone: (HBAudio *) newNoneTrack;