vlc | branch: master | Felix Paul Kühne <[email protected]> | Thu May 2 11:42:13 2013 +0200| [7a47acb982bafce2cab847ac01f1900412af44b2] | committer: Felix Paul Kühne
macosx: fix custom playback options (close #8543) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7a47acb982bafce2cab847ac01f1900412af44b2 --- modules/gui/macosx/open.m | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 872748b..8502ca5 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -453,27 +453,29 @@ static VLCOpen *_o_sharedMainInstance = nil; p_item->list.i[[o_file_sub_size_pop indexOfSelectedItem]]]]; } } - NSArray * components = [[o_file_starttime_fld stringValue] componentsSeparatedByString:@":"]; - NSUInteger componentCount = [components count]; - NSInteger tempValue; - if (componentCount == 1) - tempValue = 1000000 * ([components[0] intValue]); - else if (componentCount == 2) - tempValue = 1000000 * ([components[0] intValue] * 60 + [components[1] intValue]); - else if (componentCount == 3) - tempValue = 1000000 * ([components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]); - if (tempValue > 0) - [o_options addObject: [NSString stringWithFormat:@"start-time=%li", tempValue]]; - components = [[o_file_stoptime_fld stringValue] componentsSeparatedByString:@":"]; - componentCount = [components count]; - if (componentCount == 1) - tempValue = 1000000 * ([components[0] intValue]); - else if (componentCount == 2) - tempValue = 1000000 * ([components[0] intValue] * 60 + [components[1] intValue]); - else if (componentCount == 3) - tempValue = 1000000 * ([components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]); - if (tempValue > 0) - [o_options addObject: [NSString stringWithFormat:@"stop-time=%li", tempValue]]; + if ([o_file_custom_timing_ckb state] == NSOnState) { + NSArray * components = [[o_file_starttime_fld stringValue] componentsSeparatedByString:@":"]; + NSUInteger componentCount = [components count]; + NSInteger tempValue; + if (componentCount == 1) + tempValue = [components[0] intValue]; + else if (componentCount == 2) + tempValue = [components[0] intValue] * 60 + [components[1] intValue]; + else if (componentCount == 3) + tempValue = [components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]; + if (tempValue > 0) + [o_options addObject: [NSString stringWithFormat:@"start-time=%li", tempValue]]; + components = [[o_file_stoptime_fld stringValue] componentsSeparatedByString:@":"]; + componentCount = [components count]; + if (componentCount == 1) + tempValue = [components[0] intValue]; + else if (componentCount == 2) + tempValue = [components[0] intValue] * 60 + [components[1] intValue]; + else if (componentCount == 3) + tempValue = [components[0] intValue] * 3600 + [components[1] intValue] * 60 + [components[2] intValue]; + if (tempValue > 0) + [o_options addObject: [NSString stringWithFormat:@"stop-time=%li", tempValue]]; + } if ([o_output_ckbox state] == NSOnState) { NSArray * soutMRL = [o_sout_options soutMRL]; NSUInteger count = [soutMRL count]; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
