Merge lp:~rockstar/ubuntuone-ios-music/scorched-earth into lp:~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty

[Paul Hummer]

This branch does exactly what it says it does. It scorches the earth.

I've added a Music folder, and in this folder is all the code for the
re-written music application. Only code owned and copyrighted by Canonical
will go in here.

If you were to run this app, you'd just get a white screen. Nothing else
loads.

[dobey (dobey)]

review: Approve

=== added directory 'Music'
=== added file 'Music/AppDelegate.h'
--- Music/AppDelegate.h	1970-01-01 00:00:00 +0000
+++ Music/AppDelegate.h	2012-11-20 05:41:20 +0000
@@ -0,0 +1,22 @@
+//
+//  AppDelegate.h
+//  Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical, Ltd. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext;
+@property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;
+@property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
+
+- (void)saveContext;
+- (NSURL *)applicationDocumentsDirectory;
+
+@end

=== added file 'Music/AppDelegate.m'
--- Music/AppDelegate.m	1970-01-01 00:00:00 +0000
+++ Music/AppDelegate.m	2012-11-20 05:41:20 +0000
@@ -0,0 +1,149 @@
+//
+//  AppDelegate.m
+//  Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical, Ltd. All rights reserved.
+//
+
+#import "AppDelegate.h"
+
+@implementation AppDelegate
+
+@synthesize managedObjectContext = _managedObjectContext;
+@synthesize managedObjectModel = _managedObjectModel;
+@synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    // Override point for customization after application launch.
+    self.window.backgroundColor = [UIColor whiteColor];
+    [self.window makeKeyAndVisible];
+    return YES;
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
+    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
+    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application
+{
+    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+    // Saves changes in the application's managed object context before the application terminates.
+    [self saveContext];
+}
+
+- (void)saveContext
+{
+    NSError *error = nil;
+    NSManagedObjectContext *managedObjectContext = self.managedObjectContext;
+    if (managedObjectContext != nil) {
+        if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
+             // Replace this implementation with code to handle the error appropriately.
+             // abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. 
+            NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+            abort();
+        } 
+    }
+}
+
+#pragma mark - Core Data stack
+
+// Returns the managed object context for the application.
+// If the context doesn't already exist, it is created and bound to the persistent store coordinator for the application.
+- (NSManagedObjectContext *)managedObjectContext
+{
+    if (_managedObjectContext != nil) {
+        return _managedObjectContext;
+    }
+    
+    NSPersistentStoreCoordinator *coordinator = [self persistentStoreCoordinator];
+    if (coordinator != nil) {
+        _managedObjectContext = [[NSManagedObjectContext alloc] init];
+        [_managedObjectContext setPersistentStoreCoordinator:coordinator];
+    }
+    return _managedObjectContext;
+}
+
+// Returns the managed object model for the application.
+// If the model doesn't already exist, it is created from the application's model.
+- (NSManagedObjectModel *)managedObjectModel
+{
+    if (_managedObjectModel != nil) {
+        return _managedObjectModel;
+    }
+    NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"Music" withExtension:@"momd"];
+    _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
+    return _managedObjectModel;
+}
+
+// Returns the persistent store coordinator for the application.
+// If the coordinator doesn't already exist, it is created and the application's store added to it.
+- (NSPersistentStoreCoordinator *)persistentStoreCoordinator
+{
+    if (_persistentStoreCoordinator != nil) {
+        return _persistentStoreCoordinator;
+    }
+    
+    NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"Music.sqlite"];
+    
+    NSError *error = nil;
+    _persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]];
+    if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) {
+        /*
+         Replace this implementation with code to handle the error appropriately.
+         
+         abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. 
+         
+         Typical reasons for an error here include:
+         * The persistent store is not accessible;
+         * The schema for the persistent store is incompatible with current managed object model.
+         Check the error message to determine what the actual problem was.
+         
+         
+         If the persistent store is not accessible, there is typically something wrong with the file path. Often, a file URL is pointing into the application's resources directory instead of a writeable directory.
+         
+         If you encounter schema incompatibility errors during development, you can reduce their frequency by:
+         * Simply deleting the existing store:
+         [[NSFileManager defaultManager] removeItemAtURL:storeURL error:nil]
+         
+         * Performing automatic lightweight migration by passing the following dictionary as the options parameter:
+         @{NSMigratePersistentStoresAutomaticallyOption:@YES, NSInferMappingModelAutomaticallyOption:@YES}
+         
+         Lightweight migration will only work for a limited set of schema changes; consult "Core Data Model Versioning and Data Migration Programming Guide" for details.
+         
+         */
+        NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+        abort();
+    }    
+    
+    return _persistentStoreCoordinator;
+}
+
+#pragma mark - Application's Documents directory
+
+// Returns the URL to the application's Documents directory.
+- (NSURL *)applicationDocumentsDirectory
+{
+    return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
+}
+
+@end

=== added file 'Music/main.m'
--- Music/main.m	1970-01-01 00:00:00 +0000
+++ Music/main.m	2012-11-20 05:41:20 +0000
@@ -0,0 +1,18 @@
+//
+//  main.m
+//  Music
+//
+//  Created by Paul Hummer on 11/15/12.
+//  Copyright (c) 2012 Canonical, Ltd. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#import "AppDelegate.h"
+
+int main(int argc, char *argv[])
+{
+    @autoreleasepool {
+        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+    }
+}

