From 541a72c7fda508ec21e1adf8da66043807687222 Mon Sep 17 00:00:00 2001
From: Brian Jordan
Date: Wed, 25 Apr 2012 23:58:08 -0400
Subject: Load picked music into video. Resolves Issue #22

---
 Video Tuneup/ViewController.h                 |  3 ++-
 Video Tuneup/ViewController.m                 | 21 +++++++++++++--------
 Video Tuneup/en.lproj/ViewController_iPad.xib |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Video Tuneup/ViewController.h b/Video Tuneup/ViewController.h
index c926a8a..78d033b 100644
--- a/Video Tuneup/ViewController.h	
+++ b/Video Tuneup/ViewController.h	
@@ -43,7 +43,8 @@
 - (void)hideCameraRollText;
 - (IBAction)loadDefaultAssetFromFile:sender;
 - (IBAction)loadAssetFromFile:(NSURL *)fileURL;
-- (IBAction)loadAudioFromFile:sender;
+- (IBAction)loadAudioFromFile:(NSURL *)songFileURL;
+- (IBAction)loadDefaultAudioFromFile:sender;
 - (IBAction)play:sender;
 - (IBAction)pause:sender;
 - (IBAction)rewind:sender;
diff --git a/Video Tuneup/ViewController.m b/Video Tuneup/ViewController.m
index 6637c9d..73a1e67 100644
--- a/Video Tuneup/ViewController.m	
+++ b/Video Tuneup/ViewController.m	
@@ -108,9 +108,13 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover;
     [self loadAssetFromFile:fileURL];
 }
 
-- (IBAction)loadAudioFromFile:(id)sender {
+- (IBAction)loadDefaultAudioFromFile:(id)sender {
     NSURL *songFileURL = [[NSBundle mainBundle]
             URLForResource:@"song" withExtension:@"mp3"];
+    [self loadAudioFromFile:songFileURL];
+}
+
+- (IBAction)loadAudioFromFile:(NSURL *)songFileURL {
     songAsset = [AVURLAsset URLAssetWithURL:songFileURL options:nil];
     NSLog(@"Song asset duration is %f", CMTimeGetSeconds([songAsset duration]));
 
@@ -118,6 +122,9 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover;
     [self refreshEditor];
 }
 
+#pragma mark -
+#pragma mark Audio picker
+
 - (IBAction)showMediaPicker:(id)sender
 {
     MPMediaPickerController *mediaPicker = [[MPMediaPickerController alloc] initWithMediaTypes: MPMediaTypeMusic];
@@ -134,13 +141,11 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover;
     if (mediaItemCollection) {
 
         NSLog(@"Got media item");
-//        [musicPlayer setQueueWithItemCollection: mediaItemCollection];
-//        [musicPlayer play];
-        NSLog(@"%@",[[[mediaItemCollection items] objectAtIndex:0]valueForKey:MPMediaItemPropertyTitle]);
-        
-        NSURL *url = [[[mediaItemCollection items] objectAtIndex:0] valueForProperty:MPMediaItemPropertyAssetURL];
-        
-        NSLog(@"%@", url);
+//        NSLog(@"%@",[[[mediaItemCollection items] objectAtIndex:0]valueForKey:MPMediaItemPropertyTitle]);
+//        NSURL *url = [[[mediaItemCollection items] objectAtIndex:0] valueForProperty:MPMediaItemPropertyAssetURL];
+//        NSLog(@"%@", url);
+
+        [self loadAudioFromFile:url];
     
     } else {NSLog(@"Didn't get media item!");}
 
diff --git a/Video Tuneup/en.lproj/ViewController_iPad.xib b/Video Tuneup/en.lproj/ViewController_iPad.xib
index 5fe78b7..8879bbb 100644
--- a/Video Tuneup/en.lproj/ViewController_iPad.xib	
+++ b/Video Tuneup/en.lproj/ViewController_iPad.xib	
@@ -381,7 +381,7 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">loadAudioFromFile:</string>
+						<string key="label">loadDefaultAudioFromFile:</string>
 						<reference key="source" ref="761978491"/>
 						<reference key="destination" ref="841351856"/>
 						<int key="IBEventType">7</int>
-- 
cgit v1.2.3