Merge lp:~urbanape/ubuntuone-ios-music/fix-album-scroll-lag into lp:ubuntuone-ios-music

[Zachery Bir]

This branch attempts to fix the scroll lag seen on the Albums view by fetching, resizing, and loading the images in the background.

I think there is still some work to be done, since I can still make the view lag a bit on first load (via the network).

[Paul Hummer (rockstar)]

review: Approve

[lp:~urbanape/ubuntuone-ios-music/fix-album-scroll-lag]

220. By Zachery Bir on 2012-06-22

Merged fix-album-scroll-lag branch

=== modified file 'U1Music-Info.plist'
--- U1Music-Info.plist	2012-06-15 22:22:10 +0000
+++ U1Music-Info.plist	2012-06-22 18:48:18 +0000
@@ -24,7 +24,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3</string>
+	<string>2.4</string>
 	<key>CFBundleSignature</key>
 	<string>UOMS</string>
 	<key>CFBundleURLTypes</key>
@@ -39,7 +39,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>54</string>
+	<string>55</string>
 	<key>LSRequiresIPhoneOS</key>
 	<false/>
 	<key>NSMainNibFile</key>

=== modified file 'about/about.html'
--- about/about.html	2012-06-15 22:22:10 +0000
+++ about/about.html	2012-06-22 18:48:18 +0000
@@ -15,7 +15,7 @@
 	  <h1>Ubuntu One Music</h1>
 
 	  <p class="center">
-        Version 2.3 (build 54)
+        Version 2.4 (build 55)
       </p>
 	  <p class="center">
         &copy;2010-2011 Canonical Limited. All rights reserved.

=== modified file 'utilities/Globals.h'
--- utilities/Globals.h	2012-02-29 16:07:56 +0000
+++ utilities/Globals.h	2012-06-22 18:48:18 +0000
@@ -31,6 +31,7 @@
 
 NSURL* CachedAlbumArtDirectory( void );
 NSString* CachedAlbumArtPathForArtId(NSString *anArtId);
+NSString* CachedAlbumArtPathForArtIdAtSize(NSString *anArtId, int size);
 
 extern NSString * const NOTIF_downloadComplete;
 extern NSString * const NOTIF_removeCachedContent;

=== modified file 'utilities/Globals.m'
--- utilities/Globals.m	2012-02-29 16:55:48 +0000
+++ utilities/Globals.m	2012-06-22 18:48:18 +0000
@@ -79,6 +79,12 @@
     return [[CachedAlbumArtDirectory() path] stringByAppendingPathComponent:anArtId];
 }
 