=== removed file 'Other Sources/main.m'
--- Other Sources/main.m	2012-09-15 06:47:35 +0000
+++ Other Sources/main.m	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-//
-//  main.m
-//  iSub
-//
-//  Created by Ben Baron on 2/27/10.
-//  Copyright 2010 Ben Baron. All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification, 
-//  are permitted provided that the following conditions are met:
-//  
-//  * Redistributions of source code must retain the above copyright notice, this 
-//    list of conditions and the following disclaimer.
-//  * Redistributions in binary form must reproduce the above copyright notice, 
-//    this list of conditions and the following disclaimer in the documentation 
-//    and/or other materials provided with the distribution.
-//  * Neither the my name nor the names of my contributors may be used to endorse
-//    or promote products derived from this software without specific prior written 
-//    permission.
-//  
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
-//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-//  DAMAGE.
-
-#import <UIKit/UIKit.h>
-
-#import "U1MusicAppDelegate.h"
-
-int main(int argc, char *argv[]) {
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([U1MusicAppDelegate class]));
-    }
-}

=== modified file 'U1Music-Info.plist'
--- U1Music-Info.plist	2012-08-09 20:06:43 +0000
+++ U1Music-Info.plist	2012-11-20 05:41:20 +0000
@@ -42,8 +42,6 @@
 	<string>58</string>
 	<key>LSRequiresIPhoneOS</key>
 	<false/>
-	<key>NSMainNibFile</key>
-	<string>MainWindow</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2012-09-25 21:28:26 +0000
+++ U1Music.xcodeproj/project.pbxproj	2012-11-20 05:41:20 +0000
@@ -18,36 +18,16 @@
 		52169CA215D95E2C00ED366D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 52169C9E15D95E2C00ED366D /* [e-mail] */; };
 		52169CA315D95E2C00ED366D /* trash-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 52169C9F15D95E2C00ED366D /* trash-grey.png */; };
 		52169CA415D95E2C00ED366D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 52169CA015D95E2C00ED366D /* [e-mail] */; };
-		523B3CDE15B4C42F004394F4 /* SongUITableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 523B3CDD15B4C42F004394F4 /* SongUITableView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+		52206B87165505EE00A3A0A8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 52206B831655053000A3A0A8 /* AppDelegate.m */; };
+		52206B891655061A00A3A0A8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 52206B851655056300A3A0A8 /* main.m */; };
 		523B3CE215B5D64F004394F4 /* grabber.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE015B5D64F004394F4 /* grabber.png */; };
 		523B3CE315B5D64F004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CE115B5D64F004394F4 /* [e-mail] */; };
-		523B3CE615B5D814004394F4 /* UOPullGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 523B3CE515B5D814004394F4 /* UOPullGestureRecognizer.m */; };
 		523B3CF915B73BA0004394F4 /* download-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF515B73BA0004394F4 /* download-grey.png */; };
 		523B3CFA15B73BA0004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF615B73BA0004394F4 /* [e-mail] */; };
 		523B3CFB15B73BA0004394F4 /* download.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF715B73BA0004394F4 /* download.png */; };
 		523B3CFC15B73BA0004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF815B73BA0004394F4 /* [e-mail] */; };
 		5279764915F00B2600F8435F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5279764815F00B2600F8435F /* libz.dylib */; };
 		528515991604F410004A1F7C /* UbuntuOneAuthKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 528515941604F16D004A1F7C /* UbuntuOneAuthKit.a */; };
-		52A042FF1606D6C40000B4BC /* NSMutableURLRequest+Parameters.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042D71606D6C40000B4BC /* NSMutableURLRequest+Parameters.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043001606D6C40000B4BC /* NSString+URLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042D91606D6C40000B4BC /* NSString+URLEncoding.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043011606D6C40000B4BC /* NSURL+Base.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042DB1606D6C40000B4BC /* NSURL+Base.m */; };
-		52A043021606D6C40000B4BC /* Base64Transcoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 52A042DD1606D6C40000B4BC /* Base64Transcoder.c */; };
-		52A043031606D6C40000B4BC /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 52A042DF1606D6C40000B4BC /* hmac.c */; };
-		52A043041606D6C40000B4BC /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E11606D6C40000B4BC /* sha1.c */; };
-		52A043051606D6C40000B4BC /* OAAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E41606D6C40000B4BC /* OAAttachment.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043061606D6C40000B4BC /* OACall.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E61606D6C40000B4BC /* OACall.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043071606D6C40000B4BC /* OAConsumer.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042E81606D6C40000B4BC /* OAConsumer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043081606D6C40000B4BC /* OADataFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042EA1606D6C40000B4BC /* OADataFetcher.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043091606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042EC1606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430A1606D6C40000B4BC /* OAMutableURLRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042EE1606D6C40000B4BC /* OAMutableURLRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430B1606D6C40000B4BC /* OAPlaintextSignatureProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F01606D6C40000B4BC /* OAPlaintextSignatureProvider.m */; };
-		52A0430C1606D6C40000B4BC /* OAProblem.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F21606D6C40000B4BC /* OAProblem.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430D1606D6C40000B4BC /* OARequestParameter.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F41606D6C40000B4BC /* OARequestParameter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430E1606D6C40000B4BC /* OAServiceTicket.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042F61606D6C40000B4BC /* OAServiceTicket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A0430F1606D6C40000B4BC /* OATestServer.rb in Resources */ = {isa = PBXBuildFile; fileRef = 52A042F81606D6C40000B4BC /* OATestServer.rb */; };
-		52A043101606D6C40000B4BC /* OAToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042FA1606D6C40000B4BC /* OAToken.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043111606D6C40000B4BC /* OATokenManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A042FC1606D6C40000B4BC /* OATokenManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52A043121606D6C40000B4BC /* README in Resources */ = {isa = PBXBuildFile; fileRef = 52A042FE1606D6C40000B4BC /* README */; };
 		52AC3D671604513E00B4785D /* about_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4B1604513E00B4785D /* about_logo.png */; };
 		52AC3D681604513E00B4785D /* albums.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4C1604513E00B4785D /* albums.png */; };
 		52AC3D691604513E00B4785D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4D1604513E00B4785D /* [e-mail] */; };
