Merge lp:~urbanape/ubuntuone-ios-client/2.0-9-prerelease into lp:ubuntuone-ios-client

[Zachery Bir]

This branch uses disc_number to aid sort in album view. Currently, this only works server-side with lp:~urbanape/ubuntuone-servers/include-disc-number-by-default, but will be exposed on production shortly. In the interim, songs will continue to be ordered by tracks, doubling up tracks in multi-disc albums.

[Zachery Bir (urbanape)]

Also fixed the playlist edit views and hardened against playlist connectivity for creation, editing, and deletion.

[lp:~urbanape/ubuntuone-ios-client/2.0-9-prerelease]

199. By Zachery Bir on 2011-06-21

Remove unneeded code, and an unneeded .xib, properly organize the PlaylistEditViewController to not get clever with nested tab bar controllers

[Jason Foreman (threeve)]

Looks good to me!

review: Approve

[lp:~urbanape/ubuntuone-ios-client/2.0-9-prerelease]

200. By Zachery Bir on 2011-06-21

Put back in just enough to make the loading/refreshing work properly

201. By Zachery Bir on 2011-06-21

Bumped to build number 10

=== modified file 'musicstreaming/categories/NSMutableArray+Extras.h'
--- musicstreaming/categories/NSMutableArray+Extras.h	2011-03-29 14:22:42 +0000
+++ musicstreaming/categories/NSMutableArray+Extras.h	2011-06-21 18:28:35 +0000
@@ -21,4 +21,6 @@
 
 @interface NSMutableArray (Extras)
 - (void)shuffle;
+- (void)addKeyValueObjectFromArray:(NSArray *)array;
+- (NSString*)urlEncodedString;
 @end
 
=== modified file 'musicstreaming/categories/NSMutableArray+Extras.m'
--- musicstreaming/categories/NSMutableArray+Extras.m	2011-03-29 14:22:42 +0000
+++ musicstreaming/categories/NSMutableArray+Extras.m	2011-06-21 18:28:35 +0000
@@ -19,6 +19,19 @@
 
 #import "NSMutableArray+Extras.h"
 
+// helper function: get the string form of any object
+static NSString *toString(id object)
+{
+	return [NSString stringWithFormat: @"%@", object];
+}
+
+// helper function: get the url encoded string form of any object
+static NSString *urlEncode(id object)
+{
+	NSString *string = toString(object);
+	return [string stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+}
+
 @implementation NSMutableArray (Extras)
 - (void)shuffle
 {
@@ -32,4 +45,25 @@
         [self exchangeObjectAtIndex:i withObjectAtIndex:n];
     }
 }
+
+- (void)addKeyValueObjectFromArray:(NSArray *)array
+{
+    [self addObject:[NSDictionary dictionaryWithObjects:array
+                                                forKeys:[NSArray arrayWithObjects:@"key", @"value", nil]]];
+}
+
+- (NSString*)urlEncodedString
+{
+	NSMutableArray *parts = [NSMutableArray array];
+	
+	for (id object in self)
+	{
+        id key = [object objectForKey:@"key"];
+		id value = [object objectForKey:@"value"];
+		NSString *part = [NSString stringWithFormat:@"%@=%@",urlEncode(key),urlEncode(value)];
+		[parts addObject:part];
+	}
+	return [parts componentsJoinedByString:@"&"];
+}
+
 @end
 
=== removed file 'musicstreaming/categories/NSMutableSet+Extras.h'
--- musicstreaming/categories/NSMutableSet+Extras.h	2011-04-08 01:55:24 +0000
+++ musicstreaming/categories/NSMutableSet+Extras.h	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-//
-//  NSMutableSet+Extras.h
-//  iSub
-//
-//  Created by Zachery Bir on 4/7/11.
-//  Copyright 2011 Canonical Ltd.
-//	
-//  This program is free software: you can redistribute it and/or modify it
-//  under the terms of the GNU Affero General Public License version 3,
-//  as published by the Free Software Foundation.
-//	
-//  This program is distributed in the hope that it will be useful, but
-//  WITHOUT ANY WARRANTY; without even the implied warranties of
-//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-//  PURPOSE.  See the GNU Affero General Public License for more details.
-//
-//  You should have received a copy of the GNU Affero General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#import <Foundation/Foundation.h>
-
-
-@interface NSMutableSet (Extras)
-- (void)addKeyValueObjectFromArray:(NSArray *)array;
-- (NSString*)urlEncodedString;
-@end
 
=== removed file 'musicstreaming/categories/NSMutableSet+Extras.m'
--- musicstreaming/categories/NSMutableSet+Extras.m	2011-04-08 01:55:24 +0000
+++ musicstreaming/categories/NSMutableSet+Extras.m	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-//
-//  NSMutableSet+Extras.m
-//  iSub
-//
-//  Created by Zachery Bir on 4/7/11.
-//  Copyright 2011 Canonical Ltd.
-//	
-//  This program is free software: you can redistribute it and/or modify it
-//  under the terms of the GNU Affero General Public License version 3,
-//  as published by the Free Software Foundation.
-//	
-//  This program is distributed in the hope that it will be useful, but
-//  WITHOUT ANY WARRANTY; without even the implied warranties of
-//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-//  PURPOSE.  See the GNU Affero General Public License for more details.
-//
-//  You should have received a copy of the GNU Affero General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#import "NSMutableSet+Extras.h"
-
-// helper function: get the string form of any object
-static NSString *toString(id object)
-{
-	return [NSString stringWithFormat: @"%@", object];
-}
-
-// helper function: get the url encoded string form of any object
-static NSString *urlEncode(id object)
-{
-	NSString *string = toString(object);
-	return [string stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-}
-
-@implementation NSMutableSet (Extras)
-
-- (void)addKeyValueObjectFromArray:(NSArray *)array
-{
-    [self addObject:[NSDictionary dictionaryWithObjects:array
-                                                forKeys:[NSArray arrayWithObjects:@"key", @"value", nil]]];
-}
-
-- (NSString*)urlEncodedString
-{
-	NSMutableArray *parts = [NSMutableArray array];
-	
-	for (id object in self)
-	{
-        id key = [object objectForKey:@"key"];
-		id value = [object objectForKey:@"value"];
-		NSString *part = [NSString stringWithFormat:@"%@=%@",urlEncode(key),urlEncode(value)];
-		[parts addObject:part];
-	}
-	return [parts componentsJoinedByString:@"&"];
-}
-
-@end
 
=== removed file 'musicstreaming/controls/MiniHudView.h'
--- musicstreaming/controls/MiniHudView.h	2011-05-02 07:47:25 +0000
+++ musicstreaming/controls/MiniHudView.h	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-//
-//  MiniHudView.h
-//  iSub
-//
-//  Created by Aaron Brethorst on 5/2/11.
-//  Copyright 2011 Canonical. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface MiniHudView : UIView
-{
-	UIActivityIndicatorView *spinner;
-}
-- (void)show:(BOOL)yn;
-- (void)hide:(BOOL)yn;
-@end
 
=== removed file 'musicstreaming/controls/MiniHudView.m'
--- musicstreaming/controls/MiniHudView.m	2011-05-02 07:47:25 +0000
+++ musicstreaming/controls/MiniHudView.m	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-//
-//  MiniHudView.m
-//  iSub
-//
-//  Created by Aaron Brethorst on 5/2/11.
-//  Copyright 2011 Canonical. All rights reserved.
-//
-
-#import "MiniHudView.h"
-#import <QuartzCore/QuartzCore.h>
-
-@implementation MiniHudView
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-	if ((self = [super initWithFrame:aFrame]))
-	{
-		self.opaque = NO;
-		self.backgroundColor = [UIColor colorWithWhite:0.3 alpha:0.9f];
-		self.layer.cornerRadius = 8.0f;
-		
-		spinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
-		spinner.frame = CGRectMake(5, 5, 20, 20);
-		[self addSubview:spinner];
-		
-		self.hidden = YES;
-	}
-	return self;
-}
-
-- (void)layoutSubviews
-{
-	[super layoutSubviews];
-}
-
-- (void)show:(BOOL)yn
-{
-	[spinner startAnimating];
-	self.hidden = NO;
-}
-
-- (void)hide:(BOOL)yn
-{
-	[spinner stopAnimating];
-	self.hidden = YES;
-}
-
-- (void)dealloc
-{
-	[spinner release];
-	[super dealloc];
-}
-
-@end
 
=== modified file 'musicstreaming/iSub-Info.plist'
--- musicstreaming/iSub-Info.plist	2011-06-07 09:20:03 +0000
+++ musicstreaming/iSub-Info.plist	2011-06-21 18:28:35 +0000
@@ -41,7 +41,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>10</string>
 	<key>LSRequiresIPhoneOS</key>
 	<false/>
 	<key>NSMainNibFile</key>
 