+NSString* CachedAlbumArtPathForArtIdAtSize(NSString *anArtId, int size)
+{
+	NSURL *sizeDirectory = CachedAlbumArtDirectory();
+	return [[sizeDirectory path] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_%d", anArtId, size]];
+}
+
 NSString * const NOTIF_downloadComplete = @"DownloadComplete";
 NSString * const NOTIF_removeCachedContent = @"RemoveCachedContent";
 NSString * const NOTIF_reloadAccountCredentials = @"ReloadAccountCredentials";

=== modified file 'utilities/operations/AlbumArtLoader.h'
--- utilities/operations/AlbumArtLoader.h	2011-06-21 15:29:37 +0000
+++ utilities/operations/AlbumArtLoader.h	2012-06-22 18:48:18 +0000
@@ -39,7 +39,6 @@
 @property(nonatomic) int imageSize;
 @property(nonatomic,assign) id<AlbumArtLoaderDelegate> delegate;
 @property(nonatomic,retain) UIImage *defaultAlbumArt;
-- (UIImage*)imageForArtID:(NSString*)artID error:(NSError**)error;
-- (void)download:(NSString*)artID;
+- (void)computeAlbumArtForId:(NSString *)albumArtId completionBlock:(void (^)(UIImage *))completionBlock;
 + (NSString*)cacheSize;
 @end

=== modified file 'utilities/operations/AlbumArtLoader.m'
--- utilities/operations/AlbumArtLoader.m	2011-11-05 00:42:21 +0000
+++ utilities/operations/AlbumArtLoader.m	2012-06-22 18:48:18 +0000
@@ -24,9 +24,14 @@
 
 @interface AlbumArtLoader ()
 - (void)createAlbumArtDirectory;
-- (NSString*)URLFromCoverArtID:(NSString*)artID;
+- (NSString*)URLFromCoverArtId:(NSString*)artId;
+- (UIImage *)resizeAndSaveImage:(UIImage *)image toPath:(NSString *)path;
+- (void)cacheImage:(UIImage *)image atPath:(NSString *)path;
+- (UIImage *)defaultAlbumArtSized:(NSUInteger)size;
+- (void)download:(NSString *)artId;
 @end
 
+const int MAX_ART_SIZE = 640;
 
 @implementation AlbumArtLoader
 @synthesize delegate;
@@ -40,7 +45,7 @@
         [self createAlbumArtDirectory];
         
 		self.imageSize = 640; // Default to maximum size we need
-        self.defaultAlbumArt = [UIImage imageNamed:@"default-album-art"];
+		self.defaultAlbumArt = [UIImage imageNamed:@"default-album-art"];
 		
 		downloadCache = [[NSMutableDictionary alloc] init];
 		downloadedURLs = [[NSMutableSet alloc] init];
@@ -55,7 +60,7 @@
 	[downloadCache release];
 	[downloadedURLs release];
 	[queue release];
-    [defaultAlbumArt release];
+	[defaultAlbumArt release];
 	
 	[super dealloc];
 }
@@ -63,27 +68,58 @@
 #pragma mark -
 #pragma mark Public Methods
 
-- (UIImage*)imageForArtID:(NSString*)artID error:(NSError**)error
+- (void)computeAlbumArtForId:(NSString *)artId completionBlock:(void (^)(UIImage *))completionBlock;
 {
-    NSString *path = CachedAlbumArtPathForArtId(artID);
+	// Try to fetch the appropriate cached version of the album art
+
+	NSString *path = nil;
+	if (self.imageSize != MAX_ART_SIZE)
+	{
+		path = CachedAlbumArtPathForArtIdAtSize(artId, self.imageSize);
+	}
+	else
+	{
+		// Max size path is unadorned
+		path = CachedAlbumArtPathForArtId(artId);
+	}
 	UIImage *image = [UIImage imageWithContentsOfFile:path];
 
-    if (nil == image) {
-        // Cache fault: return the default image, and set the error so the caller can dispatch for an attempt at download
-        image = self.defaultAlbumArt;
-        *error = [NSError errorWithDomain:@"U1Music" code:1 userInfo:nil];
-    }
-	return [image resizedImage:CGSizeMake(self.imageSize, self.imageSize) interpolationQuality:kCGInterpolationHigh];
-}
-
-- (void)download:(NSString*)artID
+	if (image != nil)
+	{
+		return completionBlock(image);
+	}
+	
+	// Failing that, resize the highest resolution one we have
+	
+	__block NSString *_resizedPath = path;
+	
+	NSString *fullSizePath = CachedAlbumArtPathForArtId(artId);
+	UIImage *fullSizeImage = [UIImage imageWithContentsOfFile:fullSizePath];
+	if (fullSizeImage != nil)
+	{
+		UIImage *resizedImage = [self resizeAndSaveImage:fullSizeImage toPath:_resizedPath];
+		completionBlock(resizedImage);
+		return;
+	}
+
+	// Failing that, return defaultAlbumArt and download and resize what we need
+	[self download:artId];
+	completionBlock([self defaultAlbumArtSized:self.imageSize]);
+}
+
+- (UIImage *)defaultAlbumArtSized:(NSUInteger)size;
+{
+	return [self.defaultAlbumArt resizedImage:CGSizeMake(self.imageSize, self.imageSize) interpolationQuality:kCGInterpolationHigh];
+}
+
+- (void)download:(NSString*)artId;
 {	
-	if (nil == artID)
+	if (nil == artId)
 	{
 		return;
 	}
 	
-	NSURL *url = [NSURL URLWithString:[self URLFromCoverArtID:artID]];
+	NSURL *url = [NSURL URLWithString:[self URLFromCoverArtId:artId]];
 	
 	@synchronized(self)
 	{
@@ -91,7 +127,7 @@
 		{
 			[downloadedURLs addObject:url];
 			
-			AlbumArtLoadingOperation *operation = [[AlbumArtLoadingOperation alloc] initWithArtId: artID URL:url];
+			AlbumArtLoadingOperation *operation = [[AlbumArtLoadingOperation alloc] initWithArtId:artId URL:url];
 			operation.delegate = self;
 			[queue addOperation:operation];
 			[operation release];
@@ -126,13 +162,13 @@
 #pragma mark -
 #pragma mark Private Methods
 
-- (NSString*)URLFromCoverArtID:(NSString*)artID
+- (NSString*)URLFromCoverArtId:(NSString*)artId
 {
 	NSMutableArray *parameters = [NSMutableArray array];
-	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", artID, nil]];
+	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", artId, nil]];
 
 	// Always get the largest we can handle
-	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"size", [NSString stringWithFormat:@"%d", 640], nil]];
+	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"size", [NSString stringWithFormat:@"%d", MAX_ART_SIZE], nil]];
 	
 	NSURL *url = [[Subsonic sharedSubsonic] getMetadataURL:@"getCoverArt.view" parameters:parameters];
 	return [url absoluteString];
