MacGui: x264 options in presets - initial implementation

- x264 options string can be entered in NSTextview in the create new preset window
NOTE:
- When using x264, the gui first looks for a preset with a x264 option string available and then looks for the string in the preferences if it cant find it in the preset. So, if there is a string available in the preset, it ignores the string (if there is one available) in the prefs.

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

1 files changed, 12 insertions, 9 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 4fd0f272e..4d997df7c 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -127,19 +127,22 @@
 	
 	IBOutlet NSDrawer            * fPresetDrawer;
 	IBOutlet NSTextField         * fPresetNewName;
+	IBOutlet NSTextView          * fPresetNewX264Opt;
+	IBOutlet NSTextField         * fPresetNewX264OptLabel;
 	IBOutlet NSButton            * fPresetNewPicSettingsApply;
 	IBOutlet NSTextField         * fPresetSelectedDisplay;
+	IBOutlet NSTextField         * fDisplayX264Options;
 	
-	NSString * AppSupportDirectory;
-	NSString * UserPresetsFile;
-	NSString * x264ProfilesFile;
-	NSMutableArray * UserPresets;
-	NSMutableArray * x264Profiles;
-	NSMutableArray *UserPresetssortedArray;
-	NSMutableDictionary * chosenPreset;
-
+	NSString                     * AppSupportDirectory;
+	NSString                     * UserPresetsFile;
+	NSString                     * x264ProfilesFile;
+	NSMutableArray               * UserPresets;
+	NSMutableArray               * x264Profiles;
+	NSMutableArray               * UserPresetssortedArray;
+	NSMutableDictionary          * chosenPreset;
+    int                            curUserPresetChosenNum;
 	
-    IBOutlet NSPanel            * fAddPresetPanel;
+    IBOutlet NSPanel             * fAddPresetPanel;
 	IBOutlet NSTableView         * tableView;
 	IBOutlet NSButton            * fPresetsAdd;
 	IBOutlet NSButton            * fPresetsDelete;