From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Sat, 14 Jul 2012 12:03:33 +0000 (+0200)
Subject: macosx: CAS: private API optimization
X-Git-Tag: 2.1.0-git~3811
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=227c020c34ca3b30f5347346a8768bcf2d90a1c1;p=vlc

macosx: CAS: private API optimization
---

diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m
index e3cafccb19..9f007c461c 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -245,7 +245,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
 
 - (IBAction)customizeProfile:(id)sender
 {
-    [self resetCustomizationSheetBasedOnProfile:[_profile_pop indexOfSelectedItem]];
+    [self resetCustomizationSheetBasedOnProfile:[_profileValueList objectAtIndex:[_profile_pop indexOfSelectedItem]]];
     [NSApp beginSheet:_customize_panel modalForWindow:_window modalDelegate:self didEndSelector:NULL contextInfo:nil];
 }
 
@@ -325,17 +325,17 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
     }
 }
 
-- (void)resetCustomizationSheetBasedOnProfile:(NSInteger)profileNumber
+- (void)resetCustomizationSheetBasedOnProfile:(NSString *)profileString
 {
     /* Container(string), transcode video(bool), transcode audio(bool),
     * use subtitles(bool), video codec(string), video bitrate(integer),
     * scale(float), fps(float), width(integer, height(integer),
-                                      * audio codec(string), audio bitrate(integer), channels(integer),
-                                      * samplerate(integer), subtitle codec(string), subtitle overlay(bool) */
+    * audio codec(string), audio bitrate(integer), channels(integer),
+    * samplerate(integer), subtitle codec(string), subtitle overlay(bool) */
 
-    NSArray * components = [[_profileValueList objectAtIndex:profileNumber] componentsSeparatedByString:@";"];
+    NSArray * components = [profileString componentsSeparatedByString:@";"];
     if ([components count] != 16) {
-        msg_Err(VLCIntf, "CAS: the requested profile %li is invalid", profileNumber);
+        msg_Err(VLCIntf, "CAS: the requested profile '%s' is invalid", [profileString UTF8String]);
         return;
     }