@@ -149,13 +185,31 @@
 	}
 }
 
+- (void)cacheImage:(UIImage *)image atPath:(NSString *)path;
+{
+    NSData *imageData = UIImagePNGRepresentation(image);
+    [imageData writeToFile:path atomically:YES];
+}
+
+- (UIImage *)resizeAndSaveImage:(UIImage *)image toPath:(NSString *)path;
+{
+	UIImage *resizedImage = [image resizedImage:CGSizeMake(self.imageSize, self.imageSize) interpolationQuality:kCGInterpolationHigh];
+	[self cacheImage:resizedImage atPath:path];
+	return resizedImage;
+}
+
 #pragma mark -
 #pragma mark AlbumArtLoadingOperationDelegate
 
 - (void)imageLoaded:(UIImage*)image forArtId:(NSString *)artId
 {
-    NSData *imageData = UIImagePNGRepresentation(image);
-    [imageData writeToFile:CachedAlbumArtPathForArtId(artId) atomically:YES];
+	NSString *path = CachedAlbumArtPathForArtId(artId);
+	[self cacheImage:image atPath:path];
+	
+	if (self.imageSize != MAX_ART_SIZE)
+	{
+		[self resizeAndSaveImage:image toPath:CachedAlbumArtPathForArtIdAtSize(artId, self.imageSize)];
+	}
 	
 	if (self.delegate)
 	{

=== modified file 'view_controllers/AlbumListViewController.m'
--- view_controllers/AlbumListViewController.m	2012-02-17 16:40:18 +0000
+++ view_controllers/AlbumListViewController.m	2012-06-22 18:48:18 +0000
@@ -173,17 +173,18 @@
 
     cell.albumNameLabel.text = album.title;
     cell.artistNameLabel.text = album.artist;
-	
-    NSError *error = nil;
-    cell.coverArtView.image = [loader imageForArtID:album.coverArtId error:&error];
+
+	__block AlbumArtistUITableViewCell *_cell = cell;
+	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+				   ^{
+					   [loader computeAlbumArtForId:album.coverArtId completionBlock:^(UIImage *image) {
+						   dispatch_async(dispatch_get_main_queue(),
+										  ^{
+											  _cell.coverArtView.image = image;
+										  });
+					   }];
+				   });
     
-    if ([error code]) {
-        // Let's see if we need to wait for non-dragging/decelerating
-//        if (self.tableView.dragging == NO && self.tableView.decelerating == NO)
-//        {
-            [loader download:album.coverArtId];
-//        }
-    }
 	if (canStream || [album hasCachedSongs])
 	{
 		cell.albumNameLabel.textColor = [UIColor blackColor];
@@ -242,29 +243,4 @@
 	[self.tableView reloadData];
 }
 
-- (void)loadImagesForOnscreenRows
-{
-	for (NSIndexPath *indexPath in [self.tableView indexPathsForVisibleRows])
-	{
-		Album *album = [self.tableData objectAtIndex:indexPath.row];
-        // This will prompt the album art to download, but doesn't try to load the image when it's done?
-		[loader download:album.coverArtId];
-	}
-}
-
-- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
-{	
-	[super scrollViewDidEndDragging:scrollView willDecelerate:decelerate];
-	
-    if (!decelerate)
-	{
-        [self loadImagesForOnscreenRows];
-    }
-}
-
-- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
-{	
-    [self loadImagesForOnscreenRows];
-}
-
 @end

=== modified file 'view_controllers/AlbumViewController.m'
--- view_controllers/AlbumViewController.m	2012-02-21 16:53:27 +0000
+++ view_controllers/AlbumViewController.m	2012-06-22 18:48:18 +0000
@@ -362,17 +362,18 @@
 	headerView.backgroundColor = grayColor;
 	
 	coverArt = [[UIImageView alloc] initWithFrame:CGRectMake(10, 10, 100, 100)];
-    NSError *error = nil;
-    coverArt.image = [loader imageForArtID:self.album.coverArtId error:&error];
+	__block UIImageView *_coverArtView = coverArt;
+	__block NSString *_coverArtId = self.album.coverArtId;
+	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+				   ^{
+					   [loader computeAlbumArtForId:_coverArtId completionBlock:^(UIImage *image) {
+						   dispatch_async(dispatch_get_main_queue(),
+										  ^{
+											  _coverArtView.image = image;
+										  });
+					   }];
+				   });
     
