MacGui: use libhb built-in presets and validation functions. Update the format and save the presets in UserPresets.json, the old presets are automatically imported if the new presets file is not found. The mac gui now requires 10.7 or later.

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

1 files changed, 2 insertions, 9 deletions

diff --git a/macosx/HBJob.m b/macosx/HBJob.m
index 6578c9710..921eb4304 100644
--- a/macosx/HBJob.m
+++ b/macosx/HBJob.m
@@ -61,14 +61,7 @@ NSString *HBChaptersChangedNotification  = @"HBChaptersChangedNotification";
 
 - (void)applyPreset:(HBPreset *)preset
 {
-    if (preset.isDefault)
-    {
-        self.presetName = [NSString stringWithFormat:@"%@ (Default)", preset.name];
-    }
-    else
-    {
-        self.presetName = preset.name;
-    }
+    self.presetName = preset.name;
 
     NSDictionary *content = preset.content;
 
@@ -87,7 +80,7 @@ NSString *HBChaptersChangedNotification  = @"HBChaptersChangedNotification";
 
 - (void)applyCurrentSettingsToPreset:(NSMutableDictionary *)dict
 {
-    dict[@"FileFormat"] = @(hb_container_get_name(self.container));
+    dict[@"FileFormat"] = @(hb_container_get_short_name(self.container));
     dict[@"ChapterMarkers"] = @(self.chaptersEnabled);
     // MP4 specifics options.
     dict[@"Mp4HttpOptimize"] = @(self.mp4HttpOptimize);