@@ -83,111 +63,26 @@
 		53F675DC113B093900822059 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675DB113B093900822059 /* CFNetwork.framework */; };
 		53F675E2113B095900822059 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675E1113B095900822059 /* QuartzCore.framework */; };
 		53F675E8113B096400822059 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F675E7113B096400822059 /* AudioToolbox.framework */; };
-		91018B0B13573BBB0051EFDC /* UIImage+Resize.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B0A13573BBB0051EFDC /* UIImage+Resize.m */; };
-		91018B0E13573D150051EFDC /* UIImage+Alpha.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B0D13573D150051EFDC /* UIImage+Alpha.m */; };
-		91018B1113573D350051EFDC /* UIImage+RoundedCorner.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B1013573D350051EFDC /* UIImage+RoundedCorner.m */; };
-		91018B4B135A724B0051EFDC /* PlaylistEditAlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B42135A724B0051EFDC /* PlaylistEditAlbumListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91018B4C135A724B0051EFDC /* PlaylistEditAlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B44135A724B0051EFDC /* PlaylistEditAlbumViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91018B4D135A724B0051EFDC /* PlaylistEditArtistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B46135A724B0051EFDC /* PlaylistEditArtistListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91018B4E135A724B0051EFDC /* PlaylistEditArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B48135A724B0051EFDC /* PlaylistEditArtistViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91018B4F135A724B0051EFDC /* PlaylistEditSongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B4A135A724B0051EFDC /* PlaylistEditSongListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9110DC38134C045A0046B8E4 /* AlbumParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC37134C04590046B8E4 /* AlbumParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9110DC44134EAC740046B8E4 /* AlbumListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC43134EAC730046B8E4 /* AlbumListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9110DC571354A7490046B8E4 /* AlbumArtistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC561354A7470046B8E4 /* AlbumArtistUITableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9123D1A113257ADF00B40210 /* PlaylistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1A013257ADF00B40210 /* PlaylistListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9123D1BB13280B3400B40210 /* PlaylistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1BA13280B3400B40210 /* PlaylistViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9123D1C3132816D200B40210 /* PlaylistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1C2132816D200B40210 /* PlaylistListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		912D1259134617F600721EE4 /* SongListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1258134617F600721EE4 /* SongListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		912D1264134A162000721EE4 /* AlertPrompt.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1263134A162000721EE4 /* AlertPrompt.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		912D1267134B609700721EE4 /* PlaylistEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1266134B609600721EE4 /* PlaylistEditViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		912D392213311F2700A443B2 /* AlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392113311F2500A443B2 /* AlbumListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		912D392613311FC600A443B2 /* SongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392513311FC400A443B2 /* SongListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9132827D144E07EA00395F40 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 91328279144E07EA00395F40 /* libTestFlight.a */; };
-		91406EEA138AEEE000A7DA67 /* NSString+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 91406EE9138AEEE000A7DA67 /* NSString+Extras.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		9149D9CF159BEC3D009AE771 /* default-album-art-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9C9159BEC3D009AE771 /* default-album-art-120.png */; };
 		9149D9D0159BEC3D009AE771 /* default-album-art-200.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CA159BEC3D009AE771 /* default-album-art-200.png */; };
 		9149D9D1159BEC3D009AE771 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CB159BEC3D009AE771 /* [e-mail] */; };
 		9149D9D2159BEC3D009AE771 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CC159BEC3D009AE771 /* [e-mail] */; };
 		9149D9D3159BEC3D009AE771 /* default-album-art-640.png in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CD159BEC3D009AE771 /* default-album-art-640.png */; };
 		9149D9D4159BEC3D009AE771 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 9149D9CE159BEC3D009AE771 /* [e-mail] */; };