-    if ([error code]) {
-        // Let's see if we need to wait for non-dragging/decelerating
-//        if (self.tableView.dragging == NO && self.tableView.decelerating == NO)
-//        {
-            [loader download:self.album.coverArtId];
-//        }
-    }
-
 	[headerView addSubview:coverArt];
 	
 	artistLabel = [[UILabel alloc] initWithFrame:CGRectMake(120, 10, 200, 20)];

=== modified file 'view_controllers/ArtistViewController.m'
--- view_controllers/ArtistViewController.m	2012-02-17 16:28:36 +0000
+++ view_controllers/ArtistViewController.m	2012-06-22 18:48:18 +0000
@@ -224,16 +224,17 @@
 		cell.album = album;
 		cell.albumNameLabel.text = album.title;
 
-        NSError *error = nil;
-        cell.coverArtView.image = [loader imageForArtID:album.coverArtId error:&error];
-        
-        if ([error code]) {
-            // Let's see if we need to wait for non-dragging/decelerating
-    //        if (self.tableView.dragging == NO && self.tableView.decelerating == NO)
-    //        {
-                [loader download:album.coverArtId];
-    //        }
-        }
+		__block AlbumUITableViewCell *_cell = cell;
+		dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+					   ^{
+						   [loader computeAlbumArtForId:album.coverArtId completionBlock:^(UIImage *image) {
+							   dispatch_async(dispatch_get_main_queue(),
+											  ^{
+												  _cell.coverArtView.image = image;
+											  });
+						   }];
+					   });
+		
 		if (canStream || [album hasCachedSongs])
 		{
 			cell.albumNameLabel.textColor = [UIColor blackColor];
@@ -315,29 +316,4 @@
 	[self.tableView reloadData];
 }
 
-- (void)loadImagesForOnscreenRows
-{
-	for (NSIndexPath *indexPath in [self.tableView indexPathsForVisibleRows])
-	{
-		Album *album = [self.tableData objectAtIndex:indexPath.row];
-        // This will prompt the album art to download, but doesn't try to load the image when it's done?
-		[loader download:album.coverArtId];
-	}
-}
-
-- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
-{	
-	[super scrollViewDidEndDragging:scrollView willDecelerate:decelerate];
-	
-    if (!decelerate)
-	{
-        [self loadImagesForOnscreenRows];
-    }
-}
-
-- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
-{	
-    [self loadImagesForOnscreenRows];
-}
-
 @end

