diff options
author | Rodeo <[email protected]> | 2012-03-28 22:43:54 +0000 |
---|---|---|
committer | Rodeo <[email protected]> | 2012-03-28 22:43:54 +0000 |
commit | 719b77cfe9b5280c8bbc492bc0a2ca341ccfbf03 (patch) | |
tree | 6dbfb299ed18d390c0cc09ed0b4c441d1edf975f | |
parent | e6ad8939280db7f3f1cdd44c87e884ed572ca054 (diff) |
Controller.m: replace usage of hb_strdup_printf with NSString.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4549 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r-- | macosx/Controller.m | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index a170d8411..918de6588 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -3349,14 +3349,13 @@ bool one_burned = FALSE; /* Detelecine */ - //hb_filter_detelecine.settings = NULL; filter = hb_filter_init( HB_FILTER_DETELECINE ); if ([fPictureController detelecine] == 1) { /* use a custom detelecine string */ hb_add_filter( job, filter, [[fPictureController detelecineCustomString] UTF8String] ); } - if ([fPictureController detelecine] == 2) + else if ([fPictureController detelecine] == 2) { /* Default */ hb_add_filter( job, filter, NULL ); @@ -3446,20 +3445,16 @@ bool one_burned = FALSE; } /* Add Crop/Scale filter */ - char * filter_str; - filter_str = hb_strdup_printf("%d:%d:%d:%d:%d:%d", - job->width, job->height, - job->crop[0], job->crop[1], job->crop[2], job->crop[3] ); filter = hb_filter_init( HB_FILTER_CROP_SCALE ); - hb_add_filter( job, filter, filter_str ); - free( filter_str ); + hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d:%d:%d", + job->width,job->height, + job->crop[0], job->crop[1], + job->crop[2], job->crop[3]] UTF8String] ); - // Add framerate shaping filter - filter_str = hb_strdup_printf("%d:%d:%d", - job->cfr, job->vrate, job->vrate_base ); + /* Add framerate shaping filter */ filter = hb_filter_init( HB_FILTER_VFR ); - hb_add_filter( job, filter, filter_str ); - free( filter_str ); + hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d", + job->cfr, job->vrate, job->vrate_base] UTF8String] ); } @@ -3902,7 +3897,7 @@ bool one_burned = FALSE; /* use a custom detelecine string */ hb_add_filter( job, filter, [[queueToApply objectForKey:@"PictureDetelecineCustom"] UTF8String] ); } - if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] == 2) + else if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] == 2) { /* Use libhb's default values */ hb_add_filter( job, filter, NULL ); @@ -3990,20 +3985,16 @@ bool one_burned = FALSE; } /* Add Crop/Scale filter */ - char * filter_str; - filter_str = hb_strdup_printf("%d:%d:%d:%d:%d:%d", - job->width, job->height, - job->crop[0], job->crop[1], job->crop[2], job->crop[3] ); filter = hb_filter_init( HB_FILTER_CROP_SCALE ); - hb_add_filter( job, filter, filter_str ); - free( filter_str ); + hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d:%d:%d:%d", + job->width,job->height, + job->crop[0], job->crop[1], + job->crop[2], job->crop[3]] UTF8String] ); - // Add framerate shaping filter - filter_str = hb_strdup_printf("%d:%d:%d", - job->cfr, job->vrate, job->vrate_base ); + /* Add framerate shaping filter */ filter = hb_filter_init( HB_FILTER_VFR ); - hb_add_filter( job, filter, filter_str ); - free( filter_str ); + hb_add_filter( job, filter, [[NSString stringWithFormat:@"%d:%d:%d", + job->cfr, job->vrate, job->vrate_base] UTF8String] ); [self writeToActivityLog: "prepareJob exiting"]; } |