=== modified file 'musicstreaming/iSub.xcodeproj/project.pbxproj'
--- musicstreaming/iSub.xcodeproj/project.pbxproj	2011-06-16 16:39:50 +0000
+++ musicstreaming/iSub.xcodeproj/project.pbxproj	2011-06-21 18:28:35 +0000
@@ -21,14 +21,12 @@
 		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 */; };
-		91018B25135922BF0051EFDC /* PlaylistEditViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 91018B24135922BE0051EFDC /* PlaylistEditViewController.xib */; };
 		91018B4B135A724B0051EFDC /* PlaylistEditAlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B42135A724B0051EFDC /* PlaylistEditAlbumListViewController.m */; };
 		91018B4C135A724B0051EFDC /* PlaylistEditAlbumViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B44135A724B0051EFDC /* PlaylistEditAlbumViewController.m */; };
 		91018B4D135A724B0051EFDC /* PlaylistEditArtistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B46135A724B0051EFDC /* PlaylistEditArtistListViewController.m */; };
 		91018B4E135A724B0051EFDC /* PlaylistEditArtistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B48135A724B0051EFDC /* PlaylistEditArtistViewController.m */; };
 		91018B4F135A724B0051EFDC /* PlaylistEditSongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91018B4A135A724B0051EFDC /* PlaylistEditSongListViewController.m */; };
 		9110DC38134C045A0046B8E4 /* AlbumParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC37134C04590046B8E4 /* AlbumParser.m */; };
-		9110DC41134E4EEF0046B8E4 /* NSMutableSet+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC40134E4EEF0046B8E4 /* NSMutableSet+Extras.m */; };
 		9110DC44134EAC740046B8E4 /* AlbumListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC43134EAC730046B8E4 /* AlbumListParser.m */; };
 		9110DC571354A7490046B8E4 /* AlbumArtistUITableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9110DC561354A7470046B8E4 /* AlbumArtistUITableViewCell.m */; };
 		9112B0241383FF27003C1D93 /* albums.png in Resources */ = {isa = PBXBuildFile; fileRef = 9112B01E1383FF27003C1D93 /* albums.png */; };
@@ -61,6 +59,7 @@
 		91BE4018138E8D2300D44D68 /* UIActionSheet+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4015138E8D2300D44D68 /* UIActionSheet+Blocks.m */; };
 		91BE4019138E8D2300D44D68 /* UIAlertView+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */; };
 		91BE401C138E8D3A00D44D68 /* RIButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 91BE401B138E8D3A00D44D68 /* RIButtonItem.m */; };
+		91E0778913ABAD6200AA7CB2 /* PlaylistSongIndex.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E0778813ABAD6200AA7CB2 /* PlaylistSongIndex.m */; };
 		91E88609132DA82000618994 /* PlaylistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 91E88608132DA82000618994 /* PlaylistParser.m */; };
 		9316628812264A74003B0EB7 /* NSDate+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 9316628712264A74003B0EB7 /* NSDate+Extras.m */; };
 		932E7A6E1254747E00E7C8FF /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 932E7A6D1254747E00E7C8FF /* [e-mail] */; };
@@ -100,7 +99,6 @@
 		93D6B5111252CA71007880B0 /* music_512.png in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B50D1252CA71007880B0 /* music_512.png */; };
 		93D6B5151252CB34007880B0 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B5141252CB34007880B0 /* [e-mail] */; };
 		93D6B54B1252CE57007880B0 /* URLQueryStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */; };
-		93DF12D9136E968E00D6C085 /* MiniHudView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93DF12D8136E968E00D6C085 /* MiniHudView.m */; };
 		93DFFE3F135D70B60061F29F /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93DFFE3E135D70B60061F29F /* CoreData.framework */; };
 		93DFFE45135D71030061F29F /* MOC.m in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE44135D71030061F29F /* MOC.m */; };
 		93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE4C135D71760061F29F /* music.xcdatamodeld */; };
@@ -163,7 +161,6 @@
 		91018B0D13573D150051EFDC /* UIImage+Alpha.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Alpha.m"; sourceTree = "<group>"; };
 		91018B0F13573D350051EFDC /* UIImage+RoundedCorner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+RoundedCorner.h"; sourceTree = "<group>"; };
 		91018B1013573D350051EFDC /* UIImage+RoundedCorner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+RoundedCorner.m"; sourceTree = "<group>"; };
-		91018B24135922BE0051EFDC /* PlaylistEditViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlaylistEditViewController.xib; sourceTree = "<group>"; };
 		91018B41135A724B0051EFDC /* PlaylistEditAlbumListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistEditAlbumListViewController.h; path = view_controllers/PlaylistEditAlbumListViewController.h; sourceTree = "<group>"; };
 		91018B42135A724B0051EFDC /* PlaylistEditAlbumListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PlaylistEditAlbumListViewController.m; path = view_controllers/PlaylistEditAlbumListViewController.m; sourceTree = "<group>"; };
 		91018B43135A724B0051EFDC /* PlaylistEditAlbumViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlaylistEditAlbumViewController.h; path = view_controllers/PlaylistEditAlbumViewController.h; sourceTree = "<group>"; };
@@ -176,8 +173,6 @@
 		91018B4A135A724B0051EFDC /* PlaylistEditSongListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PlaylistEditSongListViewController.m; path = view_controllers/PlaylistEditSongListViewController.m; sourceTree = "<group>"; };
 		9110DC36134C04590046B8E4 /* AlbumParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlbumParser.h; sourceTree = "<group>"; };
 		9110DC37134C04590046B8E4 /* AlbumParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlbumParser.m; sourceTree = "<group>"; };
-		9110DC3F134E4EEF0046B8E4 /* NSMutableSet+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableSet+Extras.h"; sourceTree = "<group>"; };
-		9110DC40134E4EEF0046B8E4 /* NSMutableSet+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableSet+Extras.m"; sourceTree = "<group>"; };
 		9110DC42134EAC720046B8E4 /* AlbumListParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlbumListParser.h; sourceTree = "<group>"; };
 		9110DC43134EAC730046B8E4 /* AlbumListParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlbumListParser.m; sourceTree = "<group>"; };
 		9110DC551354A7460046B8E4 /* AlbumArtistUITableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AlbumArtistUITableViewCell.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -226,6 +221,8 @@
 		91BE4017138E8D2300D44D68 /* UIAlertView+Blocks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIAlertView+Blocks.m"; sourceTree = "<group>"; };
 		91BE401A138E8D3A00D44D68 /* RIButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RIButtonItem.h; sourceTree = "<group>"; };
 		91BE401B138E8D3A00D44D68 /* RIButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RIButtonItem.m; sourceTree = "<group>"; };
+		91E0778713ABAD6100AA7CB2 /* PlaylistSongIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistSongIndex.h; sourceTree = "<group>"; };
+		91E0778813ABAD6200AA7CB2 /* PlaylistSongIndex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistSongIndex.m; sourceTree = "<group>"; };
 		91E88607132DA82000618994 /* PlaylistParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistParser.h; sourceTree = "<group>"; };
 		91E88608132DA82000618994 /* PlaylistParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistParser.m; sourceTree = "<group>"; };
 		9316628612264A74003B0EB7 /* NSDate+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Extras.h"; sourceTree = "<group>"; };
@@ -288,8 +285,6 @@
 		93D6B5141252CB34007880B0 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		93D6B5491252CE57007880B0 /* URLQueryStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLQueryStringParser.h; sourceTree = "<group>"; };
 		93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLQueryStringParser.m; sourceTree = "<group>"; };
-		93DF12D7136E968E00D6C085 /* MiniHudView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MiniHudView.h; sourceTree = "<group>"; };
-		93DF12D8136E968E00D6C085 /* MiniHudView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MiniHudView.m; sourceTree = "<group>"; };
 		93DFFE3E135D70B60061F29F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		93DFFE43135D71030061F29F /* MOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOC.h; sourceTree = "<group>"; };
 		93DFFE44135D71030061F29F /* MOC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOC.m; sourceTree = "<group>"; };
@@ -549,8 +544,6 @@
 				93D6B213124F0F62007880B0 /* NSNumber+Extras.m */,
 				93D6B2D1124FDA56007880B0 /* NSMutableArray+Extras.h */,
 				93D6B2D2124FDA56007880B0 /* NSMutableArray+Extras.m */,
-				9110DC3F134E4EEF0046B8E4 /* NSMutableSet+Extras.h */,
-				9110DC40134E4EEF0046B8E4 /* NSMutableSet+Extras.m */,
 				91018B0913573BBB0051EFDC /* UIImage+Resize.h */,
 				91018B0A13573BBB0051EFDC /* UIImage+Resize.m */,
 				91018B0C13573D150051EFDC /* UIImage+Alpha.h */,
@@ -593,8 +586,6 @@
 				936F230912284D1900070F43 /* NamedTextFieldCell.m */,
 				912D1262134A162000721EE4 /* AlertPrompt.h */,
 				912D1263134A162000721EE4 /* AlertPrompt.m */,