=== modified file 'view_controllers/SongViewController.m'
--- view_controllers/SongViewController.m	2012-02-08 23:57:06 +0000
+++ view_controllers/SongViewController.m	2012-06-22 18:48:18 +0000
@@ -390,11 +390,17 @@
     if (albumCoverArtId)
     {
         NSError *error = nil;
-        coverArtImageView.image = [loader imageForArtID:albumCoverArtId error:&error];
-        
-        if ([error code]) {
-            [loader download:albumCoverArtId];
-        }
+		__block UIImageView *_coverArtImageView = coverArtImageView;
+		__block NSString *_albumCoverArtId = albumCoverArtId;
+		dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
+					   ^{
+						   [loader computeAlbumArtForId:albumCoverArtId completionBlock:^(UIImage *image) {
+							   dispatch_async(dispatch_get_main_queue(),
+											  ^{
+												  _coverArtImageView.image = image;
+											  });
+						   }];
+					   });
     }
 	else
 	{

=== modified file 'xibs/SongViewController.xib'
--- xibs/SongViewController.xib	2011-07-15 19:39:43 +0000
+++ xibs/SongViewController.xib	2012-06-22 18:48:18 +0000
@@ -1,29 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1056</int>
-		<string key="IBDocument.SystemVersion">10K540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<int key="IBDocument.SystemTarget">1536</int>
+		<string key="IBDocument.SystemVersion">11E2620</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2541</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">301</string>
+			<string key="NS.object.0">1875</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBUIView</string>
+			<string>IBProxyObject</string>
 			<string>IBUIBarButtonItem</string>
+			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
-			<string>IBUIToolbar</string>
-			<string>IBProxyObject</string>
 			<string>IBUILabel</string>
 			<string>IBUISlider</string>
-			<string>IBUIButton</string>
+			<string>IBUIToolbar</string>
+			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<object class="IBProxyObject" id="372490531">
 				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
@@ -42,6 +45,7 @@
 						<int key="NSvFlags">264</int>
 						<string key="NSFrame">{{20, 405}, {280, 40}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
+						<reference key="NSNextKeyView"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MSAwAA</bytes>
@@ -76,11 +80,6 @@
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
-						<object class="NSFont" key="IBUIFont">
-							<string key="NSName">Helvetica-BoldOblique</string>
-							<double key="NSSize">15</double>
-							<int key="NSfFlags">16</int>
-						</object>
 						<object class="NSColor" key="IBUIHighlightedTitleColor" id="193107363">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
@@ -93,6 +92,17 @@
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC41AA</bytes>
 						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<string key="name">Helvetica-BoldOblique</string>
+							<string key="family">Helvetica</string>
+							<int key="traits">3</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont">
+							<string key="NSName">Helvetica-BoldOblique</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
 					</object>
 					<object class="IBUIToolbar" id="650707578">
 						<reference key="NSNextResponder" ref="774585933"/>
@@ -165,7 +175,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="962247428">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUILabel" id="58064152">
@@ -179,16 +189,6 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<string key="IBUIText">Interpol</string>
-						<object class="NSFont" key="IBUIFont" id="956421100">
-							<string key="NSName">Helvetica-Bold</string>
-							<double key="NSSize">11</double>
-							<int key="NSfFlags">16</int>
-						</object>
-						<object class="NSColor" key="IBUITextColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC42MjM1Mjk0MTE4IDAuNjIzNTI5NDExOCAwLjYyMzUyOTQxMTgAA</bytes>
-						</object>
 						<object class="NSColor" key="IBUIHighlightedColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
@@ -198,9 +198,26 @@
 							<bytes key="NSRGB">MCAwIDAAA</bytes>
 						</object>
 						<int key="IBUIBaselineAdjustment">1</int>
-						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 						<float key="IBUIMinimumFontSize">10</float>
+						<string key="IBUIText">Interpol</string>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC42MjM1Mjk0MTE4IDAuNjIzNTI5NDExOCAwLjYyMzUyOTQxMTgAA</bytes>
+						</object>
 						<int key="IBUITextAlignment">1</int>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="295205315">
+							<string key="name">Helvetica-Bold</string>
+							<string key="family">Helvetica</string>
+							<int key="traits">2</int>
+							<double key="pointSize">11</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="956421100">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">11</double>
+							<int key="NSfFlags">16</int>
+						</object>
+						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
+						<int key="IBUIAutoshrinkMode">0</int>
 					</object>
 					<object class="IBUILabel" id="188765676">
 						<reference key="NSNextResponder" ref="962247428"/>
@@ -213,15 +230,17 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">Interpol</string>
-						<reference key="IBUIFont" ref="956421100"/>
 						<reference key="IBUITextColor" ref="193107363"/>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
+						<int key="IBUITextAlignment">1</int>
+						<reference key="IBUIFontDescription" ref="295205315"/>
+						<reference key="IBUIFont" ref="956421100"/>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-						<float key="IBUIMinimumFontSize">10</float>
-						<int key="IBUITextAlignment">1</int>
+						<int key="IBUIAutoshrinkMode">0</int>
 					</object>
 					<object class="IBUILabel" id="405973632">
 						<reference key="NSNextResponder" ref="962247428"/>
@@ -233,40 +252,35 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">Interpol</string>
-						<reference key="IBUIFont" ref="956421100"/>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC42MjM1Mjk0MTE4IDAuNjIzNTI5NDExOCAwLjYyMzUyOTQxMTgAA</bytes>
 						</object>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
+						<int key="IBUITextAlignment">1</int>
+						<reference key="IBUIFontDescription" ref="295205315"/>
+						<reference key="IBUIFont" ref="956421100"/>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-						<float key="IBUIMinimumFontSize">10</float>
-						<int key="IBUITextAlignment">1</int>
+						<int key="IBUIAutoshrinkMode">0</int>
 					</object>
 				</array>
 				<string key="NSFrameSize">{200, 45}</string>
-				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="58064152"/>
 				<reference key="IBUIBackgroundColor" ref="811861181"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIButton" id="959908150">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<string key="NSFrameSize">{44, 29}</string>
-				<reference key="NSSuperview"/>
 				<bool key="IBUIOpaque">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<int key="IBUIContentHorizontalAlignment">0</int>
 				<int key="IBUIContentVerticalAlignment">0</int>
-				<object class="NSFont" key="IBUIFont" id="889214810">
-					<string key="NSName">Helvetica-Bold</string>
-					<double key="NSSize">15</double>
-					<int key="NSfFlags">16</int>
-				</object>
 				<reference key="IBUIHighlightedTitleColor" ref="193107363"/>
 				<object class="NSColor" key="IBUINormalTitleColor">
 					<int key="NSColorSpace">1</int>
@@ -277,9 +291,20 @@
 					<string key="NSClassName">NSImage</string>
 					<string key="NSResourceName">player_back.png</string>
 				</object>
+				<object class="IBUIFontDescription" key="IBUIFontDescription" id="411929483">
+					<string key="name">Helvetica-Bold</string>
+					<string key="family">Helvetica</string>
+					<int key="traits">2</int>
+					<double key="pointSize">15</double>
+				</object>
+				<object class="NSFont" key="IBUIFont" id="889214810">
+					<string key="NSName">Helvetica-Bold</string>
+					<double key="NSSize">15</double>
+					<int key="NSfFlags">16</int>
+				</object>
 			</object>
 			<object class="IBUIView" id="938289822">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIImageView" id="169132852">
@@ -287,7 +312,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{320, 100}</string>
 						<reference key="NSSuperview" ref="938289822"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="650617321"/>
 						<reference key="IBUIBackgroundColor" ref="811861181"/>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -302,7 +326,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{58, 28}, {204, 23}}</string>
 						<reference key="NSSuperview" ref="938289822"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="451378775"/>
 						<reference key="IBUIBackgroundColor" ref="811861181"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -322,13 +345,11 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{14, 47}, {44, 44}}</string>
 						<reference key="NSSuperview" ref="938289822"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="214119939"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIFont" ref="889214810"/>
 						<reference key="IBUIHighlightedTitleColor" ref="193107363"/>
 						<object class="NSColor" key="IBUINormalTitleColor">
 							<int key="NSColorSpace">1</int>