-		914AC3FF14B61D8A00C7D5A3 /* CachedSongsPlaylist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F114B61D8A00C7D5A3 /* CachedSongsPlaylist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		914AC40014B61D8A00C7D5A3 /* _Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F414B61D8A00C7D5A3 /* _Album.m */; };
-		914AC40114B61D8A00C7D5A3 /* _Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F614B61D8A00C7D5A3 /* _Artist.m */; };
-		914AC40214B61D8A00C7D5A3 /* _Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3F814B61D8A00C7D5A3 /* _Playlist.m */; };
-		914AC40314B61D8A00C7D5A3 /* _PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FA14B61D8A00C7D5A3 /* _PlaylistSongIndex.m */; };
-		914AC40414B61D8A00C7D5A3 /* _Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FC14B61D8A00C7D5A3 /* _Song.m */; };
-		914AC40514B61D8A00C7D5A3 /* PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 914AC3FE14B61D8A00C7D5A3 /* PlaylistSongIndex.m */; };
-		917B47EF14E306C800062874 /* U1AutoDownloadsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 917B47EE14E306C800062874 /* U1AutoDownloadsManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		917B47FB14E42C7900062874 /* U1CacheFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 917B47FA14E42C7900062874 /* U1CacheFileManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		919376F3135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 919376F2135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m */; };
-		91B3A4441344CF92006C8193 /* SubsonicIndexedTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3A4431344CF91006C8193 /* SubsonicIndexedTableViewController.m */; };
-		91BE4018138E8D2300D44D68 /* UIActionSheet+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4015138E8D2300D44D68 /* UIActionSheet+Blocks.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91BE4019138E8D2300D44D68 /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91BE401C138E8D3A00D44D68 /* RIButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE401B138E8D3A00D44D68 /* RIButtonItem.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91C493D014E4593C00BC1815 /* U1ByteSizeValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C493CF14E4593C00BC1815 /* U1ByteSizeValueTransformer.m */; };
-		91C8CCAF14B7883600A0E311 /* ArtistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C8CCAE14B7883600A0E311 /* ArtistUITableViewCell.m */; };
-		91D3A16F14B93B2A003D4FC0 /* MOC.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D3A16E14B93B2A003D4FC0 /* MOC.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91D3A17214BE12FE003D4FC0 /* PlaylistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91D3A17114BE12FE003D4FC0 /* PlaylistUITableViewCell.m */; };
-		91E3E46414D33A2D006ED32F /* U1SerializedDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46314D33A2D006ED32F /* U1SerializedDownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91E3E46814D33A6F006ED32F /* U1ChunkDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E3E46714D33A6F006ED32F /* U1ChunkDownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91E88609132DA82000618994 /* PlaylistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E88608132DA82000618994 /* PlaylistParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		91F2653014EACFCC0027232B /* U1MigrationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91F2652E14EACFCC0027232B /* U1MigrationViewController.m */; };
-		91F2653114EACFCC0027232B /* U1MigrationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 91F2652F14EACFCC0027232B /* U1MigrationViewController.xib */; };
-		9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9316628712264A74003B0EB7 /* NSDate+Extras.m */; };
 		932E7AA01255265A00E7C8FF /* about.css in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A9E1255265A00E7C8FF /* about.css */; };
 		932E7AA11255265A00E7C8FF /* about.html in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A9F1255265A00E7C8FF /* about.html */; };
-		932E7B0912552CB400E7C8FF /* PullRefreshTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 932E7B0812552CB400E7C8FF /* PullRefreshTableViewController.m */; };
 		932E7B0B12552CD500E7C8FF /* arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 932E7B0A12552CD500E7C8FF /* arrow.png */; };
-		9354D0AB1248267B00733067 /* NSDictionary+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9354D0AA1248267B00733067 /* NSDictionary+Extras.m */; };
-		936F20681227364200070F43 /* Playlist.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F20671227364200070F43 /* Playlist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		936F209012273D9000070F43 /* Song.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F208F12273D9000070F43 /* Song.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		936F230A12284D1900070F43 /* NamedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 936F230912284D1900070F43 /* NamedTextFieldCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		937FAA11137CFC1B00507E51 /* AlbumArtLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA0E137CFC1B00507E51 /* AlbumArtLoader.m */; };
-		937FAA12137CFC1B00507E51 /* AlbumArtDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA10137CFC1B00507E51 /* AlbumArtDownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		937FAA15137CFC5000507E51 /* Downloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA14137CFC5000507E51 /* Downloader.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		937FAA18137CFC7200507E51 /* DownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA17137CFC7200507E51 /* DownloadOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		937FAA1B137CFCA600507E51 /* AbstractNetworkOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAA1A137CFCA600507E51 /* AbstractNetworkOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		937FAAEF137D15E800507E51 /* Globals.m in Sources */ = {isa = PBXBuildFile; fileRef = 937FAAEE137D15E800507E51 /* Globals.m */; };
 		93A54024123188880048BC3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93A54023123188880048BC3D /* Security.framework */; };
-		93BC5209124C181600B7587C /* Subsonic.m in Sources */ = {isa = PBXBuildFile; fileRef = 93BC5208124C181600B7587C /* Subsonic.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93BC52A7124C1E6900B7587C /* StreamingPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93BC52A6124C1E6900B7587C /* StreamingPlayer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93CCBD4F1254039900AFFC22 /* speaker.png in Resources */ = {isa = PBXBuildFile; fileRef = 93CCBD4D1254039900AFFC22 /* speaker.png */; };
 		93CCBD501254039900AFFC22 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93CCBD4E1254039900AFFC22 /* [e-mail] */; };
-		93CCBD7D12540CB700AFFC22 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CCBD7B12540CB700AFFC22 /* AboutViewController.m */; };
-		93CCBD8012540CD200AFFC22 /* AboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93CCBD7F12540CD200AFFC22 /* AboutViewController.xib */; };
-		93D6B0FF124ED061007880B0 /* SubsonicViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B0FE124ED061007880B0 /* SubsonicViewController.m */; };
-		93D6B11B124ED3B3007880B0 /* UIDevice+Hardware.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B11A124ED3B3007880B0 /* UIDevice+Hardware.m */; };
-		93D6B214124F0F62007880B0 /* NSNumber+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B213124F0F62007880B0 /* NSNumber+Extras.m */; };
 		93D6B287124FD279007880B0 /* loopback-highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B285124FD279007880B0 /* loopback-highlight.png */; };
 		93D6B288124FD279007880B0 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B286124FD279007880B0 /* [e-mail] */; };
 		93D6B28B124FD280007880B0 /* shuffle-highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B289124FD280007880B0 /* shuffle-highlight.png */; };
 		93D6B28C124FD280007880B0 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B28A124FD280007880B0 /* [e-mail] */; };
 		93D6B2BD124FD72D007880B0 /* loopback-one-highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B2BB124FD72D007880B0 /* loopback-one-highlight.png */; };
 		93D6B2BE124FD72D007880B0 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B2BC124FD72D007880B0 /* [e-mail] */; };
