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

1 files changed, 4 insertions, 4 deletions

diff --git a/macosx/HBUtilities.m b/macosx/HBUtilities.m
index 30f403a29..7618c4263 100644
--- a/macosx/HBUtilities.m
+++ b/macosx/HBUtilities.m
@@ -41,8 +41,8 @@
 + (NSString *)automaticNameForSource:(NSString *)sourceName
                                title:(NSUInteger)title
                             chapters:(NSRange)chaptersRange
-                             quality:(NSString *)quality
-                             bitrate:(NSString *)bitrate
+                             quality:(double)quality
+                             bitrate:(int)bitrate
                           videoCodec:(uint32_t)codec
 {
     NSMutableString *name = [[[NSMutableString alloc] init] autorelease];
@@ -109,12 +109,12 @@
             {
                 // Append the right quality suffix for the selected codec (rf/qp)
                 [name appendString:[[NSString stringWithUTF8String:hb_video_quality_get_name(codec)] lowercaseString]];
-                [name appendString:quality];
+                [name appendString:[NSString stringWithFormat:@"%0.2f", quality]];
             }
             else
             {
                 [name appendString:@"abr"];
-                [name appendString:bitrate];
+                [name appendString:[NSString stringWithFormat:@"%d", bitrate]];
             }
         }
         else