@@ -339,19 +360,18 @@
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">03-loopback.png</string>
 						</object>
+						<reference key="IBUIFontDescription" ref="411929483"/>
+						<reference key="IBUIFont" ref="889214810"/>
 					</object>
 					<object class="IBUIButton" id="214119939">
 						<reference key="NSNextResponder" ref="938289822"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{264, 48}, {44, 44}}</string>
 						<reference key="NSSuperview" ref="938289822"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIFont" ref="889214810"/>
 						<reference key="IBUIHighlightedTitleColor" ref="193107363"/>
 						<object class="NSColor" key="IBUINormalTitleColor">
 							<int key="NSColorSpace">1</int>
@@ -362,25 +382,25 @@
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">05-shuffle.png</string>
 						</object>
+						<reference key="IBUIFontDescription" ref="411929483"/>
+						<reference key="IBUIFont" ref="889214810"/>
 					</object>
 					<object class="IBUILabel" id="574685039">
 						<reference key="NSNextResponder" ref="938289822"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{12, 31}, {42, 15}}</string>
 						<reference key="NSSuperview" ref="938289822"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="141728958"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">0:00</string>
-						<object class="NSFont" key="IBUIFont" id="733486606">
-							<string key="NSName">Helvetica-Bold</string>
-							<double key="NSSize">14</double>
-							<int key="NSfFlags">16</int>
-						</object>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -388,65 +408,73 @@
 								<int key="NSID">1</int>
 							</object>
 						</object>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUITextAlignment">2</int>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="911767061">