-		93D6B2D3124FDA56007880B0 /* NSMutableArray+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B2D2124FDA56007880B0 /* NSMutableArray+Extras.m */; };
-		93D6B54B1252CE57007880B0 /* URLQueryStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93DFFE3E135D70B60061F29F /* CoreData.framework */; };
-		93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE4C135D71760061F29F /* music.xcdatamodeld */; };
-		93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE53135D72420061F29F /* NSManagedObjectContext+Additions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2AEF124993F100E7E060 /* ArtistListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93EE2BA31249F33D00E7E060 /* ArtistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2BA21249F33D00E7E060 /* ArtistParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F3344D1247FA0B006C6707 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344C1247FA0B006C6707 /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334521247FA2C006C6707 /* Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344F1247FA2C006C6707 /* Album.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334531247FA2C006C6707 /* Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334511247FA2C006C6707 /* Artist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F3345C1247FA85006C6707 /* AlbumUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3345B1247FA85006C6707 /* AlbumUITableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F3345F1247FA97006C6707 /* SongUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3345E1247FA97006C6707 /* SongUITableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334681247FB02006C6707 /* SongViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334641247FB02006C6707 /* SongViewController.xib */; };
-		93F334691247FB02006C6707 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334651247FB02006C6707 /* MainWindow.xib */; };
-		93F3346A1247FB02006C6707 /* SearchableTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93F334661247FB02006C6707 /* SearchableTableViewController.xib */; };
-		93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */; };
-		93F334721247FB78006C6707 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334701247FB78006C6707 /* main.m */; };
-		93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334741247FB9F006C6707 /* AudioStreamer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3348E1247FCDC006C6707 /* ArtistViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A01247FCDC006C6707 /* SongViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334901247FCDC006C6707 /* SongViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A31247FCDC006C6707 /* ArtistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334961247FCDC006C6707 /* ArtistListViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A41247FCDC006C6707 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334981247FCDC006C6707 /* SettingsViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A61247FCDC006C6707 /* AlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3349C1247FCDC006C6707 /* AlbumViewController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334A71247FCDC006C6707 /* SubsonicTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3349E1247FCDC006C6707 /* SubsonicTableViewController.m */; };
 		93FA42AE124DC1350080DF62 /* 03-loopback.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A7124DC1350080DF62 /* 03-loopback.png */; };
 		93FA42AF124DC1350080DF62 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A8124DC1350080DF62 /* [e-mail] */; };
 		93FA42B0124DC1350080DF62 /* 05-shuffle.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA42A9124DC1350080DF62 /* 05-shuffle.png */; };
@@ -200,24 +95,6 @@
 		93FA43A7124DEE0E0080DF62 /* whitetrack.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43A4124DEE0E0080DF62 /* whitetrack.png */; };
 		93FA43B5124DF07C0080DF62 /* player_overlay_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43B3124DF07C0080DF62 /* player_overlay_bg.png */; };
 		93FA43B6124DF07C0080DF62 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93FA43B4124DF07C0080DF62 /* [e-mail] */; };
-		960E4B2E14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B2C14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld */; };
-		960E4B3514E58844002AAB79 /* U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3414E58844002AAB79 /* U1CachedFile.m */; };
-		960E4B3814E5884B002AAB79 /* _U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3714E5884B002AAB79 /* _U1CachedFile.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9619626614E088F50038DACA /* U1SocketListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626514E088F50038DACA /* U1SocketListener.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9619626A14E08F4B0038DACA /* U1HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626914E08F4B0038DACA /* U1HTTPMessage.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9619626F14E08F630038DACA /* U1HTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626C14E08F630038DACA /* U1HTTPRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9619627014E08F630038DACA /* U1HTTPResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619626E14E08F630038DACA /* U1HTTPResponse.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9619627314E0A4930038DACA /* U1HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9619627214E0A4930038DACA /* U1HTTPServer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		96377AEE14E0726800517845 /* U1Descriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 96377AED14E0726800517845 /* U1Descriptor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		96377AF314E0730B00517845 /* U1StreamReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 96377AF014E0730B00517845 /* U1StreamReader.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		96377AF414E0730B00517845 /* U1StreamWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 96377AF214E0730B00517845 /* U1StreamWriter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		963C884E14E1AB0C00EB13A2 /* U1LocalMusicServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 963C884D14E1AB0C00EB13A2 /* U1LocalMusicServer.m */; };
-		964FA3EA13CA848D0018A65B /* UOHTTPFetchOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 964FA3E913CA848D0018A65B /* UOHTTPFetchOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		9654C9BC13C7826900D0EEA0 /* UOSSOCredentialsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9654C9BA13C7826900D0EEA0 /* UOSSOCredentialsViewController.m */; };
-		9654C9BD13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9654C9BB13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib */; };
-		9674C2C513A7DC01004509E4 /* UORadialProgressControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 9674C2C413A7DC01004509E4 /* UORadialProgressControl.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		96E01B3714E1BDAF00A9F36C /* U1StreamPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = 96E01B3614E1BDAF00A9F36C /* U1StreamPipe.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		96FB790A13AA628700D8D4A4 /* UONetworkStatusCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = 96FB790913AA628700D8D4A4 /* UONetworkStatusCoordinator.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -257,6 +134,9 @@
 		52169C9E15D95E2C00ED366D /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		52169C9F15D95E2C00ED366D /* trash-grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "trash-grey.png"; sourceTree = "<group>"; };
 		52169CA015D95E2C00ED366D /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		52206B821655053000A3A0A8 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Music/AppDelegate.h; sourceTree = SOURCE_ROOT; };
+		52206B831655053000A3A0A8 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Music/AppDelegate.m; sourceTree = SOURCE_ROOT; };
+		52206B851655056300A3A0A8 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Music/main.m; sourceTree = SOURCE_ROOT; };
 		523B3CDC15B4C42F004394F4 /* SongUITableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongUITableView.h; sourceTree = "<group>"; };
 		523B3CDD15B4C42F004394F4 /* SongUITableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongUITableView.m; sourceTree = "<group>"; };
 		523B3CE015B5D64F004394F4 /* grabber.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = grabber.png; sourceTree = "<group>"; };
@@ -515,9 +395,8 @@
 		93F334641247FB02006C6707 /* SongViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SongViewController.xib; sourceTree = "<group>"; };
 		93F334651247FB02006C6707 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
 		93F334661247FB02006C6707 /* SearchableTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchableTableViewController.xib; sourceTree = "<group>"; };
-		93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1MusicAppDelegate.h; sourceTree = "<group>"; };
-		93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1MusicAppDelegate.m; sourceTree = "<group>"; };
-		93F334701247FB78006C6707 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = U1MusicAppDelegate.h; path = "Other Sources/U1MusicAppDelegate.h"; sourceTree = "<group>"; };
+		93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = U1MusicAppDelegate.m; path = "Other Sources/U1MusicAppDelegate.m"; sourceTree = "<group>"; };
 		93F334731247FB9F006C6707 /* AudioStreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioStreamer.h; sourceTree = "<group>"; };
 		93F334741247FB9F006C6707 /* AudioStreamer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioStreamer.m; sourceTree = "<group>"; };
 		93F334841247FC15006C6707 /* U1Music_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = U1Music_Prefix.pch; path = ../U1Music_Prefix.pch; sourceTree = "<group>"; };
@@ -619,15 +498,7 @@
 			children = (
 				5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */,
 				93F3346C1247FB78006C6707 /* Music */,