-				93DF12D7136E968E00D6C085 /* MiniHudView.h */,
-				93DF12D8136E968E00D6C085 /* MiniHudView.m */,
 			);
 			name = Controls;
 			path = controls;
@@ -607,14 +598,16 @@
 				93DFFE44135D71030061F29F /* MOC.m */,
 				93F3344E1247FA2C006C6707 /* Album.h */,
 				93F3344F1247FA2C006C6707 /* Album.m */,
+				93F334501247FA2C006C6707 /* Artist.h */,
 				93F334511247FA2C006C6707 /* Artist.m */,
-				93F334501247FA2C006C6707 /* Artist.h */,
 				936F208E12273D9000070F43 /* Song.h */,
 				936F208F12273D9000070F43 /* Song.m */,
 				936F20661227364200070F43 /* Playlist.h */,
 				936F20671227364200070F43 /* Playlist.m */,
 				9646DB7B13A8FF4700CB42D2 /* CachedSongsPlaylist.h */,
 				9646DB7C13A8FF4700CB42D2 /* CachedSongsPlaylist.m */,
+				91E0778713ABAD6100AA7CB2 /* PlaylistSongIndex.h */,
+				91E0778813ABAD6200AA7CB2 /* PlaylistSongIndex.m */,
 			);
 			name = Models;
 			path = models;
@@ -670,7 +663,6 @@
 				93F334641247FB02006C6707 /* SongViewController.xib */,
 				93F334651247FB02006C6707 /* MainWindow.xib */,
 				93F334661247FB02006C6707 /* SearchableTableViewController.xib */,
-				91018B24135922BE0051EFDC /* PlaylistEditViewController.xib */,
 			);
 			name = Xibs;
 			path = xibs;
@@ -825,7 +817,6 @@
 				932E7AA01255265A00E7C8FF /* about.css in Resources */,
 				932E7AA11255265A00E7C8FF /* about.html in Resources */,
 				932E7B0B12552CD500E7C8FF /* arrow.png in Resources */,
-				91018B25135922BF0051EFDC /* PlaylistEditViewController.xib in Resources */,
 				9112B0241383FF27003C1D93 /* albums.png in Resources */,
 				9112B0251383FF27003C1D93 /* artists.png in Resources */,
 				9112B0261383FF27003C1D93 /* playlists.png in Resources */,
@@ -894,7 +885,6 @@
 				912D1264134A162000721EE4 /* AlertPrompt.m in Sources */,
 				912D1267134B609700721EE4 /* PlaylistEditViewController.m in Sources */,
 				9110DC38134C045A0046B8E4 /* AlbumParser.m in Sources */,
-				9110DC41134E4EEF0046B8E4 /* NSMutableSet+Extras.m in Sources */,
 				9110DC44134EAC740046B8E4 /* AlbumListParser.m in Sources */,
 				9110DC571354A7490046B8E4 /* AlbumArtistUITableViewCell.m in Sources */,
 				91018B0B13573BBB0051EFDC /* UIImage+Resize.m in Sources */,
@@ -909,7 +899,6 @@
 				93DFFE45135D71030061F29F /* MOC.m in Sources */,
 				93DFFE4D135D71760061F29F /* music.xcdatamodeld in Sources */,
 				93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */,
-				93DF12D9136E968E00D6C085 /* MiniHudView.m in Sources */,
 				937FAA11137CFC1B00507E51 /* AlbumArtLoader.m in Sources */,
 				937FAA12137CFC1B00507E51 /* AlbumArtLoadingOperation.m in Sources */,
 				937FAA15137CFC5000507E51 /* Downloader.m in Sources */,
@@ -923,6 +912,7 @@
 				9674C2C513A7DC01004509E4 /* UORadialProgressControl.m in Sources */,
 				9646DB7D13A8FF4700CB42D2 /* CachedSongsPlaylist.m in Sources */,
 				96FB790A13AA628700D8D4A4 /* UONetworkStatusCoordinator.m in Sources */,
