From ed8e2710a8268af1885a215f97a5e3b057a4ee36 Mon Sep 17 00:00:00 2001 From: Rodeo Date: Thu, 3 May 2012 15:02:12 +0000 Subject: MacGui: lots of stuff I forgot to to in revision 4627, plus a minor code cleanup. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4633 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/HBQueueController.mm | 99 +++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 49 deletions(-) (limited to 'macosx/HBQueueController.mm') diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm index 6c331c1f1..c522d4cb3 100644 --- a/macosx/HBQueueController.mm +++ b/macosx/HBQueueController.mm @@ -1165,7 +1165,6 @@ return ![(HBQueueOutlineView*)outlineView isDragging]; [finalString appendString:@"\n" withAttributes:detailAttr]; /* Optional String for Picture Filters */ - NSString * pictureFilters = @""; BOOL pictureFiltersPresent = NO; @@ -1182,70 +1181,72 @@ return ![(HBQueueOutlineView*)outlineView isDragging]; if( [[item objectForKey:@"PictureDecombDeinterlace"] intValue] == 1) { - if ([[item objectForKey:@"PictureDecomb"] intValue] != 0) + if( [[item objectForKey:@"PictureDecomb"] intValue] == 1) { - if( [[item objectForKey:@"PictureDecomb"] intValue] == 1) - { - pictureFiltersPresent = YES; - pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Decomb (%@)",[item objectForKey:@"PictureDecombCustom"]]]; - } - else if( [[item objectForKey:@"PictureDecomb"] intValue] == 2) - { - pictureFiltersPresent = YES; - pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb (Default)"]; - } - else if( [[item objectForKey:@"PictureDecomb"] intValue] == 3) - { - pictureFiltersPresent = YES; - pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb (Fast)"]; - } + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Decomb (%@)",[item objectForKey:@"PictureDecombCustom"]]]; } - } - else - { - if ([[item objectForKey:@"PictureDeinterlace"] intValue] != 0) + else if( [[item objectForKey:@"PictureDecomb"] intValue] == 2) { pictureFiltersPresent = YES; - if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 1) - { - pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Deinterlace (%@)",[item objectForKey:@"PictureDeinterlaceCustom"]]]; - } - else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 2) - { - pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Fast)"]; - } - else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 3) - { - pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Slow)"]; - } - else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 4) - { - pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Slower)"]; - } - + pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb (Default)"]; + } + else if( [[item objectForKey:@"PictureDecomb"] intValue] == 3) + { + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb (Fast)"]; + } + else if( [[item objectForKey:@"PictureDecomb"] intValue] == 4) + { + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:@" - Decomb (Bob)"]; } } - if ([[item objectForKey:@"PictureDenoise"] intValue] != 0) + else { - pictureFiltersPresent = YES; - if ([[item objectForKey:@"PictureDenoise"] intValue] == 1) + if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 1) { - pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Denoise (%@)",[item objectForKey:@"PictureDenoiseCustom"]]]; + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Deinterlace (%@)",[item objectForKey:@"PictureDeinterlaceCustom"]]]; } - else if ([[item objectForKey:@"PictureDenoise"] intValue] == 2) + else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 2) { - pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Weak)"]; + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Fast)"]; } - else if ([[item objectForKey:@"PictureDenoise"] intValue] == 3) + else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 3) { - pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Medium)"]; + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Slow)"]; } - else if ([[item objectForKey:@"PictureDenoise"] intValue] == 4) + else if ([[item objectForKey:@"PictureDeinterlace"] intValue] == 5) { - pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Strong)"]; + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:@" - Deinterlace (Bob)"]; } - } + + if ([[item objectForKey:@"PictureDenoise"] intValue] == 1) + { + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:[NSString stringWithFormat:@" - Denoise (%@)",[item objectForKey:@"PictureDenoiseCustom"]]]; + } + else if ([[item objectForKey:@"PictureDenoise"] intValue] == 2) + { + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Weak)"]; + } + else if ([[item objectForKey:@"PictureDenoise"] intValue] == 3) + { + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Medium)"]; + } + else if ([[item objectForKey:@"PictureDenoise"] intValue] == 4) + { + pictureFiltersPresent = YES; + pictureFilters = [pictureFilters stringByAppendingString:@" - Denoise (Strong)"]; + } + if ([[item objectForKey:@"PictureDeblock"] intValue] != 0) { pictureFiltersPresent = YES; -- cgit v1.2.3