+							<string key="name">Helvetica-Bold</string>
+							<string key="family">Helvetica</string>
+							<int key="traits">2</int>
+							<double key="pointSize">14</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="733486606">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">14</double>
+							<int key="NSfFlags">16</int>
+						</object>
+						<int key="IBUIAutoshrinkMode">2</int>
 					</object>
 					<object class="IBUILabel" id="451378775">
 						<reference key="NSNextResponder" ref="938289822"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{266, 31}, {42, 15}}</string>
 						<reference key="NSSuperview" ref="938289822"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="967289608"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">-18:88</string>
-						<reference key="IBUIFont" ref="733486606"/>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MSAxIDEAA</bytes>
 							<reference key="NSCustomColorSpace" ref="400680623"/>
 						</object>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">10</float>
+						<reference key="IBUIFontDescription" ref="911767061"/>
+						<reference key="IBUIFont" ref="733486606"/>
+						<int key="IBUIAutoshrinkMode">2</int>
 					</object>
 					<object class="IBUILabel" id="650617321">
 						<reference key="NSNextResponder" ref="938289822"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{12, 5}, {296, 19}}</string>
 						<reference key="NSSuperview" ref="938289822"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="574685039"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">10 of 11</string>
-						<reference key="IBUIFont" ref="733486606"/>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MSAxIDEAA</bytes>
 							<reference key="NSCustomColorSpace" ref="400680623"/>
 						</object>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUITextAlignment">1</int>
+						<reference key="IBUIFontDescription" ref="911767061"/>
+						<reference key="IBUIFont" ref="733486606"/>
+						<int key="IBUIAutoshrinkMode">2</int>
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 100}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="169132852"/>
 				<reference key="IBUIBackgroundColor" ref="811861181"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -487,47 +515,6 @@
 					<int key="connectionID">58</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">songInfoToggle:</string>