+				91E0778913ABAD6200AA7CB2 /* PlaylistSongIndex.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 
=== modified file 'musicstreaming/models/Album.m'
--- musicstreaming/models/Album.m	2011-06-14 17:06:21 +0000
+++ musicstreaming/models/Album.m	2011-06-21 18:28:35 +0000
@@ -30,7 +30,7 @@
 
 #import "Album.h"
 #import "Artist.h"
-#import "NSMutableSet+Extras.h"
+#import "NSMutableArray+Extras.h"
 #import "NSString+Extras.h"
 #import "AlbumParser.h"
 #import "Subsonic.h"
@@ -83,7 +83,7 @@
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	NSError *error = nil;
 	
-	NSMutableSet *parameters = [NSMutableSet set];
+	NSMutableArray *parameters = [NSMutableArray array];
 	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.albumId, nil]];
 	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getAlbum.view" parameters:parameters];
 	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
 
=== modified file 'musicstreaming/models/Artist.m'
--- musicstreaming/models/Artist.m	2011-06-14 17:06:21 +0000
+++ musicstreaming/models/Artist.m	2011-06-21 18:28:35 +0000
@@ -31,7 +31,7 @@
 #import "Artist.h"
 #import "Album.h"
 #import "Subsonic.h"
-#import "NSMutableSet+Extras.h"
+#import "NSMutableArray+Extras.h"
 #import "NSString+Extras.h"
 #import "ArtistParser.h"
 
@@ -99,7 +99,7 @@
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	NSError *error = nil;
 	
-	NSMutableSet *parameters = [NSMutableSet set];
+	NSMutableArray *parameters = [NSMutableArray array];
 	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.artistId, nil]];
 	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getMusicDirectory.view" parameters:parameters];
 	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
 
=== modified file 'musicstreaming/models/Playlist.h'
--- musicstreaming/models/Playlist.h	2011-06-15 16:49:27 +0000
+++ musicstreaming/models/Playlist.h	2011-06-21 18:28:35 +0000
@@ -19,26 +19,29 @@
 
 #import <Foundation/Foundation.h>
 
-@class Song;
+@class Song, PlaylistSongIndex;
 
 @interface Playlist : NSManagedObject
 {
 }
+@property(nonatomic,retain) NSString *name;
 @property(nonatomic,retain) NSString *playlistId;
-@property(nonatomic,retain) NSString *name;
-@property(nonatomic,retain) NSSet *songs;
+@property(nonatomic,retain) NSSet *playlistSongIndexes;
+@property(nonatomic,readonly) NSArray *songs;
 
-+ (BOOL)playlistWithIdExists:(NSString*)aPlaylistId;
-+ (Playlist*)playlistWithId:(NSString*)aPlaylistId;
++ (BOOL)playlistWithNameExists:(NSString*)aPlaylistName;
++ (Playlist*)playlistWithName:(NSString*)aPlaylistName;
 - (BOOL)matchesSearchQuery:(NSString *)query;
 - (NSError*)loadSongs;
 - (BOOL)isEditable;
+- (void)addSong:(Song *)song;
+- (void)removeSong:(Song *)song;
 @end
 
 // coalesce these into one @interface Album (CoreDataGeneratedAccessors) section
 @interface Playlist (CoreDataGeneratedAccessors)
-- (void)addSongsObject:(Song *)value;
-- (void)removeSongsObject:(Song *)value;
-- (void)addSongs:(NSSet *)value;
-- (void)removeSongs:(NSSet *)value;
+- (void)addPlaylistSongIndexesObject:(PlaylistSongIndex *)value;
+- (void)removePlaylistSongIndexesObject:(PlaylistSongIndex *)value;
+- (void)addPlaylistSongIndexes:(NSSet *)value;
+- (void)removePlaylistSongIndexes:(NSSet *)value;
 @end
 
=== modified file 'musicstreaming/models/Playlist.m'
--- musicstreaming/models/Playlist.m	2011-06-15 16:49:27 +0000
+++ musicstreaming/models/Playlist.m	2011-06-21 18:28:35 +0000
@@ -19,25 +19,27 @@
 
 #import "Playlist.h"
 #import "Subsonic.h"
-#import "NSMutableSet+Extras.h"
+#import "NSMutableArray+Extras.h"
 #import "PlaylistParser.h"
+#import "PlaylistSongIndex.h"
+#import "Song.h"
 
 @implementation Playlist
 
-@dynamic playlistId, name, songs;
+@dynamic playlistId, name, playlistSongIndexes;
 
-+ (BOOL)playlistWithIdExists:(NSString *)aPlaylistId
++ (BOOL)playlistWithNameExists:(NSString *)aPlaylistName
 {
-	return (nil != [Playlist playlistWithId:aPlaylistId]);
+	return (nil != [Playlist playlistWithName:aPlaylistName]);
 }
 
-+ (Playlist *)playlistWithId:(NSString *)aPlaylistId
++ (Playlist *)playlistWithName:(NSString *)aPlaylistName
 {
 	NSFetchRequest * fetch = [[NSFetchRequest alloc] init];
 	NSEntityDescription *entityDescription = [NSEntityDescription entityForName:@"Playlist" inManagedObjectContext:PerThreadManagedObjectContext()];
 	[fetch setEntity:entityDescription];
 	
-	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"playlistId == %@", aPlaylistId];
+	NSPredicate *predicate = [NSPredicate predicateWithFormat:@"name == %@", aPlaylistName];
 	[fetch setPredicate:predicate];
 	
 	NSError * error = nil;
@@ -59,7 +61,7 @@
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	NSError *error = nil;
 	
-	NSMutableSet *parameters = [NSMutableSet set];
+	NSMutableArray *parameters = [NSMutableArray array];
 	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlistId, nil]];
 	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getPlaylist.view" parameters:parameters];
 	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
@@ -81,6 +83,40 @@
 	return [error autorelease];
 }
 
+- (NSArray *)songs
+{
+	// return playlistSongIndexes sorted by index
+	NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"index" ascending:YES];
+	NSArray *results = [[self.playlistSongIndexes sortedArrayUsingDescriptors:[NSArray arrayWithObject:sortDescriptor]] valueForKey:@"songEntity"];
+	return results;
+}
+
+// Do the crazy PlaylistSongIndex lookup/clobber dance inside these methods
+- (void)addSong:(Song *)song
+{
+	PlaylistSongIndex *playlistSongIndex = [NSEntityDescription insertNewObjectForEntityForName:@"PlaylistSongIndex" inManagedObjectContext:PerThreadManagedObjectContext()];
+	playlistSongIndex.playlistEntity = self;
+	playlistSongIndex.songEntity = song;
+	playlistSongIndex.index = [NSNumber numberWithUnsignedInt:[self.playlistSongIndexes count]];
+	SaveContext();
+}
+
+- (void)removeSong:(Song *)song
+{
+	// Look up (potentially) all records where playlistEntity is self, and songEntity is song, and blow them away
+	NSSet *condemned = [self.playlistSongIndexes filteredSetUsingPredicate:[NSPredicate predicateWithFormat:@"songEntity = %@", song]];
+	for (PlaylistSongIndex *playlistSongIndex in condemned)
+	{
+		[PerThreadManagedObjectContext() deleteObject:playlistSongIndex];
+	}
+	SaveContext();
+	
+	[[self.playlistSongIndexes sortedArrayUsingDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"index" ascending:YES]]] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+		((PlaylistSongIndex *)obj).index = [NSNumber numberWithUnsignedInt:idx];
+	}];
+	SaveContext();
+}
+
 - (NSString*)description
 {
 	return [NSString stringWithFormat:@"%@ (%@) MOC %@", self.name, self.playlistId, [self managedObjectContext]];
 
=== added file 'musicstreaming/models/PlaylistSongIndex.h'
--- musicstreaming/models/PlaylistSongIndex.h	1970-01-01 00:00:00 +0000
+++ musicstreaming/models/PlaylistSongIndex.h	2011-06-21 18:28:35 +0000
@@ -0,0 +1,32 @@
+//
+//  PlaylistSongIndex.h
+//  iSub
+//
+//  Created by Zachery Bir on 6/17/11.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import <Foundation/Foundation.h>
+
+@class Playlist, Song;
+
+@interface PlaylistSongIndex : NSManagedObject {
+@private
+    
+}
+@property (nonatomic, retain) NSNumber *index;
+
+@property (nonatomic, retain) Playlist *playlistEntity;
+@property (nonatomic, retain) Song *songEntity;
+@end
 
=== added file 'musicstreaming/models/PlaylistSongIndex.m'
--- musicstreaming/models/PlaylistSongIndex.m	1970-01-01 00:00:00 +0000
+++ musicstreaming/models/PlaylistSongIndex.m	2011-06-21 18:28:35 +0000
@@ -0,0 +1,27 @@
+//
+//  PlaylistSongIndex.m
+//  iSub
+//
+//  Created by Zachery Bir on 6/17/11.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#import "PlaylistSongIndex.h"
+
+
+@implementation PlaylistSongIndex
+
+@dynamic index, playlistEntity, songEntity;
+
+@end
 
=== modified file 'musicstreaming/models/Song.h'
--- musicstreaming/models/Song.h	2011-06-13 19:00:38 +0000
+++ musicstreaming/models/Song.h	2011-06-21 18:28:35 +0000
@@ -28,7 +28,7 @@
 //  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
 //  DAMAGE.
 
-@class Artist, Album, Playlist;
+@class Artist, Album, PlaylistSongIndex;
 
 @interface Song : NSManagedObject
 {
@@ -43,11 +43,12 @@
 @property (nonatomic, retain) NSNumber *duration;
 @property (nonatomic, retain) NSNumber *bitRate;
 @property (nonatomic, retain) NSNumber *track;
+@property (nonatomic, retain) NSNumber *discNumber;
 @property (nonatomic, retain) NSNumber *year;
 @property (nonatomic, retain) NSNumber *size;
 @property (nonatomic, retain) Artist *artistEntity;
 @property (nonatomic, retain) Album *albumEntity;
-@property (nonatomic, retain) NSSet *playlistEntities;
+@property (nonatomic, retain) NSSet *playlistSongIndexes;
 @property (nonatomic, retain) NSString *cachedSongPath;
 
 + (BOOL)songWithIdExists:(NSString*)aSongId;
@@ -59,8 +60,8 @@
 @end
 
 @interface Song (CoreDataGeneratedAccessors)
-- (void)addPlaylistEntitiesObject:(Playlist *)value;
-- (void)removePlaylistEntitiesObject:(Playlist *)value;
-- (void)addPlaylistEntities:(NSSet *)value;
-- (void)removePlaylistEntities:(NSSet *)value;
+- (void)addPlaylistSongIndexesObject:(PlaylistSongIndex *)value;
+- (void)removePlaylistSongIndexesObject:(PlaylistSongIndex *)value;
+- (void)addPlaylistSongIndexes:(NSSet *)value;
+- (void)removePlaylistSongIndexes:(NSSet *)value;
 @end
 
=== modified file 'musicstreaming/models/Song.m'
--- musicstreaming/models/Song.m	2011-06-14 17:06:21 +0000
+++ musicstreaming/models/Song.m	2011-06-21 18:28:35 +0000
@@ -34,8 +34,8 @@
 #import "NSString+Extras.h"
 
 @implementation Song
-@dynamic title, songId, artist, album, genre, coverArtId, path, duration, bitRate, track, year, size;
-@dynamic artistEntity, albumEntity, playlistEntities, cachedSongPath;
+@dynamic title, songId, artist, album, genre, coverArtId, path, duration, bitRate, track, discNumber, year, size;
+@dynamic artistEntity, albumEntity, playlistSongIndexes, cachedSongPath;
 
 + (BOOL)songWithIdExists:(NSString*)aSongId
 {
@@ -77,7 +77,13 @@
 
 - (NSComparisonResult)compare:(Song*)s
 {
-	return [self.track compare:s.track];
+	NSUInteger selfPathArray[] = {[self.discNumber integerValue], [self.track integerValue]};
+	NSUInteger otherPathArray[] = {[s.discNumber integerValue], [s.track integerValue]};
+	
+	NSIndexPath *selfPath = [NSIndexPath indexPathWithIndexes:selfPathArray length:2];
+	NSIndexPath *otherPath = [NSIndexPath indexPathWithIndexes:otherPathArray length:2];
+	
+	return [selfPath compare:otherPath];
 }
 
 - (NSString*)description
 
=== modified file 'musicstreaming/music.xcdatamodeld/music.xcdatamodel/elements'
 Binary files musicstreaming/music.xcdatamodeld/music.xcdatamodel/elements	2011-06-13 19:00:38 +0000 and musicstreaming/music.xcdatamodeld/music.xcdatamodel/elements	2011-06-21 18:28:35 +0000 differ
=== modified file 'musicstreaming/music.xcdatamodeld/music.xcdatamodel/layout'
 Binary files musicstreaming/music.xcdatamodeld/music.xcdatamodel/layout	2011-06-13 19:00:38 +0000 and musicstreaming/music.xcdatamodeld/music.xcdatamodel/layout	2011-06-21 18:28:35 +0000 differ
=== modified file 'musicstreaming/utilities/AlbumParser.m'
--- musicstreaming/utilities/AlbumParser.m	2011-06-14 17:06:21 +0000
+++ musicstreaming/utilities/AlbumParser.m	2011-06-21 18:28:35 +0000
@@ -71,6 +71,7 @@
 			song.duration = [numberFormatter numberFromString:[attributeDict nilifiedValueForKey:@"duration"]];
 			song.bitRate = [numberFormatter numberFromString:[attributeDict nilifiedValueForKey:@"bitRate"]];
 			song.track = [numberFormatter numberFromString:[attributeDict nilifiedValueForKey:@"track"]];
+			song.discNumber = [numberFormatter numberFromString:[attributeDict nilifiedValueForKey:@"disc_number"]];
 			song.year = [numberFormatter numberFromString:[attributeDict nilifiedValueForKey:@"year"]];
 			song.size = [numberFormatter numberFromString:[attributeDict nilifiedValueForKey:@"size"]];
 			
 
=== modified file 'musicstreaming/utilities/Globals.h'
--- musicstreaming/utilities/Globals.h	2011-06-07 09:20:03 +0000
+++ musicstreaming/utilities/Globals.h	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/13/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <Foundation/Foundation.h>
 
 
=== modified file 'musicstreaming/utilities/Globals.m'
--- musicstreaming/utilities/Globals.m	2011-06-07 09:20:03 +0000
+++ musicstreaming/utilities/Globals.m	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/13/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "Globals.h"
 
 
=== modified file 'musicstreaming/utilities/PlaylistListParser.m'
--- musicstreaming/utilities/PlaylistListParser.m	2011-05-27 18:23:44 +0000
+++ musicstreaming/utilities/PlaylistListParser.m	2011-06-21 18:28:35 +0000
@@ -37,15 +37,21 @@
 	}
 	else if ([elementName isEqualToString:@"playlist"]) 
 	{
-		if (![Playlist playlistWithIdExists:[attributeDict objectForKey:@"id"]] && ![[attributeDict objectForKey:@"title"] isEqual:@".AppleDouble"])
-		{
-			Playlist *playlist = [NSEntityDescription insertNewObjectForEntityForName:@"Playlist" inManagedObjectContext:PerThreadManagedObjectContext()];
-			
-            playlist.name = [attributeDict objectForKey:@"name"];
-            playlist.playlistId = [attributeDict objectForKey:@"id"];
-            
-   			SaveContext();
-        }
+		Playlist *playlist = nil;
+		
+		if (![Playlist playlistWithNameExists:[attributeDict objectForKey:@"name"]] && ![[attributeDict objectForKey:@"title"] isEqual:@".AppleDouble"])
+		{
+			playlist = [NSEntityDescription insertNewObjectForEntityForName:@"Playlist" inManagedObjectContext:PerThreadManagedObjectContext()];
+		}
+		else
+		{
+			playlist = [Playlist playlistWithName:[attributeDict objectForKey:@"name"]];
+		}
+
+		playlist.name = [attributeDict objectForKey:@"name"];
+		playlist.playlistId = [attributeDict objectForKey:@"id"];
+		
+		SaveContext();
     }
 }
 
 
=== modified file 'musicstreaming/utilities/PlaylistParser.h'
--- musicstreaming/utilities/PlaylistParser.h	2011-05-27 18:23:44 +0000
+++ musicstreaming/utilities/PlaylistParser.h	2011-06-21 18:28:35 +0000
@@ -24,9 +24,9 @@
 @interface PlaylistParser : NSObject <NSXMLParserDelegate>
 {
     Playlist *playlist;
-	NSMutableArray *songs;
+	NSMutableSet *songs;
 	NSNumberFormatter *numberFormatter;
 }
 @property(nonatomic,retain) NSManagedObjectID *playlistObjectId;
-@property(nonatomic,retain) NSMutableArray *songs;
+@property(nonatomic,retain) NSMutableSet *songs;
 @end
 
=== modified file 'musicstreaming/utilities/PlaylistParser.m'
--- musicstreaming/utilities/PlaylistParser.m	2011-05-27 18:23:44 +0000
+++ musicstreaming/utilities/PlaylistParser.m	2011-06-21 18:28:35 +0000
@@ -20,6 +20,7 @@
 #import "PlaylistParser.h"
 #import "Playlist.h"
 #import "Song.h"
+#import "PlaylistSongIndex.h"
 #import "NSDictionary+Extras.h"
 
 @implementation PlaylistParser
@@ -30,7 +31,7 @@
 {
 	if ((self = [super init]))
 	{
-        songs = [[NSMutableArray alloc] init];
+        songs = [[NSMutableSet alloc] init];
         numberFormatter = [[NSNumberFormatter alloc] init];
 	}		
 	return self;
@@ -76,11 +77,14 @@
 			
 		}
 
-        // do something with the order of songs.
-        [song addPlaylistEntitiesObject:playlist];
-        [playlist addSongsObject:song];			
-		SaveContext();
+		PlaylistSongIndex *playlistSongIndex = [NSEntityDescription insertNewObjectForEntityForName:@"PlaylistSongIndex" inManagedObjectContext:PerThreadManagedObjectContext()];
+		playlistSongIndex.playlistEntity = playlist;
+		playlistSongIndex.songEntity = song;
+		playlistSongIndex.index = [NSNumber numberWithUnsignedInt:[songs count]];
+		[songs addObject:playlistSongIndex];
     }
+	playlist.playlistSongIndexes = songs;
+	SaveContext();
 }
 
 - (void) dealloc 
 
=== modified file 'musicstreaming/utilities/Subsonic.h'
--- musicstreaming/utilities/Subsonic.h	2011-06-14 17:06:21 +0000
+++ musicstreaming/utilities/Subsonic.h	2011-06-21 18:28:35 +0000
@@ -42,7 +42,7 @@
 + (Subsonic *)sharedSubsonic;
 - (NSURL *)getCredsURL;
 - (NSURL *)getBaseURL:(NSString *)action;
-- (NSURL *)getBaseURL:(NSString *)action parameters:(NSSet*)extraParameters;
+- (NSURL *)getBaseURL:(NSString *)action parameters:(NSArray*)extraParameters;
 - (NSURL *)getStreamingURLForSongId:(NSString*)songId;
 - (void)removeCredentials;
 - (void)storeUsername:(NSString*)username password:(NSString*)password;
 
=== modified file 'musicstreaming/utilities/Subsonic.m'
--- musicstreaming/utilities/Subsonic.m	2011-06-14 17:06:21 +0000
+++ musicstreaming/utilities/Subsonic.m	2011-06-21 18:28:35 +0000
@@ -22,7 +22,7 @@
 #include <netinet/in.h> 
 #include <netdb.h>
 #include <arpa/inet.h>
-#import "NSMutableSet+Extras.h"
+#import "NSMutableArray+Extras.h"
 #import "Reachability.h"
 
 @interface Subsonic ()
@@ -42,9 +42,7 @@
 	if ((self = [super init]))
 	{
         self.defaultURL = @"https://streaming.one.ubuntu.com/rest";
-//        self.defaultURL = @"http://10.59.1.19:35204/musicstreaming/rest";
         self.credsURL = @"https://one.ubuntu.com/phones/creds/ios?scheme=x-ubuntuone-music";
-//        self.credsURL = @"http://10.59.1.19:41858/phones/creds/ios?scheme=x-ubuntuone-music";
 		self.reachability = [Reachability reachabilityWithHostName:[[NSURL URLWithString:self.defaultURL] host]];
 		[self.reachability startNotifer];
 	}
@@ -98,7 +96,7 @@
 
 - (NSURL *)getStreamingURLForSongId:(NSString*)songId
 {
-    NSMutableSet *parameters = [NSMutableSet set];
+    NSMutableArray *parameters = [NSMutableArray array];
     [parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", songId, nil]];
 	return [self getBaseURL:@"stream.view" parameters:parameters];
 }
@@ -113,11 +111,11 @@
 	return [self getBaseURL:action parameters:nil];
 }
 
-- (NSURL *)getBaseURL:(NSString *)action parameters:(NSSet*)extraParameters
+- (NSURL *)getBaseURL:(NSString *)action parameters:(NSArray*)extraParameters
 {
 	if (self.defaultUserName && self.defaultPassword)
 	{
-		NSMutableSet *params = [NSMutableSet setWithSet:extraParameters];
+		NSMutableArray *params = [NSMutableArray arrayWithArray:extraParameters];
 		
 		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"u", self.defaultUserName, nil]];
 		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"p", self.defaultPassword, nil]];
@@ -125,7 +123,6 @@
 		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"c", @"iSub", nil]];
         
 		NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@?%@", self.defaultURL, action, [params urlEncodedString]]];
-        NSLog(@"URL generated: %@", url);
         return url;
 	}
 	else
 
=== modified file 'musicstreaming/utilities/operations/AbstractNetworkOperation.h'
--- musicstreaming/utilities/operations/AbstractNetworkOperation.h	2011-05-13 05:54:19 +0000
+++ musicstreaming/utilities/operations/AbstractNetworkOperation.h	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/12/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <Foundation/Foundation.h>
 
 
=== modified file 'musicstreaming/utilities/operations/AbstractNetworkOperation.m'
--- musicstreaming/utilities/operations/AbstractNetworkOperation.m	2011-06-16 16:52:07 +0000
+++ musicstreaming/utilities/operations/AbstractNetworkOperation.m	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/12/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "AbstractNetworkOperation.h"
 
 
=== modified file 'musicstreaming/utilities/operations/AlbumArtLoader.h'
--- musicstreaming/utilities/operations/AlbumArtLoader.h	2011-05-27 18:20:22 +0000
+++ musicstreaming/utilities/operations/AlbumArtLoader.h	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/4/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <UIKit/UIKit.h>
 #import "AlbumArtLoadingOperation.h"
 
=== modified file 'musicstreaming/utilities/operations/AlbumArtLoader.m'
--- musicstreaming/utilities/operations/AlbumArtLoader.m	2011-06-07 09:20:03 +0000
+++ musicstreaming/utilities/operations/AlbumArtLoader.m	2011-06-21 18:28:35 +0000
@@ -3,12 +3,23 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/4/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "AlbumArtLoader.h"
 #import "Subsonic.h"
-#import "NSMutableSet+Extras.h"
+#import "NSMutableArray+Extras.h"
 #import "UIImage+Resize.h"
 
 @interface AlbumArtLoader ()
@@ -117,7 +128,7 @@
 
 - (NSString*)URLFromCoverArtID:(NSString*)artID
 {
-	NSMutableSet *parameters = [NSMutableSet set];
+	NSMutableArray *parameters = [NSMutableArray array];
 	[parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", artID, nil]];
 
 	// Always get the largest we can handle
 
=== modified file 'musicstreaming/utilities/operations/AlbumArtLoadingOperation.h'
--- musicstreaming/utilities/operations/AlbumArtLoadingOperation.h	2011-05-27 18:20:22 +0000
+++ musicstreaming/utilities/operations/AlbumArtLoadingOperation.h	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/4/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <UIKit/UIKit.h>
 #import "AbstractNetworkOperation.h"
 
=== modified file 'musicstreaming/utilities/operations/AlbumArtLoadingOperation.m'
--- musicstreaming/utilities/operations/AlbumArtLoadingOperation.m	2011-06-07 09:20:03 +0000
+++ musicstreaming/utilities/operations/AlbumArtLoadingOperation.m	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/4/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // adapted from http://www.dribin.org/dave/blog/archives/2009/05/05/concurrent_operations/
 
 
=== modified file 'musicstreaming/utilities/operations/DownloadOperation.h'
--- musicstreaming/utilities/operations/DownloadOperation.h	2011-05-13 06:58:25 +0000
+++ musicstreaming/utilities/operations/DownloadOperation.h	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/12/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <UIKit/UIKit.h>
 #import "AbstractNetworkOperation.h"
 
=== modified file 'musicstreaming/utilities/operations/DownloadOperation.m'
--- musicstreaming/utilities/operations/DownloadOperation.m	2011-05-13 06:58:25 +0000
+++ musicstreaming/utilities/operations/DownloadOperation.m	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/12/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "DownloadOperation.h"
 
 
=== modified file 'musicstreaming/utilities/operations/Downloader.h'
--- musicstreaming/utilities/operations/Downloader.h	2011-06-13 19:00:38 +0000
+++ musicstreaming/utilities/operations/Downloader.h	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/12/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import <UIKit/UIKit.h>
 #import "DownloadOperation.h"
 
=== modified file 'musicstreaming/utilities/operations/Downloader.m'
--- musicstreaming/utilities/operations/Downloader.m	2011-06-14 17:20:13 +0000
+++ musicstreaming/utilities/operations/Downloader.m	2011-06-21 18:28:35 +0000
@@ -3,8 +3,19 @@
 //  iSub
 //
 //  Created by Aaron Brethorst on 5/12/11.
-//  Copyright 2011 Canonical. All rights reserved.
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
 //
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "Downloader.h"
 #import "DownloadOperation.h"
 
=== modified file 'musicstreaming/view_controllers/ArtistViewController.m'
--- musicstreaming/view_controllers/ArtistViewController.m	2011-06-16 19:12:54 +0000
+++ musicstreaming/view_controllers/ArtistViewController.m	2011-06-21 18:28:35 +0000
@@ -120,7 +120,6 @@
 - (void)finishLoadingData
 {
 	[self.tableView reloadData];
-	[self hideLoadingUI];
 	[super finishLoadingData];
 }
 
 
=== modified file 'musicstreaming/view_controllers/PlaylistEditAlbumViewController.m'
--- musicstreaming/view_controllers/PlaylistEditAlbumViewController.m	2011-05-27 18:37:16 +0000
+++ musicstreaming/view_controllers/PlaylistEditAlbumViewController.m	2011-06-21 18:28:35 +0000
@@ -87,11 +87,11 @@
     UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
 
     if (cell.accessoryType == UITableViewCellAccessoryNone) {
-        [self.originator.playlist addSongsObject:selection];
+        [self.originator.playlist addSong:selection];
         cell.accessoryType = UITableViewCellAccessoryCheckmark;
 
     } else {
-        [self.originator.playlist removeSongsObject:selection];
+        [self.originator.playlist removeSong:selection];
         cell.accessoryType = UITableViewCellAccessoryNone;
     }
 
 
=== modified file 'musicstreaming/view_controllers/PlaylistEditSongListViewController.m'
--- musicstreaming/view_controllers/PlaylistEditSongListViewController.m	2011-05-27 18:37:16 +0000
+++ musicstreaming/view_controllers/PlaylistEditSongListViewController.m	2011-06-21 18:28:35 +0000
@@ -19,6 +19,7 @@
 
 #import "PlaylistEditSongListViewController.h"
 #import "PlaylistEditViewController.h"
+#import "PlaylistSongIndex.h"
 #import "Playlist.h"
 #import "Song.h"
 
@@ -104,11 +105,12 @@
     UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
 
     if (cell.accessoryType == UITableViewCellAccessoryNone) {
-        [self.originator.playlist addSongsObject:selection];
+        [self.originator.playlist addSong:selection];
         cell.accessoryType = UITableViewCellAccessoryCheckmark;
 
     } else {
-        [self.originator.playlist removeSongsObject:selection];
+		
+        [self.originator.playlist removeSong:selection];
         cell.accessoryType = UITableViewCellAccessoryNone;
     }
 
 
=== modified file 'musicstreaming/view_controllers/PlaylistEditViewController.h'
--- musicstreaming/view_controllers/PlaylistEditViewController.h	2011-04-19 01:55:39 +0000
+++ musicstreaming/view_controllers/PlaylistEditViewController.h	2011-06-21 18:28:35 +0000
@@ -22,16 +22,14 @@
 @class Playlist;
 @class SubsonicTableViewController;
 
-@interface PlaylistEditViewController : UIViewController <UITabBarControllerDelegate>
+@interface PlaylistEditViewController : UITabBarController
 {
     Playlist *playlist;
     SubsonicTableViewController *originator;
-    UITabBarController *tabBarController;
 }
-+ (UINavigationController *)navigableViewControllerWithPlaylist:(Playlist *)playlist originator:(SubsonicTableViewController *)originator;
++ (PlaylistEditViewController *)playlistEditViewControllerWithPlaylist:(Playlist *)playlist originator:(SubsonicTableViewController *)originator;
 - (id)initWithPlaylist:(Playlist *)aPlaylist;
 - (void)finish:(id)sender;
 @property(nonatomic,retain) Playlist *playlist;
 @property(nonatomic,retain) SubsonicTableViewController *originator;
-@property(nonatomic,retain) IBOutlet UITabBarController *tabBarController;
 @end
 
=== modified file 'musicstreaming/view_controllers/PlaylistEditViewController.m'
--- musicstreaming/view_controllers/PlaylistEditViewController.m	2011-05-27 18:37:16 +0000
+++ musicstreaming/view_controllers/PlaylistEditViewController.m	2011-06-21 18:28:35 +0000
@@ -27,51 +27,33 @@
 #import "Playlist.h"
 #import "Song.h"
 #import "SongListParser.h"
-#import "NSMutableSet+Extras.h"
+#import "NSMutableArray+Extras.h"
 
 @implementation PlaylistEditViewController
-@synthesize playlist, originator, tabBarController;
+@synthesize playlist, originator;
 
-+ (UINavigationController *)navigableViewControllerWithPlaylist:(Playlist *)playlist originator:(SubsonicTableViewController *)originator
++ (PlaylistEditViewController *)playlistEditViewControllerWithPlaylist:(Playlist *)playlist originator:(SubsonicTableViewController *)originator
 {
     PlaylistEditViewController *playlistEditViewController = [[[PlaylistEditViewController alloc] initWithPlaylist:playlist] autorelease];
     playlistEditViewController.originator = originator;
-    UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:playlistEditViewController] autorelease];
-    nav.navigationBarHidden = YES;
-    return nav;
+    return playlistEditViewController;
 }
 
 - (id)initWithPlaylist:(Playlist *)aPlaylist
 {
-	if ((self = [super initWithNibName:@"PlaylistEditViewController" bundle:nil]))
+	if ((self = [super initWithNibName:nil bundle:nil]))
     {
 		self.playlist = aPlaylist;
         self.originator = nil;
+
+		// Hacky way to avoid the strange push-down of the tab bar buttons
+//		self.view.frame = CGRectMake(0, 0, 320, 460);
+    
+		[self setViewControllers:[NSArray arrayWithObjects:[PlaylistEditArtistListViewController navigableViewControllerWithOriginator:self], [PlaylistEditAlbumListViewController navigableViewControllerWithOriginator:self], [PlaylistEditSongListViewController navigableViewControllerWithOriginator:self], nil] animated:YES];
     }
     return self;
 }
 
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    // Hacky way to avoid the strange push-down of the tab bar buttons
-    tabBarController.view.frame = CGRectMake(0, 0, 320, 460);
-    
-    [self.view addSubview:[tabBarController view]];
-        
-    [tabBarController setViewControllers:[NSArray arrayWithObjects:[PlaylistEditArtistListViewController navigableViewControllerWithOriginator:self], [PlaylistEditAlbumListViewController navigableViewControllerWithOriginator:self], [PlaylistEditSongListViewController navigableViewControllerWithOriginator:self], nil] animated:YES];
-
-    tabBarController.delegate = self;   
-}
-
-#pragma mark - UITabBarControllerDelegate
-
-- (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController
-{
-    self.navigationItem.title = viewController.title;
-}
-
 #pragma mark - Memory management
 
 - (void)dealloc
@@ -84,7 +66,7 @@
 
 - (void)finish:(id)sender
 {
-    NSMutableSet *extraParameters = [NSMutableSet set];
+    NSMutableArray *extraParameters = [NSMutableArray array];
     if (nil != self.playlist.playlistId)
     {
         [extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"playlistId", self.playlist.playlistId, nil]];
 
=== modified file 'musicstreaming/view_controllers/PlaylistListViewController.m'
--- musicstreaming/view_controllers/PlaylistListViewController.m	2011-06-16 19:12:54 +0000
+++ musicstreaming/view_controllers/PlaylistListViewController.m	2011-06-21 18:28:35 +0000
@@ -46,17 +46,17 @@
 {
 	if ((self = [super initWithTitle:title]))
     {
-//        UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0,0,320,40)];
-//        header.autoresizingMask = UIViewAutoresizingFlexibleWidth;
-//        
-//        UIButton *createButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-//        createButton.frame = CGRectMake(5, 5, 310, 30);
-//        [createButton setTitle:NSLocalizedString(@"Create new playlist", @"") forState:UIControlStateNormal];
-//        [createButton addTarget:self action:@selector(createNewPlaylist) forControlEvents:UIControlEventTouchUpInside];
-//		[header addSubview:createButton];
-//		
-//        self.tableView.tableHeaderView = header;
-//        [header release];
+        UIView *header = [[UIView alloc] initWithFrame:CGRectMake(0,0,320,40)];
+        header.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+        
+        UIButton *createButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+        createButton.frame = CGRectMake(5, 5, 310, 30);
+        [createButton setTitle:NSLocalizedString(@"Create new playlist", @"") forState:UIControlStateNormal];
+        [createButton addTarget:self action:@selector(createNewPlaylist) forControlEvents:UIControlEventTouchUpInside];
+		[header addSubview:createButton];
+		
+        self.tableView.tableHeaderView = header;
+        [header release];
     }
     return self;
 }
@@ -142,8 +142,8 @@
 	{
         Playlist *playlist = [NSEntityDescription insertNewObjectForEntityForName:@"Playlist" inManagedObjectContext:PerThreadManagedObjectContext()];
         playlist.name = [(AlertPrompt *)alertPrompt enteredText];
-        UINavigationController *playlistEditViewController = [PlaylistEditViewController navigableViewControllerWithPlaylist:playlist originator:self];
-        playlistEditViewController.navigationBar.barStyle = UIBarStyleBlack;
+		SaveContext();
+        PlaylistEditViewController *playlistEditViewController = [PlaylistEditViewController playlistEditViewControllerWithPlaylist:playlist originator:self];
         [self.navigationController presentModalViewController:playlistEditViewController animated:YES];
 	}
     else
 
=== modified file 'musicstreaming/view_controllers/PlaylistViewController.m'
--- musicstreaming/view_controllers/PlaylistViewController.m	2011-06-16 19:12:54 +0000
+++ musicstreaming/view_controllers/PlaylistViewController.m	2011-06-21 18:28:35 +0000
@@ -22,7 +22,11 @@
 #import "Playlist.h"
 #import "PlaylistParser.h"
 #import "Song.h"
-#import "NSMutableSet+Extras.h"
+#import "NSMutableArray+Extras.h"
+
+@interface PlaylistViewController ()
+- (void)deleteLocalPlaylist;
+@end
 
 @implementation PlaylistViewController
 
@@ -80,9 +84,9 @@
 		[self.songs removeAllObjects];
 		if ([self.playlist isKindOfClass:[NSManagedObject class]])
 			[PerThreadManagedObjectContext() refreshObject:self.playlist mergeChanges:YES]; //force the playlist to reload its set of songs from the persistent store.
-		[self.songs addObjectsFromArray:[self.playlist.songs allObjects]];
+		[self.songs addObjectsFromArray:self.playlist.songs];
         // this should sort based on something else (like the index on the playlist or something)
-		[self.songs sortUsingSelector:@selector(compare:)];
+//		[self.songs sortUsingSelector:@selector(compare:)];
 	}
 	
 	[self.tableView reloadData];
@@ -93,13 +97,16 @@
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	
-	NSError *error = [self.playlist loadSongs];
-	
-	if (error)
+	if (self.playlist.playlistId) // Protect against CouchDB access being down, at least allow for local playlists.
 	{
-		[self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:error waitUntilDone:NO];
+		NSError *error = [self.playlist loadSongs];
+	
+		if (error)
+		{
+			[self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:error waitUntilDone:NO];
+		}
 	}
-		
+	
 	[self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO];
 	[self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO];
 	[pool release];
@@ -204,38 +211,46 @@
 
 - (void)editPlaylist
 {
-    return;
-    // Need to figure out what to do here
-    UINavigationController *playlistEditViewController = [PlaylistEditViewController navigableViewControllerWithPlaylist:self.playlist originator:self];
-    playlistEditViewController.navigationBar.barStyle = UIBarStyleBlack;
+    PlaylistEditViewController *playlistEditViewController = [PlaylistEditViewController playlistEditViewControllerWithPlaylist:self.playlist originator:self];
     [self.navigationController presentModalViewController:playlistEditViewController animated:YES];
 }
 
 - (void)clearPlaylist
 {
-    return;
-    // Need to figure out what to do here
-    self.playlist.songs = [NSMutableArray array];
+    self.playlist.playlistSongIndexes = nil;
     self.songs = nil;
+	SaveContext();
     [self.tableView reloadData];
 }
 
 - (void)deletePlaylist
 {
-    // Need to figure out what to do here
-    NSMutableSet *extraParameters = [NSMutableSet set];
-    [extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlist.playlistId, nil]];
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"deletePlaylist.view" parameters:extraParameters];
-    NSURLRequest *request = [[[NSURLRequest alloc] initWithURL:url] autorelease];
-    NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:self];
-    [connection start];
+	if (self.playlist.playlistId)
+	{
+		NSMutableArray *extraParameters = [NSMutableArray array];
+		[extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlist.playlistId, nil]];
+		NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"deletePlaylist.view" parameters:extraParameters];
+		NSURLRequest *request = [[[NSURLRequest alloc] initWithURL:url] autorelease];
+		NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:self];
+		[connection start];
+	}
+	else
+	{
+		[self deleteLocalPlaylist];
+	}
 }
 
 - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
 {
-    [PerThreadManagedObjectContext() deleteObject:self.playlist];
-    [self.playlistListViewController performSelector:@selector(reload:) withObject:nil afterDelay:0.25];
-    [self.navigationController popViewControllerAnimated:YES];
+	[self deleteLocalPlaylist];
+}
+
+- (void)deleteLocalPlaylist
+{
+	[PerThreadManagedObjectContext() deleteObject:self.playlist];
+	SaveContext();
+	[self.playlistListViewController performSelector:@selector(reload:) withObject:nil afterDelay:0.25];
+	[self.navigationController popViewControllerAnimated:YES];
 }
 
 - (void)resetTableData:(id)sender
 
=== modified file 'musicstreaming/view_controllers/SongViewController.m'
--- musicstreaming/view_controllers/SongViewController.m	2011-06-13 17:22:43 +0000
+++ musicstreaming/view_controllers/SongViewController.m	2011-06-21 18:28:35 +0000
@@ -38,7 +38,6 @@
 #import <MediaPlayer/MediaPlayer.h>
 #import <CFNetwork/CFNetwork.h>
 #import "NSNumber+Extras.h"
-#import "NSMutableSet+Extras.h"
 
 @interface SongViewController (Private)
 //KVO-driven stuff
 
=== modified file 'musicstreaming/view_controllers/SubsonicTableViewController.h'
--- musicstreaming/view_controllers/SubsonicTableViewController.h	2011-06-16 19:12:54 +0000
+++ musicstreaming/view_controllers/SubsonicTableViewController.h	2011-06-21 18:28:35 +0000
@@ -21,13 +21,11 @@
 #import "PullRefreshTableViewController.h"
 #import "Subsonic.h"
 #import "Song.h"
-#import "MiniHudView.h"
 
 @class Album;
 
 @interface SubsonicTableViewController : PullRefreshTableViewController <UIAlertViewDelegate, UISearchDisplayDelegate, UISearchBarDelegate>
 {
-	MiniHudView *hudView;
 	BOOL showProgressHUD;
 	NSTimer *respondToRemoteTimer;
     NSMutableArray *tableData;
 
=== modified file 'musicstreaming/view_controllers/SubsonicTableViewController.m'
--- musicstreaming/view_controllers/SubsonicTableViewController.m	2011-06-16 19:14:45 +0000
+++ musicstreaming/view_controllers/SubsonicTableViewController.m	2011-06-21 18:28:35 +0000
@@ -22,7 +22,6 @@
 #import "SongViewController.h"
 #import "Subsonic.h"
 #import "Album.h"
-#import "NSMutableSet+Extras.h"
 #import "Reachability.h"
 #import "UONetworkStatusCoordinator.h"
 
@@ -65,7 +64,7 @@
 {
     [super viewDidLoad];
 
-    showProgressHUD = YES;
+	showProgressHUD = YES;
     respondToRemoteTimer = NULL;
 
     if (0 == [self.tableData count])
@@ -304,6 +303,7 @@
 {
 	[self hideLoadingUI];
     NSLog(@"Error loading data: %@", error);
+	// TODO: Get better error messages communicated to the user.
 //	[self showError:NSLocalizedString(@"Unable to load your music. Please check your Internet connection or account credentials and try again.",@"")];
 }
 
@@ -377,18 +377,6 @@
 	[self showMessage:errorMessage withTitle:NSLocalizedString(@"Error",@"")];
 }
 
-#pragma mark - MiniHudView
-
-- (MiniHudView*)hudView
-{
-	if (nil == hudView)
-	{
-		hudView = [[MiniHudView alloc] initWithFrame:CGRectMake(270, 386, 30, 30)];
-		[[UIApplication sharedApplication].keyWindow addSubview:self.hudView];
-	}
-	return hudView;
-}
-
 - (void)showLoadingUI
 {
 	if (showProgressHUD)
@@ -406,11 +394,7 @@
 
 - (void)hideLoadingUI
 {
-	if (showProgressHUD)
-	{
-		[self.hudView hide:YES];
-	}
-	else
+	if (!showProgressHUD)
 	{
 		[self stopLoading];
 		showProgressHUD = YES;
@@ -434,10 +418,8 @@
 - (void)dealloc
 {
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
-	[hudView hide:NO];
 	RELEASE_SAFELY(parserDelegate);
 	RELEASE_SAFELY(viewName);
-	RELEASE_SAFELY(hudView);
     RELEASE_SAFELY(tableData);
 	RELEASE_SAFELY(searchResults);
 
 
=== modified file 'musicstreaming/view_controllers/SubsonicViewController.m'
--- musicstreaming/view_controllers/SubsonicViewController.m	2011-06-16 15:26:22 +0000
+++ musicstreaming/view_controllers/SubsonicViewController.m	2011-06-21 18:28:35 +0000
@@ -72,19 +72,16 @@
 			case UIEventSubtypeRemoteControlPause:
 			case UIEventSubtypeRemoteControlTogglePlayPause:
 			{
-                NSLog(@"Got a remote command to play/pause");
 				[[StreamingPlayer sharedStreamingPlayer] playPauseSong];
 				break;
 			}
 			case UIEventSubtypeRemoteControlNextTrack:
 			{
-                NSLog(@"Got a remote command to skip to the next track");
 				[[StreamingPlayer sharedStreamingPlayer] jumpAhead:self.jumpBy];
 				break;
 			}
 			case UIEventSubtypeRemoteControlPreviousTrack:
 			{
-                NSLog(@"Got a remote command to go to previous track");
 				[[StreamingPlayer sharedStreamingPlayer] prevSong];
 				break;
 			}
 
=== removed file 'musicstreaming/xibs/PlaylistEditViewController.xib'
--- musicstreaming/xibs/PlaylistEditViewController.xib	2011-05-18 14:10:38 +0000
+++ musicstreaming/xibs/PlaylistEditViewController.xib	1970-01-01 00:00:00 +0000
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1056</int>
-		<string key="IBDocument.SystemVersion">10J869</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
-		<string key="IBDocument.HIToolboxVersion">461.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>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>IBUITabBar</string>
-			<string>IBUITabBarController</string>
-			<string>IBUIViewController</string>
-			<string>IBUIView</string>
-			<string>IBUITabBarItem</string>
-			<string>IBProxyObject</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<reference key="dict.values" ref="0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSNextKeyView"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUITabBarController" id="1031713869">
-				<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-					<int key="IBUIInterfaceOrientation">1</int>
-					<int key="interfaceOrientation">1</int>
-				</object>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-				<bool key="IBUIHorizontal">NO</bool>
-				<object class="IBUIViewController" key="IBUISelectedViewController" id="232609108">
-					<object class="IBUITabBarItem" key="IBUITabBarItem" id="647383633">
-						<string key="IBUITitle">Songs</string>
-						<object class="NSCustomResource" key="IBUIImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">songs.png</string>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
-					<reference key="IBUIParentViewController" ref="1031713869"/>
-					<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-					<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-						<int key="IBUIInterfaceOrientation">1</int>
-						<int key="interfaceOrientation">1</int>
-					</object>
-					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					<bool key="IBUIHorizontal">NO</bool>
-				</object>
-				<object class="NSMutableArray" key="IBUIViewControllers">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUIViewController" id="264906486">
-						<object class="IBUITabBarItem" key="IBUITabBarItem" id="798442073">
-							<string key="IBUITitle">Artists</string>
-							<object class="NSCustomResource" key="IBUIImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">artists.png</string>
-							</object>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						</object>
-						<reference key="IBUIParentViewController" ref="1031713869"/>
-						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-							<int key="IBUIInterfaceOrientation">1</int>
-							<int key="interfaceOrientation">1</int>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIHorizontal">NO</bool>
-					</object>
-					<object class="IBUIViewController" id="135598923">
-						<object class="IBUITabBarItem" key="IBUITabBarItem" id="738429249">
-							<string key="IBUITitle">Albums</string>
-							<object class="NSCustomResource" key="IBUIImage">
-								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">albums.png</string>
-							</object>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						</object>
-						<reference key="IBUIParentViewController" ref="1031713869"/>
-						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-							<int key="IBUIInterfaceOrientation">1</int>
-							<int key="interfaceOrientation">1</int>
-						</object>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIHorizontal">NO</bool>
-					</object>
-					<reference ref="232609108"/>
-				</object>
-				<object class="IBUITabBar" key="IBUITabBar" id="259355173">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">266</int>
-					<string key="NSFrame">{{0, 431}, {320, 49}}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSNextKeyView"/>
-					<object class="NSColor" key="IBUIBackgroundColor">
-						<int key="NSColorSpace">3</int>
-						<bytes key="NSWhite">MCAwAA</bytes>
-					</object>
-					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-				</object>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">tabBarController</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="1031713869"/>
-					</object>
-					<int key="connectionID">12</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="1031713869"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="259355173"/>
-							<reference ref="264906486"/>
-							<reference ref="135598923"/>
-							<reference ref="232609108"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Tab Bar Controller</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="259355173"/>
-						<reference key="parent" ref="1031713869"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="264906486"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="798442073"/>
-						</object>
-						<reference key="parent" ref="1031713869"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">7</int>
-						<reference key="object" ref="135598923"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="738429249"/>
-						</object>
-						<reference key="parent" ref="1031713869"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="738429249"/>
-						<reference key="parent" ref="135598923"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">9</int>
-						<reference key="object" ref="798442073"/>
-						<reference key="parent" ref="264906486"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="232609108"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="647383633"/>
-						</object>
-						<reference key="parent" ref="1031713869"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="647383633"/>
-						<reference key="parent" ref="232609108"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.CustomClassName</string>
-					<string>-2.CustomClassName</string>
-					<string>1.IBEditorWindowLastContentRect</string>
-					<string>1.IBPluginDependency</string>
-					<string>10.IBPluginDependency</string>
-					<string>11.IBPluginDependency</string>
-					<string>4.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>6.IBPluginDependency</string>
-					<string>7.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>PlaylistEditViewController</string>
-					<string>UIResponder</string>
-					<string>{{354, 412}, {320, 480}}</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">16</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
-			<integer value="3100" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>albums.png</string>
-				<string>artists.png</string>
-				<string>songs.png</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{30, 30}</string>
-				<string>{30, 30}</string>
-				<string>{30, 30}</string>
-			</object>
-		</object>
-		<string key="IBCocoaTouchPluginVersion">301</string>
-	</data>
-</archive>