From 8d8c8c1c56012cb5b4ce7548576832b2348cae2a Mon Sep 17 00:00:00 2001 From: ritsuka Date: Thu, 18 Dec 2014 11:18:00 +0000 Subject: MacGui: separate the video settings logic from the view controller. There are a number of small regression ("Custom" preset and auto naming not updating) that will be fixed in the next commits. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6606 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/HBVideoController.h | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'macosx/HBVideoController.h') diff --git a/macosx/HBVideoController.h b/macosx/HBVideoController.h index 6845ed703..f878879c0 100644 --- a/macosx/HBVideoController.h +++ b/macosx/HBVideoController.h @@ -12,40 +12,25 @@ @class HBController; @class HBAdvancedController; +@class HBVideo; + extern NSString *HBVideoEncoderChangedNotification; /** * HBVideoController * - * Responds to HBContainerChangedNotification and HBTitleChangedNotification notifications. + * Responds to HBContainerChangedNotification notifications. */ @interface HBVideoController : NSViewController -// Methods to apply the settings to the controller -- (void)applyVideoSettingsFromQueue:(NSDictionary *)queueToApply; -- (void)applySettingsFromPreset:(NSDictionary *)preset; - -// Methods to get back the controller settings -- (void)prepareVideoForQueueFileJob:(NSMutableDictionary *)queueFileJob; -- (void)prepareVideoForJobPreview:(hb_job_t *)job andTitle:(hb_title_t *)title; -- (void)prepareVideoForPreset:(NSMutableDictionary *)preset; - -- (IBAction)x264PresetsChangedDisplayExpandedOptions:(id)sender; - -@property (nonatomic, copy, readwrite) NSString *pictureSettingsField; -@property (nonatomic, copy, readwrite) NSString *pictureFiltersField; +- (instancetype)initWithAdvancedController:(HBAdvancedController *)advancedController; -// Property exposed for the auto name function -@property (nonatomic, readonly) int codec; -@property (nonatomic, readonly) int qualityType; -@property (nonatomic, readonly) NSString *selectedBitrate; -@property (nonatomic, readonly) NSString *selectedQuality; - -// Property updates when the video size changes -@property (nonatomic, readwrite) NSUInteger fPresetsWidthForUnparse; -@property (nonatomic, readwrite) NSUInteger fPresetsHeightForUnparse; +/** + * Summaries of the pictures and filters settings + */ +@property (nonatomic, copy, readwrite) NSString *pictureSettings; +@property (nonatomic, copy, readwrite) NSString *pictureFilters; -@property (nonatomic, retain, readwrite) HBController *fHBController; -@property (nonatomic, retain, readwrite) HBAdvancedController *fAdvancedOptions; +@property (nonatomic, readonly) HBVideo *video; @end -- cgit v1.2.3