add itunes picker. Resolves issue #20.

5 files changed, 82 insertions, 10 deletions

diff --git a/Video Tuneup.xcodeproj/project.pbxproj b/Video Tuneup.xcodeproj/project.pbxproj
index e196ed2..74eb038 100644
--- a/Video Tuneup.xcodeproj/project.pbxproj
+++ b/Video Tuneup.xcodeproj/project.pbxproj
@@ -36,6 +36,7 @@
 		D3EDFB911524EFC300FD1C47 /* hixs_pattern_evolution.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EDFB911524EFC300FD1C46 /* hixs_pattern_evolution.png */; };
 		D3EDFB911524EFC300FD1C49 /* px_by_Gre3g.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EDFB911524EFC300FD1C48 /* px_by_Gre3g.png */; };
 		D3EDFB911524EFC300FD1C4B /* batthern.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EDFB911524EFC300FD1C4A /* batthern.png */; };
+		D3EDFB911524EFC300FD1C4D /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3EDFB911524EFC300FD1C4C /* MediaPlayer.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -88,6 +89,7 @@
 		D3EDFB911524EFC300FD1C46 /* hixs_pattern_evolution.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = hixs_pattern_evolution.png; sourceTree = "<group>"; };
 		D3EDFB911524EFC300FD1C48 /* px_by_Gre3g.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = px_by_Gre3g.png; sourceTree = "<group>"; };
 		D3EDFB911524EFC300FD1C4A /* batthern.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = batthern.png; sourceTree = "<group>"; };
+		D3EDFB911524EFC300FD1C4C /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -102,6 +104,7 @@
 				D36CCD3615227D06003CCAFC /* UIKit.framework in Frameworks */,
 				D36CCD3815227D06003CCAFC /* Foundation.framework in Frameworks */,
 				D36CCD3A15227D06003CCAFC /* CoreGraphics.framework in Frameworks */,
+				D3EDFB911524EFC300FD1C4D /* MediaPlayer.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -146,6 +149,7 @@
 		D36CCD3415227D06003CCAFC /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				D3EDFB911524EFC300FD1C4C /* MediaPlayer.framework */,
 				D36CCD3515227D06003CCAFC /* UIKit.framework */,
 				D36CCD3715227D06003CCAFC /* Foundation.framework */,
 				D36CCD3915227D06003CCAFC /* CoreGraphics.framework */,
diff --git a/Video Tuneup/SimpleEditor.m b/Video Tuneup/SimpleEditor.m
index dbbe2d3..c37bcba 100644
--- a/Video Tuneup/SimpleEditor.m
+++ b/Video Tuneup/SimpleEditor.m
@@ -151,11 +151,11 @@
 	self.audioMix = audioMix;
 
 	if (forPlayback) {
-#if TARGET_OS_EMBEDDED
-		// Render high-def movies at half scale for real-time playback (device-only).
-		if (videoSize.width > 640)
-			composition.renderScale = 0.5;
-#endif // TARGET_OS_EMBEDDED
+//#if TARGET_OS_EMBEDDED
+//		// Render high-def movies at half scale for real-time playback (device-only).
+//		if (videoSize.width > 640)
+//			composition.renderScale = 0.5;
+//#endif // TARGET_OS_EMBEDDED
 		
 		AVPlayerItem *playerItem = [AVPlayerItem playerItemWithAsset:self.composition];
 		playerItem.audioMix = audioMix;
diff --git a/Video Tuneup/ViewController.h b/Video Tuneup/ViewController.h
index b045b91..8409c4f 100644
--- a/Video Tuneup/ViewController.h
+++ b/Video Tuneup/ViewController.h
@@ -10,6 +10,7 @@
 #import <AVFoundation/AVFoundation.h>
 #import <AssetsLibrary/AssetsLibrary.h>
 #import "SimpleEditor.h"
+#import <MediaPlayer/MediaPlayer.h>
 
 @class PlayerView;
 
diff --git a/Video Tuneup/ViewController.m b/Video Tuneup/ViewController.m
index 3259c4c..48d8812 100644
--- a/Video Tuneup/ViewController.m
+++ b/Video Tuneup/ViewController.m
@@ -11,6 +11,7 @@
 #import "SimpleEditor.h"
 #import "AssetsViewController.h"
 
+
 // Define this constant for the key-value observation context.
 static const NSString *ItemStatusContext;
 
@@ -112,6 +113,34 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover;
     [self refreshEditor];
 }
 
