aboutsummaryrefslogtreecommitdiffstats
path: root/Video Tuneup/ViewController.m
diff options
context:
space:
mode:
authortw2012-03-28 20:51:36 -0400
committertw2012-03-28 20:51:36 -0400
commit743790e954359d91d4d2497e80bb9404e2b959c8 (patch)
treea6315c12f5d968d54aabaf7012585493b2386d1c /Video Tuneup/ViewController.m
parent183b9966dbfdd436006aae6f89b6cb98da9fb941 (diff)
parentaf028612ee7ac7326524a66751b2d11aa955d1a9 (diff)
downloadVideo-Tuneup-743790e954359d91d4d2497e80bb9404e2b959c8.tar.bz2
Merge branch 'master' of github.com:bcjordan/Video-Tuneup
Diffstat (limited to 'Video Tuneup/ViewController.m')
-rw-r--r--Video Tuneup/ViewController.m18
1 files changed, 2 insertions, 16 deletions
diff --git a/Video Tuneup/ViewController.m b/Video Tuneup/ViewController.m
index fe509c2..4e01e93 100644
--- a/Video Tuneup/ViewController.m
+++ b/Video Tuneup/ViewController.m
@@ -119,23 +119,11 @@ static const NSString *ItemStatusContext;
// Initialize video editor
self.editor = [[SimpleEditor alloc] init];
-
- NSMutableArray *clips = [NSMutableArray arrayWithCapacity:3];
-
- if(asset) {
- [clips addObject:asset];
- [clips addObject:asset];
- [clips addObject:asset];
- } else {NSLog(@"Error! No Asset!"); return;}
-
- // Copy clips into editor
-// self.editor.clips = [clips copy];
- self.editor.clips = clips;
+ self.editor.video = asset;
- NSLog(@"Put clips in. Count is %i", [clips count]);
-
// Begin export
[self.editor buildCompositionObjectsForPlayback:NO];
+
NSLog(@"Put clips in. Build.");
AVAssetExportSession *session = [self.editor assetExportSessionWithPreset:AVAssetExportPresetHighestQuality];
NSLog(@"Session");
@@ -157,8 +145,6 @@ static const NSString *ItemStatusContext;
session.outputURL = [NSURL fileURLWithPath:filePath];
session.outputFileType = AVFileTypeQuickTimeMovie;
- NSLog(@"Exporting asynchronously %i.", [clips count]);
-
[session exportAsynchronouslyWithCompletionHandler:^
{
dispatch_async(dispatch_get_main_queue(), ^{