-						<reference key="source" ref="104438855"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">59</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">prevButtonPressed:</string>
-						<reference key="source" ref="213984937"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">75</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">playButtonPressed:</string>
-						<reference key="source" ref="126126605"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">76</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">nextButtonPressed:</string>
-						<reference key="source" ref="148357452"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">77</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">playButtonPressed:</string>
-						<reference key="source" ref="947562927"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">84</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">musicToolbar</string>
 						<reference key="source" ref="372490531"/>
@@ -576,15 +563,6 @@
 					<int key="connectionID">97</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">popFromStack:</string>
-						<reference key="source" ref="959908150"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">98</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">songInfoBox</string>
 						<reference key="source" ref="372490531"/>
@@ -625,6 +603,72 @@
 					<int key="connectionID">111</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">repeatButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="967289608"/>
+					</object>
+					<int key="connectionID">117</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">shuffleButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="214119939"/>
+					</object>
+					<int key="connectionID">118</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">songInfoToggle:</string>
+						<reference key="source" ref="104438855"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">59</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">prevButtonPressed:</string>
+						<reference key="source" ref="213984937"/>
+						<reference key="destination" ref="372490531"/>
+					</object>
+					<int key="connectionID">75</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">playButtonPressed:</string>
+						<reference key="source" ref="126126605"/>
+						<reference key="destination" ref="372490531"/>
+					</object>
+					<int key="connectionID">76</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">nextButtonPressed:</string>
+						<reference key="source" ref="148357452"/>
+						<reference key="destination" ref="372490531"/>
+					</object>
+					<int key="connectionID">77</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">playButtonPressed:</string>
+						<reference key="source" ref="947562927"/>
+						<reference key="destination" ref="372490531"/>
+					</object>
+					<int key="connectionID">84</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">popFromStack:</string>
+						<reference key="source" ref="959908150"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">98</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">touchedSlider</string>
 						<reference key="source" ref="141728958"/>
@@ -669,22 +713,6 @@
 					</object>
 					<int key="connectionID">116</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">repeatButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="967289608"/>
-					</object>
-					<int key="connectionID">117</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">shuffleButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="214119939"/>
-					</object>
-					<int key="connectionID">118</int>
-				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -873,39 +901,19 @@
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<string key="-1.CustomClassName">iPhoneStreamingPlayerViewController</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="101.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="101.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABC0AAAwooAAA</bytes>
-				</object>
 				<string key="103.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="103.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwo4AAA</bytes>
-				</object>
 				<string key="104.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="104.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABDHwAAwqwAAA</bytes>
-				</object>
 				<string key="105.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="105.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">AUFAAABBYAAAA</bytes>
-				</object>
 				<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="106.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">AUOFAABB+AAAA</bytes>
-				</object>
 				<string key="107.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="107.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABDh4AAwkQAAA</bytes>
-				</object>
 				<string key="108.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="57.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAw58AAA</bytes>
-				</object>
-				<string key="6.IBEditorWindowLastContentRect">{{820, 220}, {320, 480}}</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="67.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -916,18 +924,11 @@
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="86.IBEditorWindowLastContentRect">{{707, 975}, {200, 45}}</string>
 				<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="87.IBViewBoundsToFrameTransform"/>
 				<string key="88.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="88.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">AQAAAABBYAAAA</bytes>
-				</object>
 				<string key="89.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="94.IBEditorWindowLastContentRect">{{608, 1079}, {44, 29}}</string>
 				<string key="94.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="99.IBEditorWindowLastContentRect">{{27, 1409}, {320, 100}}</string>
 				<string key="99.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<object class="NSMutableAttributedString" key="99.notes">
 					<object class="NSMutableString" key="NSString">
@@ -955,10 +956,6 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<integer value="1056" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
@@ -967,6 +964,6 @@
 			<string key="player_back.png">{44, 29}</string>
 			<string key="player_overlay_bg.png">{320, 100}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">301</string>
+		<string key="IBCocoaTouchPluginVersion">1875</string>
 	</data>
 </archive>