-				91018B261359233E0051EFDC /* Base View Controllers */,
-				93F3348C1247FCDC006C6707 /* Root View Controllers */,
-				91018B27135923960051EFDC /* Sub View Controllers */,
-				91018B28135923D20051EFDC /* Playlist Edit View Controllers */,
-				93F334631247FB02006C6707 /* Xibs */,
-				93F334441247F9B9006C6707 /* Utilities */,
-				936F20651227363800070F43 /* Models */,
-				936F1F2E12271B6500070F43 /* Controls */,
-				9316628512264A74003B0EB7 /* Categories */,
+				52206B88165505F900A3A0A8 /* Deprecated */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				964FA39013CA5BE60018A65B /* Dependencies */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
@@ -663,12 +534,30 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		52206B88165505F900A3A0A8 /* Deprecated */ = {
+			isa = PBXGroup;
+			children = (
+				91018B261359233E0051EFDC /* Base View Controllers */,
+				93F3348C1247FCDC006C6707 /* Root View Controllers */,
+				91018B27135923960051EFDC /* Sub View Controllers */,
+				91018B28135923D20051EFDC /* Playlist Edit View Controllers */,
+				93F334631247FB02006C6707 /* Xibs */,
+				93F334441247F9B9006C6707 /* Utilities */,
+				936F20651227363800070F43 /* Models */,
+				936F1F2E12271B6500070F43 /* Controls */,
+				9316628512264A74003B0EB7 /* Categories */,
+				93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */,
+				93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */,
+			);
+			name = Deprecated;
+			sourceTree = "<group>";
+		};
 		528515571604EED8004A1F7C /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				93F334841247FC15006C6707 /* U1Music_Prefix.pch */,
 				8D1107310486CEB800E47090 /* U1Music-Info.plist */,
 				935FCC42123766E600B5DF9B /* Entitlements.plist */,
