From edb37c75b9072ef9f3abae398f5562459ab07977 Mon Sep 17 00:00:00 2001 From: Damiano Galassi Date: Fri, 9 Oct 2015 23:01:58 +0200 Subject: MacGui: use the new deinterlate preset keys --- macosx/HBJob+HBJobConversion.m | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'macosx/HBJob+HBJobConversion.m') diff --git a/macosx/HBJob+HBJobConversion.m b/macosx/HBJob+HBJobConversion.m index 08514d55d..802eb2bda 100644 --- a/macosx/HBJob+HBJobConversion.m +++ b/macosx/HBJob+HBJobConversion.m @@ -429,22 +429,17 @@ hb_add_filter(job, filter, filter_str); } - if (self.filters.useDecomb && ![self.filters.decomb isEqualToString:@"off"]) + // Deinterlace + if (![self.filters.deinterlace isEqualToString:@"off"]) { - // Decomb int filter_id = HB_FILTER_DECOMB; + if ([self.filters.deinterlace isEqualToString:@"deinterlace"]) + { + filter_id = HB_FILTER_DEINTERLACE; + } + const char *filter_str = hb_generate_filter_settings(filter_id, - self.filters.decomb.UTF8String, - self.filters.decombCustomString.UTF8String); - filter = hb_filter_init(filter_id); - hb_add_filter(job, filter, filter_str); - } - else if (!self.filters.useDecomb && ![self.filters.deinterlace isEqualToString:@"off"]) - { - // Deinterlace - int filter_id = HB_FILTER_DEINTERLACE; - const char *filter_str = hb_generate_filter_settings(filter_id, - self.filters.deinterlace.UTF8String, + self.filters.deinterlacePreset.UTF8String, self.filters.deinterlaceCustomString.UTF8String); filter = hb_filter_init(filter_id); hb_add_filter(job, filter, filter_str); -- cgit v1.2.3