From da40b92057ad95f76aca43f7da8cf6f84b0bed87 Mon Sep 17 00:00:00 2001 From: Greg Dick Date: Fri, 29 May 2015 11:46:28 -0500 Subject: [PATCH 1/3] Set up pics to always show whole pictures. --- SAVideoRangeSlider/SAVideoRangeSlider.m | 33 +++++++++++++------------ 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/SAVideoRangeSlider/SAVideoRangeSlider.m b/SAVideoRangeSlider/SAVideoRangeSlider.m index 2dff742..891b7bc 100644 --- a/SAVideoRangeSlider/SAVideoRangeSlider.m +++ b/SAVideoRangeSlider/SAVideoRangeSlider.m @@ -337,7 +337,11 @@ -(void)getMovieFrame{ self.imageGenerator.maximumSize = CGSizeMake(_bgView.frame.size.width, _bgView.frame.size.height); } - int picWidth = 20; + //If you'd rather specify the number of pics, just set picsCnt manually + int picWidth = 40; + int picsCnt = ceil(_bgView.frame.size.width / picWidth); + picWidth = _bgView.frame.size.width / picsCnt; + int remainderWidth = _bgView.frame.size.width - (picsCnt * picWidth); // First image NSError *error; @@ -362,17 +366,23 @@ -(void)getMovieFrame{ _durationSeconds = CMTimeGetSeconds([myAsset duration]); - int picsCnt = ceil(_bgView.frame.size.width / picWidth); NSMutableArray *allTimes = [[NSMutableArray alloc] init]; int time4Pic = 0; + int frameOrigin = picWidth; if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0){ // Bug iOS7 - generateCGImagesAsynchronouslyForTimes int prefreWidth=0; for (int i=1, ii=1; i 0) + { + thisPicWidth++; + remainderWidth--; + } + time4Pic = frameOrigin; CMTime timeFrame = CMTimeMakeWithSeconds(_durationSeconds*time4Pic/_bgView.frame.size.width, 600); @@ -395,21 +405,12 @@ -(void)getMovieFrame{ CGRect currentFrame = tmp.frame; - currentFrame.origin.x = ii*picWidth; - - currentFrame.size.width=picWidth; - prefreWidth+=currentFrame.size.width; + currentFrame.origin.x = frameOrigin; + frameOrigin += thisPicWidth; - if( i == picsCnt-1){ - currentFrame.size.width-=6; - } + currentFrame.size.width = thisPicWidth; + prefreWidth += currentFrame.size.width; tmp.frame = currentFrame; - int all = (ii+1)*tmp.frame.size.width; - - if (all > _bgView.frame.size.width){ - int delta = all - _bgView.frame.size.width; - currentFrame.size.width -= delta; - } ii++; From 906683a63a9755241cca2bb6244cc38e9a5d7b32 Mon Sep 17 00:00:00 2001 From: Greg Dick Date: Fri, 29 May 2015 11:56:33 -0500 Subject: [PATCH 2/3] Remove unused variable. --- SAVideoRangeSlider/SAVideoRangeSlider.m | 2 -- 1 file changed, 2 deletions(-) diff --git a/SAVideoRangeSlider/SAVideoRangeSlider.m b/SAVideoRangeSlider/SAVideoRangeSlider.m index 891b7bc..68e2491 100644 --- a/SAVideoRangeSlider/SAVideoRangeSlider.m +++ b/SAVideoRangeSlider/SAVideoRangeSlider.m @@ -374,7 +374,6 @@ -(void)getMovieFrame{ if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0){ // Bug iOS7 - generateCGImagesAsynchronouslyForTimes - int prefreWidth=0; for (int i=1, ii=1; i 0) @@ -409,7 +408,6 @@ -(void)getMovieFrame{ frameOrigin += thisPicWidth; currentFrame.size.width = thisPicWidth; - prefreWidth += currentFrame.size.width; tmp.frame = currentFrame; ii++; From 8fb007473a6ee83a3b3b15065b1e419cfb8f759a Mon Sep 17 00:00:00 2001 From: Greg Dick Date: Fri, 29 May 2015 13:25:53 -0500 Subject: [PATCH 3/3] Change picWidth back to default of 20 --- SAVideoRangeSlider/SAVideoRangeSlider.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SAVideoRangeSlider/SAVideoRangeSlider.m b/SAVideoRangeSlider/SAVideoRangeSlider.m index 68e2491..1ff69c6 100644 --- a/SAVideoRangeSlider/SAVideoRangeSlider.m +++ b/SAVideoRangeSlider/SAVideoRangeSlider.m @@ -338,7 +338,7 @@ -(void)getMovieFrame{ } //If you'd rather specify the number of pics, just set picsCnt manually - int picWidth = 40; + int picWidth = 20; int picsCnt = ceil(_bgView.frame.size.width / picWidth); picWidth = _bgView.frame.size.width / picsCnt; int remainderWidth = _bgView.frame.size.width - (picsCnt * picWidth);