-				93F334701247FB78006C6707 /* main.m */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -1015,9 +904,9 @@
 		93F3346C1247FB78006C6707 /* Music */ = {
 			isa = PBXGroup;
 			children = (
-				93F334841247FC15006C6707 /* U1Music_Prefix.pch */,
-				93F3346E1247FB78006C6707 /* U1MusicAppDelegate.h */,
-				93F3346F1247FB78006C6707 /* U1MusicAppDelegate.m */,
+				52206B821655053000A3A0A8 /* AppDelegate.h */,
+				52206B831655053000A3A0A8 /* AppDelegate.m */,
+				52206B851655056300A3A0A8 /* main.m */,
 				93DFFE4C135D71760061F29F /* music.xcdatamodeld */,
 				528515571604EED8004A1F7C /* Supporting Files */,
 			);
@@ -1278,9 +1167,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				93F334681247FB02006C6707 /* SongViewController.xib in Resources */,
-				93F334691247FB02006C6707 /* MainWindow.xib in Resources */,
-				93F3346A1247FB02006C6707 /* SearchableTableViewController.xib in Resources */,
 				93FA42AE124DC1350080DF62 /* 03-loopback.png in Resources */,
 				93FA42AF124DC1350080DF62 /* [e-mail] in Resources */,
 				93FA42B0124DC1350080DF62 /* 05-shuffle.png in Resources */,
@@ -1301,12 +1187,9 @@
 				93D6B2BE124FD72D007880B0 /* [e-mail] in Resources */,
 				93CCBD4F1254039900AFFC22 /* speaker.png in Resources */,
 				93CCBD501254039900AFFC22 /* [e-mail] in Resources */,
-				93CCBD8012540CD200AFFC22 /* AboutViewController.xib in Resources */,
 				932E7AA01255265A00E7C8FF /* about.css in Resources */,
 				932E7AA11255265A00E7C8FF /* about.html in Resources */,
 				932E7B0B12552CD500E7C8FF /* arrow.png in Resources */,
-				9654C9BD13C7826900D0EEA0 /* UOSSOCredentialsViewController.xib in Resources */,
-				91F2653114EACFCC0027232B /* U1MigrationViewController.xib in Resources */,
 				9149D9CF159BEC3D009AE771 /* default-album-art-120.png in Resources */,
 				9149D9D0159BEC3D009AE771 /* default-album-art-200.png in Resources */,
 				9149D9D1159BEC3D009AE771 /* [e-mail] in Resources */,
@@ -1356,8 +1239,6 @@
 				52AC3D811604513E00B4785D /* uncached.png in Resources */,
 				52AC3D821604513E00B4785D /* [e-mail] in Resources */,
 				52AC3D841604539000B4785D /* [e-mail] in Resources */,
-				52A0430F1606D6C40000B4BC /* OATestServer.rb in Resources */,
-				52A043121606D6C40000B4BC /* README in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1386,123 +1267,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */,
-				936F20681227364200070F43 /* Playlist.m in Sources */,
-				936F209012273D9000070F43 /* Song.m in Sources */,
-				936F230A12284D1900070F43 /* NamedTextFieldCell.m in Sources */,
-				93F3344D1247FA0B006C6707 /* Reachability.m in Sources */,
-				93F334521247FA2C006C6707 /* Album.m in Sources */,
-				93F334531247FA2C006C6707 /* Artist.m in Sources */,
-				93F3345C1247FA85006C6707 /* AlbumUITableViewCell.m in Sources */,
-				93F3345F1247FA97006C6707 /* SongUITableViewCell.m in Sources */,
-				93F334711247FB78006C6707 /* U1MusicAppDelegate.m in Sources */,
-				93F334721247FB78006C6707 /* main.m in Sources */,
-				93F334751247FB9F006C6707 /* AudioStreamer.m in Sources */,
-				93F3349F1247FCDC006C6707 /* ArtistViewController.m in Sources */,
-				93F334A01247FCDC006C6707 /* SongViewController.m in Sources */,
-				93F334A31247FCDC006C6707 /* ArtistListViewController.m in Sources */,
-				93F334A41247FCDC006C6707 /* SettingsViewController.m in Sources */,
-				93F334A61247FCDC006C6707 /* AlbumViewController.m in Sources */,
-				93F334A71247FCDC006C6707 /* SubsonicTableViewController.m in Sources */,
-				9354D0AB1248267B00733067 /* NSDictionary+Extras.m in Sources */,
-				93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */,
-				93EE2BA31249F33D00E7E060 /* ArtistParser.m in Sources */,
-				93BC5209124C181600B7587C /* Subsonic.m in Sources */,
-				93BC52A7124C1E6900B7587C /* StreamingPlayer.m in Sources */,
-				93D6B0FF124ED061007880B0 /* SubsonicViewController.m in Sources */,
-				93D6B11B124ED3B3007880B0 /* UIDevice+Hardware.m in Sources */,
-				93D6B214124F0F62007880B0 /* NSNumber+Extras.m in Sources */,
-				93D6B2D3124FDA56007880B0 /* NSMutableArray+Extras.m in Sources */,
-				93D6B54B1252CE57007880B0 /* URLQueryStringParser.m in Sources */,
-				93CCBD7D12540CB700AFFC22 /* AboutViewController.m in Sources */,
-				932E7B0912552CB400E7C8FF /* PullRefreshTableViewController.m in Sources */,
-				9123D1A113257ADF00B40210 /* PlaylistListViewController.m in Sources */,
-				9123D1BB13280B3400B40210 /* PlaylistViewController.m in Sources */,
-				9123D1C3132816D200B40210 /* PlaylistListParser.m in Sources */,
-				91E88609132DA82000618994 /* PlaylistParser.m in Sources */,
-				912D392213311F2700A443B2 /* AlbumListViewController.m in Sources */,
-				912D392613311FC600A443B2 /* SongListViewController.m in Sources */,
-				91B3A4441344CF92006C8193 /* SubsonicIndexedTableViewController.m in Sources */,
-				912D1259134617F600721EE4 /* SongListParser.m in Sources */,
-				912D1264134A162000721EE4 /* AlertPrompt.m in Sources */,
-				912D1267134B609700721EE4 /* PlaylistEditViewController.m in Sources */,
-				9110DC38134C045A0046B8E4 /* AlbumParser.m in Sources */,
-				9110DC44134EAC740046B8E4 /* AlbumListParser.m in Sources */,
-				9110DC571354A7490046B8E4 /* AlbumArtistUITableViewCell.m in Sources */,
-				91018B0B13573BBB0051EFDC /* UIImage+Resize.m in Sources */,
-				91018B0E13573D150051EFDC /* UIImage+Alpha.m in Sources */,
-				91018B1113573D350051EFDC /* UIImage+RoundedCorner.m in Sources */,
-				91018B4B135A724B0051EFDC /* PlaylistEditAlbumListViewController.m in Sources */,
-				91018B4C135A724B0051EFDC /* PlaylistEditAlbumViewController.m in Sources */,
-				91018B4D135A724B0051EFDC /* PlaylistEditArtistListViewController.m in Sources */,
-				91018B4E135A724B0051EFDC /* PlaylistEditArtistViewController.m in Sources */,
-				91018B4F135A724B0051EFDC /* PlaylistEditSongListViewController.m in Sources */,
-				919376F3135CC1CF0030B7BD /* PlaylistEditSongUITableViewCell.m in Sources */,
-				93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */,
-				93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */,
-				937FAA11137CFC1B00507E51 /* AlbumArtLoader.m in Sources */,
-				937FAA12137CFC1B00507E51 /* AlbumArtDownloadOperation.m in Sources */,
-				937FAA15137CFC5000507E51 /* Downloader.m in Sources */,
-				937FAA18137CFC7200507E51 /* DownloadOperation.m in Sources */,
-				937FAA1B137CFCA600507E51 /* AbstractNetworkOperation.m in Sources */,
-				937FAAEF137D15E800507E51 /* Globals.m in Sources */,
-				91406EEA138AEEE000A7DA67 /* NSString+Extras.m in Sources */,
-				91BE4018138E8D2300D44D68 /* UIActionSheet+Blocks.m in Sources */,
-				91BE4019138E8D2300D44D68 /* UIAlertView+Blocks.m in Sources */,
-				91BE401C138E8D3A00D44D68 /* RIButtonItem.m in Sources */,
-				9674C2C513A7DC01004509E4 /* UORadialProgressControl.m in Sources */,
-				96FB790A13AA628700D8D4A4 /* UONetworkStatusCoordinator.m in Sources */,
-				9654C9BC13C7826900D0EEA0 /* UOSSOCredentialsViewController.m in Sources */,
-				964FA3EA13CA848D0018A65B /* UOHTTPFetchOperation.m in Sources */,
-				96377AEE14E0726800517845 /* U1Descriptor.m in Sources */,
-				96377AF314E0730B00517845 /* U1StreamReader.m in Sources */,
-				96377AF414E0730B00517845 /* U1StreamWriter.m in Sources */,
-				9619626614E088F50038DACA /* U1SocketListener.m in Sources */,
-				9619626A14E08F4B0038DACA /* U1HTTPMessage.m in Sources */,
-				9619626F14E08F630038DACA /* U1HTTPRequest.m in Sources */,
-				9619627014E08F630038DACA /* U1HTTPResponse.m in Sources */,
-				9619627314E0A4930038DACA /* U1HTTPServer.m in Sources */,
-				914AC3FF14B61D8A00C7D5A3 /* CachedSongsPlaylist.m in Sources */,
-				914AC40014B61D8A00C7D5A3 /* _Album.m in Sources */,
-				914AC40114B61D8A00C7D5A3 /* _Artist.m in Sources */,
-				914AC40214B61D8A00C7D5A3 /* _Playlist.m in Sources */,
-				914AC40314B61D8A00C7D5A3 /* _PlaylistSongIndex.m in Sources */,
-				914AC40414B61D8A00C7D5A3 /* _Song.m in Sources */,
-				914AC40514B61D8A00C7D5A3 /* PlaylistSongIndex.m in Sources */,
-				91C8CCAF14B7883600A0E311 /* ArtistUITableViewCell.m in Sources */,
-				91D3A16F14B93B2A003D4FC0 /* MOC.m in Sources */,
-				91D3A17214BE12FE003D4FC0 /* PlaylistUITableViewCell.m in Sources */,
-				91E3E46414D33A2D006ED32F /* U1SerializedDownloadOperation.m in Sources */,
-				91E3E46814D33A6F006ED32F /* U1ChunkDownloadOperation.m in Sources */,
-				963C884E14E1AB0C00EB13A2 /* U1LocalMusicServer.m in Sources */,
-				96E01B3714E1BDAF00A9F36C /* U1StreamPipe.m in Sources */,
-				917B47EF14E306C800062874 /* U1AutoDownloadsManager.m in Sources */,
-				917B47FB14E42C7900062874 /* U1CacheFileManager.m in Sources */,
-				91C493D014E4593C00BC1815 /* U1ByteSizeValueTransformer.m in Sources */,
-				960E4B2E14E586AE002AAB79 /* CacheFileAccess.xcdatamodeld in Sources */,
-				960E4B3514E58844002AAB79 /* U1CachedFile.m in Sources */,
-				960E4B3814E5884B002AAB79 /* _U1CachedFile.m in Sources */,
-				91F2653014EACFCC0027232B /* U1MigrationViewController.m in Sources */,
-				523B3CDE15B4C42F004394F4 /* SongUITableView.m in Sources */,
-				523B3CE615B5D814004394F4 /* UOPullGestureRecognizer.m in Sources */,
-				52A042FF1606D6C40000B4BC /* NSMutableURLRequest+Parameters.m in Sources */,
-				52A043001606D6C40000B4BC /* NSString+URLEncoding.m in Sources */,
-				52A043011606D6C40000B4BC /* NSURL+Base.m in Sources */,
-				52A043021606D6C40000B4BC /* Base64Transcoder.c in Sources */,
-				52A043031606D6C40000B4BC /* hmac.c in Sources */,
-				52A043041606D6C40000B4BC /* sha1.c in Sources */,
-				52A043051606D6C40000B4BC /* OAAttachment.m in Sources */,
-				52A043061606D6C40000B4BC /* OACall.m in Sources */,
-				52A043071606D6C40000B4BC /* OAConsumer.m in Sources */,
-				52A043081606D6C40000B4BC /* OADataFetcher.m in Sources */,
-				52A043091606D6C40000B4BC /* OAHMAC_SHA1SignatureProvider.m in Sources */,
-				52A0430A1606D6C40000B4BC /* OAMutableURLRequest.m in Sources */,
-				52A0430B1606D6C40000B4BC /* OAPlaintextSignatureProvider.m in Sources */,
-				52A0430C1606D6C40000B4BC /* OAProblem.m in Sources */,
-				52A0430D1606D6C40000B4BC /* OARequestParameter.m in Sources */,
-				52A0430E1606D6C40000B4BC /* OAServiceTicket.m in Sources */,
-				52A043101606D6C40000B4BC /* OAToken.m in Sources */,
-				52A043111606D6C40000B4BC /* OATokenManager.m in Sources */,
+				52206B87165505EE00A3A0A8 /* AppDelegate.m in Sources */,
+				52206B891655061A00A3A0A8 /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};