+- (IBAction)showMediaPicker:(id)sender
+{
+    MPMediaPickerController *mediaPicker = [[MPMediaPickerController alloc] initWithMediaTypes: MPMediaTypeAny];
+
+    mediaPicker.delegate = self;
+    mediaPicker.allowsPickingMultipleItems = NO;
+    mediaPicker.prompt = @"Select songs to play";
+
+    [self presentModalViewController:mediaPicker animated:YES];
+//    [mediaPicker release];
+}
+
+- (void)mediaPicker:(MPMediaPickerController *)mediaPicker didPickMediaItems:(MPMediaItemCollection *)mediaItemCollection {
+    if (mediaItemCollection) {
+
+        NSLog(@"Got media item");
+//        [musicPlayer setQueueWithItemCollection: mediaItemCollection];
+//        [musicPlayer play];
+    } else {NSLog(@"Didn't get media item!");}
+
+    [self dismissModalViewControllerAnimated:YES];
+}
+
+- (void) mediaPickerDidCancel: (MPMediaPickerController *) mediaPicker
+{
+    [self dismissModalViewControllerAnimated: YES];
+}
+
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
                         change:(NSDictionary *)change context:(void *)context {
 
diff --git a/Video Tuneup/en.lproj/ViewController_iPad.xib b/Video Tuneup/en.lproj/ViewController_iPad.xib
index 17a4421..94aaab0 100644
--- a/Video Tuneup/en.lproj/ViewController_iPad.xib
+++ b/Video Tuneup/en.lproj/ViewController_iPad.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
+		<string key="IBDocument.SystemVersion">11D50d</string>
 		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<string key="IBDocument.AppKitVersion">1138.32</string>
+		<string key="IBDocument.HIToolboxVersion">568.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			<string key="NS.object.0">933</string>
@@ -181,7 +181,7 @@
 						<string key="NSFrame">{{244, 886}, {255, 73}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSNextKeyView" ref="27096655"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -261,6 +261,28 @@
 							<int key="NSfFlags">16</int>
 						</object>
 					</object>
+					<object class="IBUIButton" id="27096655">
+						<reference key="NSNextResponder" ref="766721923"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{580, 906}, {75, 37}}</string>
+						<reference key="NSSuperview" ref="766721923"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<bool key="IBUIOpaque">NO</bool>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<int key="IBUIButtonType">1</int>
+						<string key="IBUINormalTitle">Music</string>
+						<reference key="IBUIHighlightedTitleColor" ref="804940373"/>
+						<object class="NSColor" key="IBUINormalTitleColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+						</object>
+						<reference key="IBUINormalTitleShadowColor" ref="752673392"/>
+						<reference key="IBUIFontDescription" ref="1067550929"/>
+						<reference key="IBUIFont" ref="361109798"/>
+					</object>
 				</array>
 				<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
 				<reference key="NSSuperview"/>
@@ -436,6 +458,15 @@
 					</object>
 					<int key="connectionID">61</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">showMediaPicker:</string>
+						<reference key="source" ref="27096655"/>
+						<reference key="destination" ref="841351856"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">64</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -466,6 +497,7 @@
 							<reference ref="1049445720"/>
 							<reference ref="761978491"/>
 							<reference ref="938661883"/>
+							<reference ref="27096655"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -558,6 +590,11 @@
 						<reference key="object" ref="938661883"/>
 						<reference key="parent" ref="766721923"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">62</int>
+						<reference key="object" ref="27096655"/>
+						<reference key="parent" ref="766721923"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -580,6 +617,7 @@
 				<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.CustomClassName">PlayerView</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
@@ -587,7 +625,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">61</int>
+			<int key="maxID">64</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">