diff options
| -rw-r--r-- | macosx/Controller.m | 32 | ||||
| -rw-r--r-- | macosx/HBQueueController.mm | 99 |
2 files changed, 69 insertions, 62 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index 2eb0eb3f2..31f63808d 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -5074,11 +5074,14 @@ the user is using "Custom" settings by determining the sender*/ videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Detelecine (%@)",[fPictureController detelecineCustomString]]]; } - if ([fPictureController useDecomb] == 1) { /* Decomb */ - if ([fPictureController decomb] == 3) + if ([fPictureController decomb] == 4) + { + videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Bob)"]; + } + else if ([fPictureController decomb] == 3) { videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Fast)"]; } @@ -5094,34 +5097,37 @@ the user is using "Custom" settings by determining the sender*/ else { /* Deinterlace */ - if ([fPictureController deinterlace] > 0) + if ([fPictureController deinterlace] == 5) { fTitle->job->deinterlace = 1; + videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Bob)"]; } - else - { - fTitle->job->deinterlace = 0; - } - - if ([fPictureController deinterlace] == 2) + else if ([fPictureController deinterlace] == 4) { - videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Fast)"]; + fTitle->job->deinterlace = 1; + videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slower)"]; } else if ([fPictureController deinterlace] == 3) { + fTitle->job->deinterlace = 1; videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slow)"]; } - else if ([fPictureController deinterlace] == 4) + else if ([fPictureController deinterlace] == 2) { - videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slower)"]; + fTitle->job->deinterlace = 1; + videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Fast)"]; } else if ([fPictureController deinterlace] == 1) { + fTitle->job->deinterlace = 1; videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Deinterlace (%@)",[fPictureController deinterlaceCustomString]]]; } + else + { + fTitle->job->deinterlace = 0; + } } - /* Denoise */ if ([fPictureController denoise] == 2) { 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; |