Merge lp:~urbanape/ubuntuone-ios-client/all-albums-view into lp:ubuntuone-ios-client

[Zachery Bir]

This branch provides a client-side view for navigating all albums. It still needs a little work from the server side, but the albums are navigable.

[Aaron Brethorst (aaronbrethorst-deactivatedaccount)]

AlbumParser.m - should probably report errors to a delegate, which should in turn decide how to report errors instead of directly showing a UIAlertView. Better to remove UI presentation details from the parser. Use case: porting U1 Music to OS X will require you to use an NSAlert instead of a UIAlertView.

PlaylistEditViewController.m - + (UINavigationController *)navigableViewControllerWithPlaylist:(Playlist *)playlist delegate:(id)delegate -- the delegate parameter seems misleading, since it looks like delegate can only actually be a specific type (PlaylistListViewController). Instead, that parameter's type should probably just be a PlaylistListViewController*.

PlaylistListViewController.m - In - (void)alertView:(UIAlertView *)alertPrompt clickedButtonAtIndex:(NSInteger)buttonIndex, check for alertPrompt.cancelButtonIndex instead of looking for a magic value (1).

review: Approve

[lp:~urbanape/ubuntuone-ios-client/all-albums-view]

225. By Zachery Bir on 2011-04-08

Cleanup suggested by Aaron

226. By Zachery Bir on 2011-04-08

Normalized ID->Id, cleaned up some missing parameters work, and wrapped a parameter as a string

=== modified file 'musicstreaming/Other Sources/iSubAppDelegate.m'
--- musicstreaming/Other Sources/iSubAppDelegate.m	2011-04-01 03:07:39 +0000
+++ musicstreaming/Other Sources/iSubAppDelegate.m	2011-04-08 19:49:28 +0000
@@ -78,24 +78,25 @@
     UINavigationController *nav = nil;
     NSMutableArray *viewControllers = [NSMutableArray array];
     
-    ArtistListViewController *artistListViewController = [[ArtistListViewController alloc] initWithTitle:NSLocalizedString(@"Artists", @"")];
-    nav = [[UINavigationController alloc] initWithRootViewController:artistListViewController];
-    [viewControllers addObject:nav];
-
-    AlbumListViewController *albumListViewController = [[AlbumListViewController alloc] initWithTitle:NSLocalizedString(@"Albums", @"")];
-    nav = [[UINavigationController alloc] initWithRootViewController:albumListViewController];
-    [viewControllers addObject:nav];
-
-    SongListViewController *songListViewController = [[SongListViewController alloc] initWithTitle:NSLocalizedString(@"Songs", @"")];
-    nav = [[UINavigationController alloc] initWithRootViewController:songListViewController];
-    [viewControllers addObject:nav];
-
-    PlaylistListViewController *playlistListViewController = [[PlaylistListViewController alloc] initWithTitle:NSLocalizedString(@"Playlists", @"")];
-    nav = [[UINavigationController alloc] initWithRootViewController:playlistListViewController];
-    [viewControllers addObject:nav];
-
-    SettingsViewController *settingsViewController = [[SettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
-    nav = [[UINavigationController alloc] initWithRootViewController:settingsViewController];
+    ArtistListViewController *artistListViewController = [[[ArtistListViewController alloc] initWithTitle:NSLocalizedString(@"Artists", @"")] autorelease];
+    nav = [[[UINavigationController alloc] initWithRootViewController:artistListViewController] autorelease];
+    [viewControllers addObject:nav];
+
+    AlbumListViewController *albumListViewController = [[[AlbumListViewController alloc] initWithTitle:NSLocalizedString(@"Albums", @"")] autorelease];
+    nav = [[[UINavigationController alloc] initWithRootViewController:albumListViewController] autorelease];
+    [viewControllers addObject:nav];
+
+    SongListViewController *songListViewController = [[[SongListViewController alloc] initWithTitle:NSLocalizedString(@"Songs", @"")] autorelease];
+    nav = [[[UINavigationController alloc] initWithRootViewController:songListViewController] autorelease];
+    [viewControllers addObject:nav];
+
+    PlaylistListViewController *playlistListViewController = [[[PlaylistListViewController alloc] initWithTitle:NSLocalizedString(@"Playlists", @"")] autorelease];
+    nav = [[[UINavigationController alloc] initWithRootViewController:playlistListViewController] autorelease];
+    [viewControllers addObject:nav];
+
+    SettingsViewController *settingsViewController = [[[SettingsViewController alloc] initWithStyle:UITableViewStyleGrouped] autorelease];
+    nav = [[[UINavigationController alloc] initWithRootViewController:settingsViewController] autorelease];
+    nav.navigationBar.barStyle = UIBarStyleBlack;
     [viewControllers addObject:nav];
 
     [tabBarController setViewControllers:viewControllers animated:YES];

=== added file 'musicstreaming/categories/NSMutableSet+Extras.h'
--- musicstreaming/categories/NSMutableSet+Extras.h	1970-01-01 00:00:00 +0000
+++ musicstreaming/categories/NSMutableSet+Extras.h	2011-04-08 19:49:28 +0000
@@ -0,0 +1,26 @@
+//
+//  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

=== added file 'musicstreaming/categories/NSMutableSet+Extras.m'
--- musicstreaming/categories/NSMutableSet+Extras.m	1970-01-01 00:00:00 +0000
+++ musicstreaming/categories/NSMutableSet+Extras.m	2011-04-08 19:49:28 +0000
@@ -0,0 +1,57 @@
+//
+//  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

=== added file 'musicstreaming/controls/AlertPrompt.h'
--- musicstreaming/controls/AlertPrompt.h	1970-01-01 00:00:00 +0000
+++ musicstreaming/controls/AlertPrompt.h	2011-04-08 19:49:28 +0000
@@ -0,0 +1,29 @@
+//
+//  AlertPrompt.h
+//  iSub
+//
+//  Created by Zachery Bir on 4/4/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 AlertPrompt : UIAlertView 
+{
+    UITextField *textField;
+}
+@property (nonatomic, retain) UITextField *textField;
+@property (readonly) NSString *enteredText;
+- (id)initWithTitle:(NSString *)title placeholder:(NSString *)placeholder message:(NSString *)message delegate:(id)delegate cancelButtonTitle:(NSString *)cancelButtonTitle okButtonTitle:(NSString *)okButtonTitle;
+@end

=== added file 'musicstreaming/controls/AlertPrompt.m'
--- musicstreaming/controls/AlertPrompt.m	1970-01-01 00:00:00 +0000
+++ musicstreaming/controls/AlertPrompt.m	2011-04-08 19:49:28 +0000
@@ -0,0 +1,58 @@
+//
+//  AlertPrompt.m
+//  iSub
+//
+//  Created by Zachery Bir on 4/4/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 "AlertPrompt.h"
+
+@implementation AlertPrompt
+@synthesize textField;
+@synthesize enteredText;
+
+- (id)initWithTitle:(NSString *)title placeholder:(NSString *)placeholder message:(NSString *)message delegate:(id)delegate cancelButtonTitle:(NSString *)cancelButtonTitle okButtonTitle:(NSString *)okayButtonTitle
+{
+
+    if ((self = [super initWithTitle:title message:message delegate:delegate cancelButtonTitle:cancelButtonTitle otherButtonTitles:okayButtonTitle, nil]))
+    {
+        UITextField *theTextField = [[UITextField alloc] initWithFrame:CGRectMake(12.0, 45.0, 260.0, 25.0)]; 
+        theTextField.placeholder = placeholder;
+        theTextField.backgroundColor = [UIColor clearColor];
+        theTextField.borderStyle = UITextBorderStyleRoundedRect;
+        [self addSubview:theTextField];
+        self.textField = theTextField;
+        [theTextField release];
+    }
+    return self;
+}
+
+- (void)show
+{
+    [textField becomeFirstResponder];
+    [super show];
+}
+
+- (NSString *)enteredText
+{
+    return textField.text;
+}
+
+- (void)dealloc
+{
+    [textField release];
+    [super dealloc];
+}
+@end

=== modified file 'musicstreaming/iSub.xcodeproj/project.pbxproj'
--- musicstreaming/iSub.xcodeproj/project.pbxproj	2011-04-01 14:55:49 +0000
+++ musicstreaming/iSub.xcodeproj/project.pbxproj	2011-04-08 19:49:28 +0000
@@ -18,10 +18,15 @@
 		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 */; };
+		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 */; };
 		9123D1A113257ADF00B40210 /* PlaylistListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1A013257ADF00B40210 /* PlaylistListViewController.m */; };
 		9123D1BB13280B3400B40210 /* PlaylistViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1BA13280B3400B40210 /* PlaylistViewController.m */; };
 		9123D1C3132816D200B40210 /* PlaylistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9123D1C2132816D200B40210 /* PlaylistListParser.m */; };
 		912D1259134617F600721EE4 /* SongListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1258134617F600721EE4 /* SongListParser.m */; };
+		912D1264134A162000721EE4 /* AlertPrompt.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1263134A162000721EE4 /* AlertPrompt.m */; };
+		912D1267134B609700721EE4 /* PlaylistEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D1266134B609600721EE4 /* PlaylistEditViewController.m */; };
 		912D392213311F2700A443B2 /* AlbumListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392113311F2500A443B2 /* AlbumListViewController.m */; };
 		912D392613311FC600A443B2 /* SongListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 912D392513311FC400A443B2 /* SongListViewController.m */; };
 		91B3A4441344CF92006C8193 /* SubsonicIndexedTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3A4431344CF91006C8193 /* SubsonicIndexedTableViewController.m */; };
@@ -61,7 +66,7 @@
 		93D6B5151252CB34007880B0 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 93D6B5141252CB34007880B0 /* [e-mail] */; };
 		93D6B54B1252CE57007880B0 /* URLQueryStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */; };
 		93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2AEF124993F100E7E060 /* ArtistListParser.m */; };
-		93EE2BA31249F33D00E7E060 /* AlbumListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2BA21249F33D00E7E060 /* AlbumListParser.m */; };
+		93EE2BA31249F33D00E7E060 /* ArtistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2BA21249F33D00E7E060 /* ArtistParser.m */; };
 		93F334471247F9DE006C6707 /* SFHFKeychainUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334461247F9DE006C6707 /* SFHFKeychainUtils.m */; };
 		93F3344D1247FA0B006C6707 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344C1247FA0B006C6707 /* Reachability.m */; };
 		93F334521247FA2C006C6707 /* Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344F1247FA2C006C6707 /* Album.m */; };
@@ -112,6 +117,12 @@
 		53F675E1113B095900822059 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		53F675E7113B096400822059 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		8D1107310486CEB800E47090 /* iSub-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iSub-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; 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>"; };
 		9123D19F13257ADF00B40210 /* PlaylistListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistListViewController.h; sourceTree = "<group>"; };
 		9123D1A013257ADF00B40210 /* PlaylistListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistListViewController.m; sourceTree = "<group>"; };
 		9123D1B913280B3400B40210 /* PlaylistViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistViewController.h; sourceTree = "<group>"; };
@@ -120,6 +131,10 @@
 		9123D1C2132816D200B40210 /* PlaylistListParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistListParser.m; sourceTree = "<group>"; };
 		912D1257134617F600721EE4 /* SongListParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongListParser.h; sourceTree = "<group>"; };
 		912D1258134617F600721EE4 /* SongListParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SongListParser.m; sourceTree = "<group>"; };
+		912D1262134A162000721EE4 /* AlertPrompt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlertPrompt.h; sourceTree = "<group>"; };
+		912D1263134A162000721EE4 /* AlertPrompt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlertPrompt.m; sourceTree = "<group>"; };
+		912D1265134B609500721EE4 /* PlaylistEditViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistEditViewController.h; sourceTree = "<group>"; };
+		912D1266134B609600721EE4 /* PlaylistEditViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PlaylistEditViewController.m; sourceTree = "<group>"; };
 		912D392013311F2400A443B2 /* AlbumListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlbumListViewController.h; sourceTree = "<group>"; };
 		912D392113311F2500A443B2 /* AlbumListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlbumListViewController.m; sourceTree = "<group>"; };
 		912D392413311FC400A443B2 /* SongListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SongListViewController.h; sourceTree = "<group>"; };
@@ -182,8 +197,8 @@
 		93D6B54A1252CE57007880B0 /* URLQueryStringParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLQueryStringParser.m; sourceTree = "<group>"; };
 		93EE2AEE124993F100E7E060 /* ArtistListParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtistListParser.h; sourceTree = "<group>"; };
 		93EE2AEF124993F100E7E060 /* ArtistListParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistListParser.m; sourceTree = "<group>"; };
-		93EE2BA11249F33D00E7E060 /* AlbumListParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlbumListParser.h; sourceTree = "<group>"; };
-		93EE2BA21249F33D00E7E060 /* AlbumListParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AlbumListParser.m; sourceTree = "<group>"; };
+		93EE2BA11249F33D00E7E060 /* ArtistParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtistParser.h; sourceTree = "<group>"; };
+		93EE2BA21249F33D00E7E060 /* ArtistParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistParser.m; sourceTree = "<group>"; };
 		93F334451247F9DE006C6707 /* SFHFKeychainUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFHFKeychainUtils.h; sourceTree = "<group>"; };
 		93F334461247F9DE006C6707 /* SFHFKeychainUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFHFKeychainUtils.m; sourceTree = "<group>"; };
 		93F3344B1247FA0B006C6707 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
@@ -331,6 +346,8 @@
 				93D6B213124F0F62007880B0 /* NSNumber+Extras.m */,
 				93D6B2D1124FDA56007880B0 /* NSMutableArray+Extras.h */,
 				93D6B2D2124FDA56007880B0 /* NSMutableArray+Extras.m */,
+				9110DC3F134E4EEF0046B8E4 /* NSMutableSet+Extras.h */,
+				9110DC40134E4EEF0046B8E4 /* NSMutableSet+Extras.m */,
 			);
 			path = categories;
 			sourceTree = "<group>";
@@ -359,6 +376,8 @@
 				936F230912284D1900070F43 /* NamedTextFieldCell.m */,
 				936F1F2F12271B6500070F43 /* MBProgressHUD.h */,
 				936F1F3012271B6500070F43 /* MBProgressHUD.m */,
+				912D1262134A162000721EE4 /* AlertPrompt.h */,
+				912D1263134A162000721EE4 /* AlertPrompt.m */,
 			);
 			path = controls;
 			sourceTree = "<group>";
@@ -389,12 +408,16 @@
 				93F334461247F9DE006C6707 /* SFHFKeychainUtils.m */,
 				93EE2AEE124993F100E7E060 /* ArtistListParser.h */,
 				93EE2AEF124993F100E7E060 /* ArtistListParser.m */,
-				93EE2BA11249F33D00E7E060 /* AlbumListParser.h */,
-				93EE2BA21249F33D00E7E060 /* AlbumListParser.m */,
+				9110DC42134EAC720046B8E4 /* AlbumListParser.h */,
+				9110DC43134EAC730046B8E4 /* AlbumListParser.m */,
 				912D1257134617F600721EE4 /* SongListParser.h */,
 				912D1258134617F600721EE4 /* SongListParser.m */,
 				9123D1C1132816D200B40210 /* PlaylistListParser.h */,
 				9123D1C2132816D200B40210 /* PlaylistListParser.m */,
+				93EE2BA11249F33D00E7E060 /* ArtistParser.h */,
+				93EE2BA21249F33D00E7E060 /* ArtistParser.m */,
+				9110DC36134C04590046B8E4 /* AlbumParser.h */,
+				9110DC37134C04590046B8E4 /* AlbumParser.m */,
 				91E88607132DA82000618994 /* PlaylistParser.h */,
 				91E88608132DA82000618994 /* PlaylistParser.m */,
 				93BC5207124C181600B7587C /* Subsonic.h */,
@@ -451,6 +474,8 @@
 				912D392513311FC400A443B2 /* SongListViewController.m */,
 				9123D19F13257ADF00B40210 /* PlaylistListViewController.h */,
 				9123D1A013257ADF00B40210 /* PlaylistListViewController.m */,
+				912D1265134B609500721EE4 /* PlaylistEditViewController.h */,
+				912D1266134B609600721EE4 /* PlaylistEditViewController.m */,
 				93F3348D1247FCDC006C6707 /* ArtistViewController.h */,
 				93F3348E1247FCDC006C6707 /* ArtistViewController.m */,
 				93F3349B1247FCDC006C6707 /* AlbumViewController.h */,
@@ -620,7 +645,7 @@
 				93F334A71247FCDC006C6707 /* SubsonicTableViewController.m in Sources */,
 				9354D0AB1248267B00733067 /* NSDictionary+Extras.m in Sources */,
 				93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */,
-				93EE2BA31249F33D00E7E060 /* AlbumListParser.m in Sources */,
+				93EE2BA31249F33D00E7E060 /* ArtistParser.m in Sources */,
 				93BC5209124C181600B7587C /* Subsonic.m in Sources */,
 				93BC52A7124C1E6900B7587C /* StreamingPlayer.m in Sources */,
 				93BC53FB124C7C8D00B7587C /* DataCache.m in Sources */,
@@ -639,6 +664,11 @@
 				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 */,
+				9110DC41134E4EEF0046B8E4 /* NSMutableSet+Extras.m in Sources */,
+				9110DC44134EAC740046B8E4 /* AlbumListParser.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

=== modified file 'musicstreaming/models/Album.m'
--- musicstreaming/models/Album.m	2011-04-01 03:03:49 +0000
+++ musicstreaming/models/Album.m	2011-04-08 19:49:28 +0000
@@ -57,22 +57,20 @@
 
 - (void)encodeWithCoder:(NSCoder*)encoder
 {
-	[encoder encodeObject:title];
-	[encoder encodeObject:albumId];
-	[encoder encodeObject:coverArtId];
+	[encoder encodeObject:title forKey:@"title"];
+	[encoder encodeObject:albumId forKey:@"albumId"];
+	[encoder encodeObject:coverArtId forKey:@"coverArtId"];
 }
 
-
 - (id)initWithCoder:(NSCoder*)decoder
 {
-	title = [[decoder decodeObject] retain];
-	albumId = [[decoder decodeObject] retain];
-	coverArtId = [[decoder decodeObject] retain];
+	title = [[decoder decodeObjectForKey:@"title"] retain];
+	albumId = [[decoder decodeObjectForKey:@"albumId"] retain];
+	coverArtId = [[decoder decodeObjectForKey:@"coverArtId"] retain];
 	
 	return self;
 }
 
-
 - (void) dealloc
 {
 	[title release];

=== modified file 'musicstreaming/models/Playlist.h'
--- musicstreaming/models/Playlist.h	2011-04-01 03:03:49 +0000
+++ musicstreaming/models/Playlist.h	2011-04-08 19:49:28 +0000
@@ -20,16 +20,16 @@
 #import <Foundation/Foundation.h>
 
 
-@interface Playlist : NSObject
+@interface Playlist : NSObject <NSCoding>
 {
-	NSString *playlistID;
+	NSString *playlistId;
 	NSString *name;
 	NSMutableArray *contents;
 }
-@property(nonatomic,retain) NSString *playlistID;
+@property(nonatomic,retain) NSString *playlistId;
 @property(nonatomic,retain) NSString *name;
 @property(nonatomic,retain) NSMutableArray *contents;
-- (id)initWithDictionary:(NSDictionary*)dict;
+- (id)initWithCoder:(NSCoder *)aDecoder;
 - (BOOL)matchesSearchQuery:(NSString*)query;
 @end
 

=== modified file 'musicstreaming/models/Playlist.m'
--- musicstreaming/models/Playlist.m	2011-04-01 03:03:49 +0000
+++ musicstreaming/models/Playlist.m	2011-04-08 19:49:28 +0000
@@ -21,22 +21,39 @@
 
 @implementation Playlist
 
-@synthesize playlistID, name, contents;
+@synthesize playlistId, name, contents;
 
-- (id)initWithDictionary:(NSDictionary*)dict
+- (id)init
 {
 	if ((self = [super init]))
 	{
-		self.playlistID = [dict objectForKey:@"id"];
-		self.name = [dict objectForKey:@"name"];
+		self.playlistId = nil;
+		self.name = nil;
 		self.contents = [NSMutableArray array];
 	}
 	return self;
 }
 
+- (void)encodeWithCoder:(NSCoder*)encoder
+{
+	[encoder encodeObject:playlistId forKey:@"playlistId"];
+	[encoder encodeObject:name forKey:@"name"];
+	[encoder encodeObject:contents forKey:@"contents"];
+}
+
+
+- (id)initWithCoder:(NSCoder*)decoder
+{
+	playlistId = [[decoder decodeObjectForKey:@"playlistId"] retain];
+	name = [[decoder decodeObjectForKey:@"name"] retain];
+	contents = [[decoder decodeObjectForKey:@"contents"] retain];
+	
+	return self;
+}
+
 - (void)dealloc
 {
-	self.playlistID = NULL;
+	self.playlistId = NULL;
 	self.name = NULL;
 	self.contents = NULL;
 	

=== modified file 'musicstreaming/models/Song.m'
--- musicstreaming/models/Song.m	2011-04-01 03:03:49 +0000
+++ musicstreaming/models/Song.m	2011-04-08 19:49:28 +0000
@@ -67,36 +67,38 @@
 
 - (void)encodeWithCoder:(NSCoder*)encoder
 {
-	[encoder encodeObject: title];
-	[encoder encodeObject: songId];
-	[encoder encodeObject: artist];
-	[encoder encodeObject: album];
-	[encoder encodeObject: genre];
-	[encoder encodeObject: coverArtId];
-	[encoder encodeObject: path];
-	[encoder encodeObject: duration];
-	[encoder encodeObject: bitRate];
-	[encoder encodeObject: track];
-	[encoder encodeObject: year];
-	[encoder encodeObject: size];
+	[encoder encodeObject:title forKey:@"title"];
+	[encoder encodeObject:songId forKey:@"songId"];
+	[encoder encodeObject:artist forKey:@"artist"];
+	[encoder encodeObject:album forKey:@"album"];
+	[encoder encodeObject:genre forKey:@"genre"];
+	[encoder encodeObject:coverArtId forKey:@"coverArtId"];
+	[encoder encodeObject:path forKey:@"path"];
+	[encoder encodeObject:duration forKey:@"duration"];
+	[encoder encodeObject:bitRate forKey:@"bitRate"];
+	[encoder encodeObject:track forKey:@"track"];
+	[encoder encodeObject:year forKey:@"year"];
+	[encoder encodeObject:size forKey:@"size"];
 }
 
 
 -(id) initWithCoder: (NSCoder *) decoder
 {
-	title = [[decoder decodeObject] retain];
-	songId = [[decoder decodeObject] retain];
-	artist = [[decoder decodeObject] retain];
-	album = [[decoder decodeObject] retain];
-	genre = [[decoder decodeObject] retain];
-	coverArtId = [[decoder decodeObject] retain];
-	path = [[decoder decodeObject] retain];
-	duration = [[decoder decodeObject] retain];
-	bitRate = [[decoder decodeObject] retain];
-	track = [[decoder decodeObject] retain];
-	year = [[decoder decodeObject] retain];
-	size = [[decoder decodeObject] retain];
-	
+	if ((self = [super init]))
+	{
+        title = [[decoder decodeObjectForKey:@"title"] retain];
+        songId = [[decoder decodeObjectForKey:@"songId"] retain];
+        artist = [[decoder decodeObjectForKey:@"artist"] retain];
+        album = [[decoder decodeObjectForKey:@"album"] retain];
+        genre = [[decoder decodeObjectForKey:@"genre"] retain];
+        coverArtId = [[decoder decodeObjectForKey:@"coverArtId"] retain];
+        path = [[decoder decodeObjectForKey:@"path"] retain];
+        duration = [[decoder decodeObjectForKey:@"duration"] retain];
+        bitRate = [[decoder decodeObjectForKey:@"bitRate"] retain];
+        track = [[decoder decodeObjectForKey:@"track"] retain];
+        year = [[decoder decodeObjectForKey:@"year"] retain];
+        size = [[decoder decodeObjectForKey:@"size"] retain];
+    }	
 	return self;
 }
 

=== added file 'musicstreaming/utilities/AlbumListParser.h'
--- musicstreaming/utilities/AlbumListParser.h	1970-01-01 00:00:00 +0000
+++ musicstreaming/utilities/AlbumListParser.h	2011-04-08 19:49:28 +0000
@@ -0,0 +1,37 @@
+//
+//  AlbumListParser.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>
+
+@class Album;
+
+@interface AlbumListParser : NSObject <NSXMLParserDelegate>
+{
+	NSMutableArray *albums;
+	NSMutableArray *indexes;
+	Album *album;
+	NSString *index;
+	NSMutableDictionary *groupedAlbums;
+}
+@property(nonatomic,retain) NSMutableDictionary *groupedAlbums;
+@property(nonatomic,retain) NSMutableArray *albums;
+@property(nonatomic,retain) NSMutableArray *indexes;
+@property(nonatomic,retain) Album *album;
+@property(nonatomic,retain) NSString *index;
+@end

=== added file 'musicstreaming/utilities/AlbumListParser.m'
--- musicstreaming/utilities/AlbumListParser.m	1970-01-01 00:00:00 +0000
+++ musicstreaming/utilities/AlbumListParser.m	2011-04-08 19:49:28 +0000
@@ -0,0 +1,98 @@
+//
+//  AlbumListParser.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 "AlbumListParser.h"
+#import "Album.h"
+
+@implementation AlbumListParser
+
+@synthesize albums, indexes, groupedAlbums;
+@synthesize album, index;
+
+- (id)init 
+{
+	if ((self = [super init]))
+	{
+		albums = [[NSMutableArray alloc] init];
+		indexes = [[NSMutableArray alloc] init];
+		groupedAlbums = [[NSMutableDictionary alloc] init];
+		self.album = NULL;
+		self.index = NULL;
+	}		
+	return self;
+}
+
+
+- (void) subsonicErrorCode:(NSString *)errorCode message:(NSString *)message
+{
+	UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Error" message:message delegate:nil cancelButtonTitle:NSLocalizedString(@"Dismiss", @"") otherButtonTitles:nil];
+	[alert show];
+	[alert release];
+}
+
+
+- (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName attributes:(NSDictionary *)attributeDict 
+{
+	if ([elementName isEqualToString:@"error"])
+	{
+		[self subsonicErrorCode:[attributeDict objectForKey:@"code"] message:[attributeDict objectForKey:@"message"]];
+	}
+	else if ([elementName isEqualToString:@"index"]) //letters that appear on the right side of the table.
+	{
+		self.index = [attributeDict objectForKey:@"name"];
+		[indexes addObject:self.index];
+		[groupedAlbums setObject:[NSMutableArray array] forKey:self.index];
+	}
+	else if ([elementName isEqualToString:@"album"]) 
+	{
+		self.album = [[[Album alloc] init] autorelease];
+		self.album.title = [attributeDict objectForKey:@"title"];
+		self.album.albumId = [attributeDict objectForKey:@"id"];
+		
+        [albums addObject:self.album];
+        NSMutableArray *group = [groupedAlbums objectForKey:self.index];
+        [group addObject:self.album];
+	}
+}
+
+
+- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName 
+{
+	if ([elementName isEqualToString:@"album"]) 
+	{
+		self.album = NULL;
+	}
+	else if ([elementName isEqualToString:@"index"]) 
+	{
+		self.index = NULL;
+	}
+}
+
+
+- (void) dealloc 
+{
+	self.album = NULL;
+	self.index = NULL;
+	RELEASE_SAFELY(groupedAlbums);
+	RELEASE_SAFELY(albums);
+	RELEASE_SAFELY(indexes);
+	[super dealloc];
+}
+
+@end
\ No newline at end of file

=== added file 'musicstreaming/utilities/AlbumParser.h'
--- musicstreaming/utilities/AlbumParser.h	1970-01-01 00:00:00 +0000
+++ musicstreaming/utilities/AlbumParser.h	2011-04-08 19:49:28 +0000
@@ -0,0 +1,27 @@
+//
+//  AlbumParser.h
+//  iSub
+//
+//  Created by Zachery Bir on 4/5/11.
+//  Copyright 2011 Canonical. All rights reserved.
+//	
+//  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 AlbumParser : NSObject <NSXMLParserDelegate>
+{
+	NSMutableArray *songs;
+}
+@property(nonatomic,retain) NSMutableArray *songs;
+@end

=== added file 'musicstreaming/utilities/AlbumParser.m'
--- musicstreaming/utilities/AlbumParser.m	1970-01-01 00:00:00 +0000
+++ musicstreaming/utilities/AlbumParser.m	2011-04-08 19:49:28 +0000
@@ -0,0 +1,64 @@
+//
+//  AlbumParser.m
+//  iSub
+//
+//  Created by Zachery Bir on 4/5/11.
+//  Copyright 2011 Canonical. All rights reserved.
+//	
+//  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 "AlbumParser.h"
+#import "Album.h"
+#import "Song.h"
+
+@implementation AlbumParser
+
+@synthesize songs;
+
+- (id)init
+{
+	if ((self = [super init]))
+	{
+		songs = [[NSMutableArray alloc] init];
+	}
+	return self;
+}
+
+- (void) subsonicErrorCode:(NSString *)errorCode message:(NSString *)message
+{
+	UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Error" message:message delegate:nil cancelButtonTitle:NSLocalizedString(@"Dismiss", @"") otherButtonTitles:nil];
+	[alert show];
+	[alert release];
+}
+
+- (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName attributes:(NSDictionary *)attributeDict 
+{
+	if ([elementName isEqualToString:@"error"])
+	{
+		[self subsonicErrorCode:[attributeDict objectForKey:@"code"] message:[attributeDict objectForKey:@"message"]];
+	}
+	else if ([elementName isEqualToString:@"child"]) 
+	{
+        Song *song = [[Song alloc] initWithDictionary:attributeDict];
+        [self.songs addObject:song];
+        [song release];
+	}
+}
+
+- (void)dealloc
+{
+	[songs release];
+	[super dealloc];
+}
+
+@end

=== modified file 'musicstreaming/utilities/ArtistListParser.h'
--- musicstreaming/utilities/ArtistListParser.h	2011-03-29 14:22:42 +0000
+++ musicstreaming/utilities/ArtistListParser.h	2011-04-08 19:49:28 +0000
@@ -30,8 +30,8 @@
 	NSMutableDictionary *groupedArtists;
 }
 @property(nonatomic,retain) NSMutableDictionary *groupedArtists;
-@property(nonatomic,retain) NSArray *artists;
-@property(nonatomic,retain) NSArray *indexes;
+@property(nonatomic,retain) NSMutableArray *artists;
+@property(nonatomic,retain) NSMutableArray *indexes;
 @property(nonatomic,retain) Artist *artist;
 @property(nonatomic,retain) NSString *index;
 @end

=== renamed file 'musicstreaming/utilities/AlbumListParser.h' => 'musicstreaming/utilities/ArtistParser.h'
--- musicstreaming/utilities/AlbumListParser.h	2011-03-29 14:22:42 +0000
+++ musicstreaming/utilities/ArtistParser.h	2011-04-08 19:49:28 +0000
@@ -1,5 +1,5 @@
 //
-//  AlbumListParser.h
+//  ArtistParser.h
 //  iSub
 //
 //  Created by Aaron Brethorst on 9/22/10.
@@ -19,7 +19,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface AlbumListParser : NSObject <NSXMLParserDelegate>
+@interface ArtistParser : NSObject <NSXMLParserDelegate>
 {
 	NSMutableArray *albums;
 	NSMutableArray *songs;

=== renamed file 'musicstreaming/utilities/AlbumListParser.m' => 'musicstreaming/utilities/ArtistParser.m'
--- musicstreaming/utilities/AlbumListParser.m	2011-04-01 14:55:49 +0000
+++ musicstreaming/utilities/ArtistParser.m	2011-04-08 19:49:28 +0000
@@ -1,5 +1,5 @@
 //
-//  AlbumListParser.m
+//  ArtistParser.m
 //  iSub
 //
 //  Created by Aaron Brethorst on 9/22/10.
@@ -17,11 +17,11 @@
 //  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 "AlbumListParser.h"
+#import "ArtistParser.h"
 #import "Album.h"
 #import "Song.h"
 
-@implementation AlbumListParser
+@implementation ArtistParser
 
 @synthesize albums, songs;
 

=== modified file 'musicstreaming/utilities/PlaylistListParser.h'
--- musicstreaming/utilities/PlaylistListParser.h	2011-03-29 14:22:42 +0000
+++ musicstreaming/utilities/PlaylistListParser.h	2011-04-08 19:49:28 +0000
@@ -23,5 +23,5 @@
 {
 	NSMutableArray *names;
 }
-@property(nonatomic,retain) NSArray *names;
+@property(nonatomic,retain) NSMutableArray *names;
 @end

=== modified file 'musicstreaming/utilities/PlaylistListParser.m'
--- musicstreaming/utilities/PlaylistListParser.m	2011-03-29 14:22:42 +0000
+++ musicstreaming/utilities/PlaylistListParser.m	2011-04-08 19:49:28 +0000
@@ -51,7 +51,7 @@
 	{
 		Playlist *playlist = [[[Playlist alloc] init] autorelease];
 		playlist.name = [attributeDict objectForKey:@"name"];
-		playlist.playlistID = [attributeDict objectForKey:@"id"];
+		playlist.playlistId = [attributeDict objectForKey:@"id"];
 		
 		if (![playlist.name isEqual:@".AppleDouble"])
 		{

=== modified file 'musicstreaming/utilities/PlaylistParser.h'
--- musicstreaming/utilities/PlaylistParser.h	2011-03-29 14:22:42 +0000
+++ musicstreaming/utilities/PlaylistParser.h	2011-04-08 19:49:28 +0000
@@ -19,13 +19,13 @@
 
 #import <Foundation/Foundation.h>
 
-@class Playlist;
-
 @interface PlaylistParser : NSObject <NSXMLParserDelegate>
 {
-	Playlist *playlist;
-    NSMutableArray *songs;
+    NSString *playlistId;
+    NSString *name;
+	NSMutableArray *contents;
 }
-@property(nonatomic,retain) Playlist *playlist;
-@property(nonatomic,retain) NSMutableArray *songs;
+@property(nonatomic,retain) NSString *playlistId;
+@property(nonatomic,retain) NSString *name;
+@property(nonatomic,retain) NSMutableArray *contents;
 @end

=== modified file 'musicstreaming/utilities/PlaylistParser.m'
--- musicstreaming/utilities/PlaylistParser.m	2011-03-29 14:22:42 +0000
+++ musicstreaming/utilities/PlaylistParser.m	2011-04-08 19:49:28 +0000
@@ -18,19 +18,19 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "PlaylistParser.h"
-#import "Playlist.h"
 #import "Song.h"
 
 
 @implementation PlaylistParser
-@synthesize playlist, songs;
+@synthesize playlistId, name, contents;
 
 - (id)init 
 {
 	if ((self = [super init]))
 	{
-        playlist = [[Playlist alloc] init];
-        songs = [[NSMutableArray alloc] init];
+        playlistId = nil;
+        name = nil;
+        contents = [[NSMutableArray alloc] init];
 	}		
 	return self;
 }
@@ -53,14 +53,14 @@
 	{
 		if (![[attributeDict objectForKey:@"name"] isEqual:@".AppleDouble"])
 		{
-            playlist.name = [attributeDict objectForKey:@"name"];
-            playlist.playlistID = [attributeDict objectForKey:@"id"];
+            self.playlistId = [attributeDict objectForKey:@"id"];
+            self.name = [attributeDict objectForKey:@"name"];
 		}
 	}
     else if ([elementName isEqualToString:@"entry"])
     {
         Song *song = [[Song alloc] initWithDictionary:attributeDict];
-        [songs addObject:song];
+        [contents addObject:song];
         [song release];
     }
 }
@@ -68,8 +68,9 @@
 
 - (void) dealloc 
 {
-	RELEASE_SAFELY(playlist);
-    RELEASE_SAFELY(songs)
+    playlistId = NULL;
+    name = NULL;
+	RELEASE_SAFELY(contents);
 	[super dealloc];
 }
 

=== modified file 'musicstreaming/utilities/SongListParser.h'
--- musicstreaming/utilities/SongListParser.h	2011-04-01 14:55:49 +0000
+++ musicstreaming/utilities/SongListParser.h	2011-04-08 19:49:28 +0000
@@ -30,8 +30,8 @@
 	NSMutableDictionary *groupedSongs;
 }
 @property(nonatomic,retain) NSMutableDictionary *groupedSongs;
-@property(nonatomic,retain) NSArray *songs;
-@property(nonatomic,retain) NSArray *indexes;
+@property(nonatomic,retain) NSMutableArray *songs;
+@property(nonatomic,retain) NSMutableArray *indexes;
 @property(nonatomic,retain) NSString *index;
 @property(nonatomic,retain) Song *song;
 @end

=== modified file 'musicstreaming/utilities/StreamingPlayer.m'
--- musicstreaming/utilities/StreamingPlayer.m	2011-03-29 14:22:42 +0000
+++ musicstreaming/utilities/StreamingPlayer.m	2011-04-08 19:49:28 +0000
@@ -92,7 +92,7 @@
 	self.seekTime = [[defaults objectForKey:@"seekTime"] floatValue];
 	self.isPlaying = YES;
 	
-	self.songUrl = [[Subsonic sharedSubsonic] getStreamingURLForSongID:self.currentSong.songId];
+	self.songUrl = [[Subsonic sharedSubsonic] getStreamingURLForSongId:self.currentSong.songId];
 	[self createStreamer];
 	[self.streamer seekToTime:self.seekTime];
 }
@@ -236,7 +236,7 @@
 #endif
 			self.currentSong = [playlist objectAtIndex:index];
 			
-			self.songUrl = [[Subsonic sharedSubsonic] getStreamingURLForSongID:self.currentSong.songId];
+			self.songUrl = [[Subsonic sharedSubsonic] getStreamingURLForSongId:self.currentSong.songId];
 			
 			[self.streamer stop];
 			[self playPauseSong];
@@ -286,7 +286,7 @@
 			
 			currentSong = [playlist objectAtIndex:0];
 			
-			self.songUrl = [[Subsonic sharedSubsonic] getStreamingURLForSongID:self.currentSong.songId];
+			self.songUrl = [[Subsonic sharedSubsonic] getStreamingURLForSongId:self.currentSong.songId];
 			
 			[self.streamer stop];
 			[self playPauseSong];

=== modified file 'musicstreaming/utilities/Subsonic.h'
--- musicstreaming/utilities/Subsonic.h	2011-03-29 14:22:42 +0000
+++ musicstreaming/utilities/Subsonic.h	2011-04-08 19:49:28 +0000
@@ -36,8 +36,8 @@
 @property(nonatomic,assign) NSInteger cachedIPHour;
 + (Subsonic *)sharedSubsonic;
 - (NSURL *)getBaseUrl:(NSString *)action;
-- (NSURL *)getBaseUrl:(NSString *)action parameters:(NSDictionary*)extraParameters;
-- (NSURL *)getStreamingURLForSongID:(NSString*)songID;
+- (NSURL *)getBaseUrl:(NSString *)action parameters:(NSSet*)extraParameters;
+- (NSURL *)getStreamingURLForSongId:(NSString*)songId;
 - (BOOL)canPingServer;
 - (BOOL)isURLValid:(NSString *)url;
 - (void)removeCredentials;

=== modified file 'musicstreaming/utilities/Subsonic.m'
--- musicstreaming/utilities/Subsonic.m	2011-04-01 22:35:01 +0000
+++ musicstreaming/utilities/Subsonic.m	2011-04-08 19:49:28 +0000
@@ -22,7 +22,7 @@
 #include <netinet/in.h> 
 #include <netdb.h>
 #include <arpa/inet.h>
-#import "NSDictionary+Extras.h"
+#import "NSMutableSet+Extras.h"
 
 @implementation Subsonic
 @synthesize defaultURL, defaultUserName, defaultPassword, cachedIP, cachedIPHour;
@@ -98,9 +98,11 @@
 	self.defaultPassword = password;
 }
 
-- (NSURL *)getStreamingURLForSongID:(NSString*)songID
+- (NSURL *)getStreamingURLForSongId:(NSString*)songId
 {
-	return [self getBaseUrl:@"stream.view" parameters:[NSDictionary dictionaryWithObject:songID forKey:@"id"]];
+    NSMutableSet *parameters = [NSMutableSet set];
+    [parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", songId, nil]];
+	return [self getBaseUrl:@"stream.view" parameters:parameters];
 }
 
 - (NSURL *)getBaseUrl:(NSString *)action
@@ -108,17 +110,17 @@
 	return [self getBaseUrl:action parameters:nil];
 }
 
-- (NSURL *)getBaseUrl:(NSString *)action parameters:(NSDictionary*)extraParameters
+- (NSURL *)getBaseUrl:(NSString *)action parameters:(NSSet*)extraParameters
 {
 	if (self.defaultUserName && self.defaultPassword)
 	{
-		NSMutableDictionary *params = [NSMutableDictionary dictionaryWithDictionary:extraParameters];
-		
-		[params setObject:self.defaultUserName forKey:@"u"];
-		[params setObject:self.defaultPassword forKey:@"p"];
-		[params setObject:@"1.1.0" forKey:@"v"];
-		[params setObject:@"iSub" forKey:@"c"];
-		
+		NSMutableSet *params = [NSMutableSet setWithSet:extraParameters];
+		
+		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"u", self.defaultUserName, nil]];
+		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"p", self.defaultPassword, nil]];
+		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"v", @"1.1.0", nil]];
+		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"c", @"iSub", nil]];
+        
 		return [NSURL URLWithString:[NSString stringWithFormat:@"%@/rest/%@?%@", self.defaultURL, action, [params urlEncodedString]]];
 	}
 	else

=== modified file 'musicstreaming/view_controllers/AlbumListViewController.m'
--- musicstreaming/view_controllers/AlbumListViewController.m	2011-04-01 03:07:07 +0000
+++ musicstreaming/view_controllers/AlbumListViewController.m	2011-04-08 19:49:28 +0000
@@ -18,16 +18,140 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #import "AlbumListViewController.h"
+#import "DataCache.h"
+#import "AlbumListParser.h"
+#import "AlbumUITableViewCell.h"
+#import "Album.h"
+#import "AlbumViewController.h"
 
 @implementation AlbumListViewController
 
+#pragma mark - View stuff
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+	self.tableView.rowHeight = 60.0f;
+
+	[self loadData:NO];
+}
+
 #pragma mark - Data Loading
 
 - (void)beginLoadingData:(NSString*)force
 {
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
+	NSDictionary *cachedAlbums = [[DataCache sharedDataCache] objectForKey:@"AlbumsList"];
+	
+	if (cachedAlbums && ![force isEqual:@"YES"])
+	{
+		self.tableData = [cachedAlbums objectForKey:@"albums"];
+		self.indexes = [cachedAlbums objectForKey:@"indexes"];
+		self.groupedTableData = [cachedAlbums objectForKey:@"groupedAlbums"];
+	}
+	else
+	{
+		NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getAllAlbums.view"];
+		NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
+		
+		AlbumListParser *parser = [[AlbumListParser alloc] init];
+		[xmlParser setDelegate:parser];
+		
+		if (![xmlParser parse])
+		{
+			[self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:[xmlParser parserError] waitUntilDone:NO];
+			[xmlParser release];
+			[parser release];
+			[pool release];
+			return;
+		}
+		
+		self.tableData = parser.albums;
+        if ([self.tableData count] <= 8)
+        {
+            indexed = NO;
+        }
+		self.indexes = parser.indexes;
+		self.groupedTableData = parser.groupedAlbums;
+				
+		[xmlParser release];
+		[parser release];
+		
+		NSDictionary *cacheData = [NSDictionary dictionaryWithObjectsAndKeys:self.tableData, @"albums",
+								   self.indexes, @"indexes", self.groupedTableData, @"groupedAlbums", nil];
+		
+		[[DataCache sharedDataCache] setObject:cacheData forKey:@"AlbumsList"];
+	}
+	
 	[self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO];
+	[pool release];
 }
 
 #pragma mark - UITableView
 
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath 
+{	
+	static NSString *AlbumCellIdentifier = @"AlbumCellIdentifier";
+	AlbumUITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:AlbumCellIdentifier];
+	
+	if (nil == cell)
+	{
+		cell = [[[AlbumUITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:AlbumCellIdentifier] autorelease];
+		cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+	}
+
+    Album *a = nil;
+    
+	if (self.searchDisplayController.searchResultsTableView == tableView)
+	{
+		a = [self.searchResults objectAtIndex:indexPath.row];
+		cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+	}
+	else
+	{
+		cell.accessoryType = UITableViewCellAccessoryNone;
+
+        if (indexed)
+        {
+            NSString *index = [self.indexes objectAtIndex:indexPath.section];
+            a = [[self.groupedTableData objectForKey:index] objectAtIndex:indexPath.row]; 
+        }
+        else
+        {
+            a = [self.tableData objectAtIndex:indexPath.row];
+        }
+	}
+
+    cell.albumNameLabel.text = a.title;
+    [self loadCoverArtForAlbum:a intoImageView:cell.coverArtView withSize:120];
+	
+	return cell;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	Album *selection = nil;
+		
+	if (self.searchDisplayController.searchResultsTableView == tableView)
+	{
+		selection = [self.searchResults objectAtIndex:indexPath.row];
+	}
+	else if(indexed) 
+	{	
+		NSString *index = [self.indexes objectAtIndex:indexPath.section];
+		selection = [[self.groupedTableData objectForKey:index] objectAtIndex:indexPath.row];
+	}
+    else 
+    {
+        selection = [self.tableData objectAtIndex:indexPath.row];
+    }
+		
+	AlbumViewController *albumViewController = [[AlbumViewController alloc] initWithStyle:UITableViewStylePlain];
+	albumViewController.album = selection;
+    // albumViewController.artist = @"AYFKMWTS?"; // TODO: Make server-side views that give back enough info
+	[self.navigationController pushViewController:albumViewController animated:YES];
+	[albumViewController release];
+}
+
 @end

=== modified file 'musicstreaming/view_controllers/AlbumViewController.h'
--- musicstreaming/view_controllers/AlbumViewController.h	2011-03-29 14:22:42 +0000
+++ musicstreaming/view_controllers/AlbumViewController.h	2011-04-08 19:49:28 +0000
@@ -25,7 +25,7 @@
 @interface AlbumViewController : SubsonicTableViewController
 {
 	UIView *headerView;
-	Artist *artist;
+	NSString *artist;
 	Album *album;
 	AsynchronousImageViewCached* coverArt;
 	UILabel *artistLabel;
@@ -33,6 +33,6 @@
 	NSArray *songs;
 }
 @property(nonatomic,retain) NSArray *songs;
-@property(nonatomic,retain) Artist *artist;
+@property(nonatomic,retain) NSString *artist;
 @property(nonatomic,retain) Album *album;
 @end

=== modified file 'musicstreaming/view_controllers/AlbumViewController.m'
--- musicstreaming/view_controllers/AlbumViewController.m	2011-03-29 14:22:42 +0000
+++ musicstreaming/view_controllers/AlbumViewController.m	2011-04-08 19:49:28 +0000
@@ -21,14 +21,14 @@
 
 #import "AlbumUITableViewCell.h"
 #import "AsynchronousImageViewCached.h"
-#import "AlbumListParser.h"
-#import "Artist.h"
+#import "AlbumParser.h"
 #import "Album.h"
 #import "Song.h"
 #import "SongUITableViewCell.h"
 #import "NSDate+Extras.h"
 #import "StreamingPlayer.h"
 #import "DataCache.h"
+#import "NSMutableSet+Extras.h"
 
 @interface AlbumViewController (Private)
 - (void)setupHeaderAndFooter;
@@ -80,10 +80,12 @@
 	}
 	else
 	{
-		NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getMusicDirectory.view" parameters:[NSDictionary dictionaryWithObject:self.album.albumId forKey:@"id"]];
+        NSMutableSet *parameters = [NSMutableSet set];
+        [parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.album.albumId, nil]];
+		NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getMusicDirectory.view" parameters:parameters];
 		NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
 		
-		AlbumListParser *parser = [[AlbumListParser alloc] init];
+		AlbumParser *parser = [[AlbumParser alloc] init];
 		[xmlParser setDelegate:parser];
 		
 		if (![xmlParser parse])
@@ -232,7 +234,7 @@
 	artistLabel.shadowOffset = CGSizeMake(0, 1);
 	[headerView addSubview:artistLabel];
 	
-	artistLabel.text = self.artist.name;
+	artistLabel.text = self.artist;
 	
 	albumLabel = [[UILabel alloc] initWithFrame:CGRectMake(120, 30, 200, 20)];
 	albumLabel.font = [UIFont boldSystemFontOfSize:[UIFont labelFontSize]];

=== modified file 'musicstreaming/view_controllers/ArtistListViewController.m'
--- musicstreaming/view_controllers/ArtistListViewController.m	2011-04-01 03:07:07 +0000
+++ musicstreaming/view_controllers/ArtistListViewController.m	2011-04-08 19:49:28 +0000
@@ -103,7 +103,7 @@
 	
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		Artist *a = [searchResults objectAtIndex:indexPath.row];
+		Artist *a = [self.searchResults objectAtIndex:indexPath.row];
 		cell.textLabel.text = a.name;
 		cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 	}
@@ -134,7 +134,7 @@
 		
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		selection = [searchResults objectAtIndex:indexPath.row];
+		selection = [self.searchResults objectAtIndex:indexPath.row];
 	}
 	else if(indexed) 
 	{	

=== modified file 'musicstreaming/view_controllers/ArtistViewController.m'
--- musicstreaming/view_controllers/ArtistViewController.m	2011-03-28 17:52:06 +0000
+++ musicstreaming/view_controllers/ArtistViewController.m	2011-04-08 19:49:28 +0000
@@ -32,11 +32,12 @@
 #import "AlbumViewController.h"
 #import "AlbumUITableViewCell.h"
 #import "AsynchronousImageViewCached.h"
-#import "AlbumListParser.h"
+#import "ArtistParser.h"
 #import "Artist.h"
 #import "Album.h"
 #import "Song.h"
 #import "DataCache.h"
+#import "NSMutableSet+Extras.h"
 
 @implementation ArtistViewController
 @synthesize artist, albums, songs;
@@ -61,16 +62,6 @@
 	[self loadData:NO];
 }
 
-- (void)viewDidAppear:(BOOL)animated
-{
-	[super viewDidAppear:animated];
-}
-
-- (void)viewWillDisappear:(BOOL)animated
-{
-	[super viewWillDisappear:animated];
-}
-
 #pragma mark -
 #pragma mark Data Loader
 
@@ -93,9 +84,11 @@
 	}
 	else
 	{
-		NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getMusicDirectory.view" parameters:[NSDictionary dictionaryWithObject:self.artist.artistId forKey:@"id"]];
+        NSMutableSet *parameters = [NSMutableSet set];
+        [parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.artist.artistId, nil]];
+		NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getMusicDirectory.view" parameters:parameters];
 		NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
-		AlbumListParser *parser = [[AlbumListParser alloc] init];
+		ArtistParser *parser = [[ArtistParser alloc] init];
 		[xmlParser setDelegate:parser];
 		
 		if (![xmlParser parse])
@@ -155,10 +148,10 @@
 	}
 }
 
-- (UITableViewCell *)tableView:(UITableView *)tv cellForRowAtIndexPath:(NSIndexPath *)indexPath 
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath 
 {	
 	static NSString *AlbumCellIdentifier = @"AlbumCellIdentifier";
-	AlbumUITableViewCell *cell = [tv dequeueReusableCellWithIdentifier:AlbumCellIdentifier];
+	AlbumUITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:AlbumCellIdentifier];
 	
 	if (nil == cell)
 	{
@@ -187,10 +180,10 @@
 	{
 		Album *selection = [self.albums objectAtIndex:indexPath.row];
 
-		AlbumViewController *songsVC = [[[AlbumViewController alloc] initWithStyle:UITableViewStylePlain] autorelease];
-		songsVC.album = selection;
-		songsVC.artist = self.artist;
-		[self.navigationController pushViewController:songsVC animated:YES];
+		AlbumViewController *albumViewController = [[[AlbumViewController alloc] initWithStyle:UITableViewStylePlain] autorelease];
+		albumViewController.album = selection;
+		albumViewController.artist = self.artist.name;
+		[self.navigationController pushViewController:albumViewController animated:YES];
 	}
 	else
 	{

=== added file 'musicstreaming/view_controllers/PlaylistEditViewController.h'
--- musicstreaming/view_controllers/PlaylistEditViewController.h	1970-01-01 00:00:00 +0000
+++ musicstreaming/view_controllers/PlaylistEditViewController.h	2011-04-08 19:49:28 +0000
@@ -0,0 +1,36 @@
+//
+//  PlaylistEditViewController.h
+//  iSub
+//
+//  Created by Zachery Bir on 4/5/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 "SubsonicIndexedTableViewController.h"
+
+@class Playlist;
+@class PlaylistListViewController;
+
+@interface PlaylistEditViewController : SubsonicIndexedTableViewController
+{
+    Playlist *playlist;
+    PlaylistListViewController *playlistListViewController;
+}
++ (UINavigationController *)navigableViewControllerWithPlaylist:(Playlist *)playlist originator:(PlaylistListViewController *)originator;
+- (id)initWithPlaylist:(Playlist *)aPlaylist;
+- (void)cancel:(id)sender;
+- (void)save:(id)sender;
+@property(nonatomic,retain) Playlist *playlist;
+@property(nonatomic,retain) PlaylistListViewController *playlistListViewController;
+@end

=== added file 'musicstreaming/view_controllers/PlaylistEditViewController.m'
--- musicstreaming/view_controllers/PlaylistEditViewController.m	1970-01-01 00:00:00 +0000
+++ musicstreaming/view_controllers/PlaylistEditViewController.m	2011-04-08 19:49:28 +0000
@@ -0,0 +1,214 @@
+//
+//  PlaylistEditViewController.m
+//  iSub
+//
+//  Created by Zachery Bir on 4/5/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 "PlaylistEditViewController.h"
+#import "PlaylistListViewController.h"
+#import "Playlist.h"
+#import "Song.h"
+#import "DataCache.h"
+#import "SongListParser.h"
+#import "NSMutableSet+Extras.h"
+
+@implementation PlaylistEditViewController
+@synthesize playlist, playlistListViewController;
+
++ (UINavigationController *)navigableViewControllerWithPlaylist:(Playlist *)playlist originator:(PlaylistListViewController *)originator
+{
+    PlaylistEditViewController *playlistEditViewController = [[[PlaylistEditViewController alloc] initWithPlaylist:playlist] autorelease];
+    playlistEditViewController.playlistListViewController = originator;
+    UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:playlistEditViewController] autorelease];
+    return nav;
+}
+
+- (id)initWithPlaylist:(Playlist *)aPlaylist
+{
+	if ((self = [super initWithTitle:aPlaylist.name]))
+    {
+        self.navigationItem.leftBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Cancel", @"") style:UIBarButtonItemStylePlain target:self action:@selector(cancel:)] autorelease];
+        self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Save", @"") style:UIBarButtonItemStylePlain target:self action:@selector(save:)] autorelease];
+
+		self.playlist = aPlaylist;
+        self.playlistListViewController = nil;
+        self.navigationItem.prompt = NSLocalizedString(@"Add songs to playlist", @"");
+        
+    }
+    return self;
+}
+
+#pragma mark - Data Loading
+
+- (void)beginLoadingData:(NSString*)force
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
+	NSDictionary *cachedArtists = [[DataCache sharedDataCache] objectForKey:@"SongsList"];
+	
+	if (cachedArtists && ![force isEqual:@"YES"])
+	{
+		self.tableData = [cachedArtists objectForKey:@"songs"];
+		self.indexes = [cachedArtists objectForKey:@"indexes"];
+		self.groupedTableData = [cachedArtists objectForKey:@"groupedSongs"];
+	}
+	else
+	{
+		NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getAllSongs.view"];
+		NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
+		
+		SongListParser *parser = [[SongListParser alloc] init];
+		[xmlParser setDelegate:parser];
+		
+		if (![xmlParser parse])
+		{
+			[self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:[xmlParser parserError] waitUntilDone:NO];
+			[xmlParser release];
+			[parser release];
+			[pool release];
+			return;
+		}
+		
+		self.tableData = parser.songs;
+        if ([self.tableData count] <= 8)
+        {
+            indexed = NO;
+        }
+		self.indexes = parser.indexes;
+		self.groupedTableData = parser.groupedSongs;
+				
+		[xmlParser release];
+		[parser release];
+		
+		NSDictionary *cacheData = [NSDictionary dictionaryWithObjectsAndKeys:self.tableData, @"songs",
+								   self.indexes, @"indexes", self.groupedTableData, @"groupedSongs", nil];
+		
+		[[DataCache sharedDataCache] setObject:cacheData forKey:@"SongsList"];
+	}
+	
+	[self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO];
+	[pool release];
+}
+
+#pragma mark - UITableView
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath 
+{
+	static NSString *CellIdentifier = @"Cell";
+	
+	UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+	if (nil == cell)
+	{
+		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+	}
+	
+    cell.accessoryType = UITableViewCellAccessoryNone;
+
+    Song *s = nil;
+    
+	if (self.searchDisplayController.searchResultsTableView == tableView)
+	{
+		s = [self.searchResults objectAtIndex:indexPath.row];
+		cell.textLabel.text = s.title;
+		cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+	}
+	else
+	{
+		cell.accessoryType = UITableViewCellAccessoryNone;
+
+        if (indexed)
+        {
+            NSString *index = [self.indexes objectAtIndex:indexPath.section];
+            s = [[self.groupedTableData objectForKey:index] objectAtIndex:indexPath.row]; 
+        }
+        else
+        {
+            s = [self.tableData objectAtIndex:indexPath.row];
+        }
+		cell.textLabel.text = s.title;
+	}
+	
+	return cell;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath 
+{
+	Song *selection = nil;
+		
+	if (self.searchDisplayController.searchResultsTableView == tableView)
+	{
+		selection = [self.searchResults objectAtIndex:indexPath.row];
+	}
+	else if(indexed) 
+	{	
+		NSString *index = [self.indexes objectAtIndex:indexPath.section];
+		selection = [[self.groupedTableData objectForKey:index] objectAtIndex:indexPath.row];
+	}
+    else 
+    {
+        selection = [self.tableData objectAtIndex:indexPath.row];
+    }
+    
+    UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+
+    if (cell.accessoryType == UITableViewCellAccessoryNone) {
+        [self.playlist.contents addObject:selection];
+        cell.accessoryType = UITableViewCellAccessoryCheckmark;
+
+    } else {
+        [self.playlist.contents removeObject:selection];
+        cell.accessoryType = UITableViewCellAccessoryNone;
+    }
+
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+}
+
+- (void)cancel:(id)sender
+{
+    self.playlist = nil;
+    [self dismissModalViewControllerAnimated:YES];
+}
+
+- (void)dealloc
+{
+	RELEASE_SAFELY(playlist);
+	[super dealloc];
+}
+
+- (void)save:(id)sender
+{
+    NSMutableSet *extraParameters = [NSMutableSet set];
+    if (nil != self.playlist.playlistId)
+    {
+        [extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"playlistId", self.playlist.playlistId, nil]];
+    }
+    [extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"name", self.playlist.name, nil]];
+    for (Song *song in self.playlist.contents)
+    {
+        [extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"songId", song.songId, nil]];
+    }
+	NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"createPlaylist.view" parameters:extraParameters];
+    NSURLRequest *request = [[[NSURLRequest alloc] initWithURL:url] autorelease];
+    NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:self];
+    [connection start];
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
+{
+    [self.playlistListViewController performSelector:@selector(reload:) withObject:nil afterDelay:0.5];
+    [self cancel:nil];
+}
+@end
\ No newline at end of file

=== modified file 'musicstreaming/view_controllers/PlaylistListViewController.m'
--- musicstreaming/view_controllers/PlaylistListViewController.m	2011-04-01 14:55:49 +0000
+++ musicstreaming/view_controllers/PlaylistListViewController.m	2011-04-08 19:49:28 +0000
@@ -19,11 +19,13 @@
 
 #import "PlaylistListViewController.h"
 #import "PlaylistViewController.h"
+#import "PlaylistEditViewController.h"
 #import "AlbumUITableViewCell.h"
 #import "PlaylistListParser.h"
 #import "AsynchronousImageViewCached.h"
 #import "Playlist.h"
 #import "DataCache.h"
+#import "AlertPrompt.h"
 
 @implementation PlaylistListViewController
 
@@ -72,6 +74,18 @@
 
 #pragma mark - UITableView
 
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+	if (self.searchDisplayController.searchResultsTableView == tableView)
+	{
+		return [self.searchResults count];
+	}
+	else 
+	{
+		return [self.tableData count] + 1;
+	}
+}
+
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath 
 {
 	static NSString *CellIdentifier = @"Cell";
@@ -82,17 +96,22 @@
 		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
 	}
 	
+	cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+    
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		Playlist *p = [searchResults objectAtIndex:indexPath.row];
+		Playlist *p = [self.searchResults objectAtIndex:indexPath.row];
 		cell.textLabel.text = p.name;
-		cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 	}
-	else
+	else if(indexPath.row == 0)
+    {
+        cell.accessoryType = UITableViewCellAccessoryNone;
+        cell.textLabel.text = @"Create new playlist...";
+    }
+    else
 	{
-		cell.accessoryType = UITableViewCellAccessoryNone;
-		
-		Playlist *p = [self.tableData objectAtIndex:indexPath.row]; 
+        int adjusted_row = indexPath.row - 1;
+		Playlist *p = [self.tableData objectAtIndex:adjusted_row]; 
 		
 		cell.textLabel.text = p.name;
 	}
@@ -106,11 +125,25 @@
 		
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		selection = [searchResults objectAtIndex:indexPath.row];
+		selection = [self.searchResults objectAtIndex:indexPath.row];
 	}
+    else if(indexPath.row == 0)
+    {
+        // Launch a dialog to capture the new playlist's name
+		AlertPrompt *alert = [[[AlertPrompt alloc] initWithTitle:NSLocalizedString(@"Name New Playlist", @"")
+                                                     placeholder:NSLocalizedString(@"Title", @"")
+														 message:NSLocalizedString(@"\n", @"")
+														delegate:self
+											   cancelButtonTitle:NSLocalizedString(@"Cancel",@"")
+                                                   okButtonTitle:NSLocalizedString(@"Create",@"")] autorelease];
+		alert.tag = 1111111;
+		[alert show];
+        return;
+    }
 	else 
 	{	
-		selection = [self.tableData objectAtIndex:indexPath.row];
+        int adjusted_row = indexPath.row - 1;
+		selection = [self.tableData objectAtIndex:adjusted_row];
 	}
 		
 	PlaylistViewController *playlistViewController = [[PlaylistViewController alloc] initWithStyle:UITableViewStylePlain];
@@ -119,4 +152,21 @@
 	[playlistViewController release];
 }
 
+#pragma mark - Alert handling
+
+- (void)alertView:(UIAlertView *)alertPrompt clickedButtonAtIndex:(NSInteger)buttonIndex
+{
+	if (1111111 == alertPrompt.tag && alertPrompt.cancelButtonIndex != buttonIndex)
+	{
+        Playlist *playlist = [[[Playlist alloc] init] autorelease];
+        playlist.name = [(AlertPrompt *)alertPrompt enteredText];
+        UINavigationController *playlistEditViewController = [PlaylistEditViewController navigableViewControllerWithPlaylist:playlist originator:self];
+        [self.navigationController presentModalViewController:playlistEditViewController animated:YES];
+	}
+    else
+    {
+        // Propagate up the alert handling in case it was a different alert
+        [super alertView:alertPrompt clickedButtonAtIndex:buttonIndex];
+    }
+}
 @end

=== modified file 'musicstreaming/view_controllers/PlaylistViewController.m'
--- musicstreaming/view_controllers/PlaylistViewController.m	2011-04-01 03:07:07 +0000
+++ musicstreaming/view_controllers/PlaylistViewController.m	2011-04-08 19:49:28 +0000
@@ -22,6 +22,7 @@
 #import "PlaylistParser.h"
 #import "DataCache.h"
 #import "Song.h"
+#import "NSMutableSet+Extras.h"
 
 @implementation PlaylistViewController
 
@@ -52,15 +53,19 @@
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	
-	NSDictionary *cacheDict = [[DataCache sharedDataCache] objectForKey:@"Playlists"];
+    /*
+	NSDictionary *cacheDict = [[DataCache sharedDataCache] objectForKey:self.playlist.playlistId];
 	
 	if (cacheDict && ![force isEqual:@"YES"])
 	{
-		self.playlist = [cacheDict objectForKey:self.playlist.playlistID];
+		self.playlist = [cacheDict objectForKey:@"playlist"];
 	}
 	else
 	{
-		NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getPlaylist.view" parameters:[NSDictionary dictionaryWithObject:self.playlist.playlistID forKey:@"id"]];
+     */
+        NSMutableSet *parameters = [NSMutableSet set];
+        [parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlist.playlistId, nil]];
+		NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getPlaylist.view" parameters:parameters];
 		NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
 		PlaylistParser *parser = [[PlaylistParser alloc] init];
 		[xmlParser setDelegate:parser];
@@ -73,16 +78,19 @@
 			[pool release];
 			return;
 		}
-				
-		self.tableData = parser.songs;
-		
-//		NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:self.playlist, self.playlist.playlistID, nil];
-		
-//		[[DataCache sharedDataCache] setObject:dict forKey:@"Playlists"];
+
+        // self.playlist.contents = [parser.contents copy];
+		self.tableData = parser.contents;
+		
+		// NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:self.playlist, @"playlist", nil];
+		
+		// [[DataCache sharedDataCache] setObject:dict forKey:self.playlist.playlistId];
 		
 		[xmlParser release];
 		[parser release];
-	}
+    /*
+    }   
+     */
 	
 	[pool release];
 	
@@ -108,14 +116,14 @@
 
 - (BOOL)searchDisplayController:(UISearchDisplayController *)controller shouldReloadTableForSearchString:(NSString *)searchString
 {	
-	[searchResults removeAllObjects];
+	[self.searchResults removeAllObjects];
 	
 	for (Song* s in self.tableData)
 	{
 		NSRange titleResultsRange = [s.title rangeOfString:searchString options:NSCaseInsensitiveSearch];
 		
 		if (titleResultsRange.length > 0)
-			[searchResults addObject:s];
+			[self.searchResults addObject:s];
 	}
 	
 	return YES;
@@ -135,7 +143,7 @@
 	
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		Playlist *p = [searchResults objectAtIndex:indexPath.row];
+		Playlist *p = [self.searchResults objectAtIndex:indexPath.row];
 		cell.textLabel.text = p.name;
 		cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 	}
@@ -154,12 +162,12 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
 	Song *song = nil;
-    NSMutableArray *selectPlaylist = nil;
+    NSArray *selectPlaylist = nil;
 		
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		song = [searchResults objectAtIndex:indexPath.row];
-        selectPlaylist = searchResults;
+		song = [self.searchResults objectAtIndex:indexPath.row];
+        selectPlaylist = self.searchResults;
 	}
 	else 
 	{	

=== modified file 'musicstreaming/view_controllers/SettingsViewController.h'
--- musicstreaming/view_controllers/SettingsViewController.h	2010-10-01 03:43:56 +0000
+++ musicstreaming/view_controllers/SettingsViewController.h	2011-04-08 19:49:28 +0000
@@ -29,11 +29,9 @@
 //  DAMAGE.
 
 #import <UIKit/UIKit.h>
-#import "SubsonicTableViewController.h"
 
-@interface SettingsViewController : SubsonicTableViewController <UITextFieldDelegate>
+@interface SettingsViewController : UITableViewController <UITextFieldDelegate>
 {
 }
-+ (UINavigationController*)navigableSettingsViewController;
 - (IBAction)save:(id)sender;
 @end

=== modified file 'musicstreaming/view_controllers/SettingsViewController.m'
--- musicstreaming/view_controllers/SettingsViewController.m	2011-03-28 17:52:06 +0000
+++ musicstreaming/view_controllers/SettingsViewController.m	2011-04-08 19:49:28 +0000
@@ -31,24 +31,17 @@
 #import "SettingsViewController.h"
 #import "iSubAppDelegate.h"
 #import "AboutViewController.h"
+#import "Subsonic.h"
 
 @implementation SettingsViewController
 
-+ (UINavigationController*)navigableSettingsViewController;
-{
-	SettingsViewController *settingsViewController = [[[SettingsViewController alloc] initWithStyle:UITableViewStyleGrouped] autorelease];
-	UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:settingsViewController] autorelease];
-	nav.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal;
-	nav.navigationBar.barStyle = UIBarStyleBlack;
-	return nav;
-}
-
 - (id)initWithStyle:(UITableViewStyle)style
 {
 	if ((self = [super initWithStyle:style]))
 	{
 		self.title = NSLocalizedString(@"Settings",@"");
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reloadCreds:) name:@"ReloadAccountCredentials" object:nil];
+        // self.view.backgroundColor = [UIColor orangeColor]; // Want to make this some sort of nice U1 cloudy background image
 	}
 	return self;
 }

=== modified file 'musicstreaming/view_controllers/SongListViewController.m'
--- musicstreaming/view_controllers/SongListViewController.m	2011-04-01 22:35:01 +0000
+++ musicstreaming/view_controllers/SongListViewController.m	2011-04-08 19:49:28 +0000
@@ -90,7 +90,7 @@
 	
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		Song *s = [searchResults objectAtIndex:indexPath.row];
+		Song *s = [self.searchResults objectAtIndex:indexPath.row];
 		cell.textLabel.text = s.title;
 		cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
 	}
@@ -122,8 +122,8 @@
 		
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		selection = [searchResults objectAtIndex:indexPath.row];
-        playlist = searchResults;
+		selection = [self.searchResults objectAtIndex:indexPath.row];
+        playlist = self.searchResults;
 	}
 	else if(indexed) 
 	{	

=== modified file 'musicstreaming/view_controllers/SongViewController.m'
--- musicstreaming/view_controllers/SongViewController.m	2011-03-28 17:52:06 +0000
+++ musicstreaming/view_controllers/SongViewController.m	2011-04-08 19:49:28 +0000
@@ -38,6 +38,7 @@
 #import <MediaPlayer/MediaPlayer.h>
 #import <CFNetwork/CFNetwork.h>
 #import "NSNumber+Extras.h"
+#import "NSMutableSet+Extras.h"
 
 @interface SongViewController (Private)
 //KVO-driven stuff
@@ -363,7 +364,7 @@
 	self.songLabel.text = [StreamingPlayer sharedStreamingPlayer].currentSong.title;
 	self.trackMOfNLabel.text = [NSString stringWithFormat:@"%d of %d", [StreamingPlayer sharedStreamingPlayer].currentSongIndex+1, [[StreamingPlayer sharedStreamingPlayer].currentPlaylist count]];
 	
-	NSURL *songURL = [[Subsonic sharedSubsonic] getStreamingURLForSongID:[StreamingPlayer sharedStreamingPlayer].currentSong.songId];
+	NSURL *songURL = [[Subsonic sharedSubsonic] getStreamingURLForSongId:[StreamingPlayer sharedStreamingPlayer].currentSong.songId];
 	[StreamingPlayer sharedStreamingPlayer].songUrl = songURL;
 
 	iSubAppDelegate *appDelegate = (iSubAppDelegate *)[[UIApplication sharedApplication] delegate];
@@ -377,7 +378,10 @@
 		else 
 		{
 			// If not, grab it from the url and cache it
-			NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getCoverArt.view" parameters:[NSDictionary dictionaryWithObjectsAndKeys:[StreamingPlayer sharedStreamingPlayer].currentSong.coverArtId,@"id",@"320",@"size",nil]];
+            NSMutableSet *parameters = [NSMutableSet set];
+            [parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", [StreamingPlayer sharedStreamingPlayer].currentSong.coverArtId, nil]];
+            [parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"size", @"320", nil]];
+			NSURL *url = [[Subsonic sharedSubsonic] getBaseUrl:@"getCoverArt.view" parameters:parameters];
 			[self.coverArtImageView loadImageFromURLString:[url absoluteString] coverArtId: [StreamingPlayer sharedStreamingPlayer].currentSong.coverArtId];
 		}
 	}

=== modified file 'musicstreaming/view_controllers/SubsonicIndexedTableViewController.h'
--- musicstreaming/view_controllers/SubsonicIndexedTableViewController.h	2011-04-01 03:06:02 +0000
+++ musicstreaming/view_controllers/SubsonicIndexedTableViewController.h	2011-04-08 19:49:28 +0000
@@ -10,7 +10,7 @@
 #import "SubsonicTableViewController.h"
 
 
-@interface SubsonicIndexedTableViewController : SubsonicTableViewController <UIAlertViewDelegate>
+@interface SubsonicIndexedTableViewController : SubsonicTableViewController
 {
     NSMutableDictionary *groupedTableData;
     NSArray *indexes;

=== modified file 'musicstreaming/view_controllers/SubsonicIndexedTableViewController.m'
--- musicstreaming/view_controllers/SubsonicIndexedTableViewController.m	2011-04-01 22:35:01 +0000
+++ musicstreaming/view_controllers/SubsonicIndexedTableViewController.m	2011-04-08 19:49:28 +0000
@@ -40,14 +40,12 @@
 {
     [super didReceiveMemoryWarning];
 	
-	self.tableData = NULL;
 	self.indexes = NULL;
 	self.groupedTableData = NULL;
 }
 
 - (void)dealloc
 {
-	self.tableData = NULL;
 	self.indexes = NULL;
 	self.groupedTableData = NULL;
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -80,7 +78,7 @@
 {
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		return [searchResults count];
+		return [self.searchResults count];
 	}
 	else 
 	{

=== modified file 'musicstreaming/view_controllers/SubsonicTableViewController.h'
--- musicstreaming/view_controllers/SubsonicTableViewController.h	2011-04-01 03:05:21 +0000
+++ musicstreaming/view_controllers/SubsonicTableViewController.h	2011-04-08 19:49:28 +0000
@@ -25,12 +25,12 @@
 
 @class Album, AsynchronousImageViewCached;
 
-@interface SubsonicTableViewController : PullRefreshTableViewController <UISearchDisplayDelegate, UISearchBarDelegate>
+@interface SubsonicTableViewController : PullRefreshTableViewController <UIAlertViewDelegate, UISearchDisplayDelegate, UISearchBarDelegate>
 {
 	MBProgressHUD *hudView;
 	BOOL showProgressHUD;
 	NSTimer *respondToRemoteTimer;
-    NSArray *tableData;
+    NSMutableArray *tableData;
 	NSMutableArray *searchResults;
 }
 - (id)initWithTitle:(NSString *)title;
@@ -49,5 +49,6 @@
 - (void)beginLoadingData:(NSString*)force;
 - (void)finishLoadingData;
 - (void)failedLoadingData:(NSError*)error;
-@property(nonatomic,retain) NSArray *tableData;
+@property(nonatomic,retain) NSMutableArray *tableData;
+@property(nonatomic,retain) NSMutableArray *searchResults;
 @end

=== modified file 'musicstreaming/view_controllers/SubsonicTableViewController.m'
--- musicstreaming/view_controllers/SubsonicTableViewController.m	2011-04-01 14:55:49 +0000
+++ musicstreaming/view_controllers/SubsonicTableViewController.m	2011-04-08 19:49:28 +0000
@@ -26,7 +26,7 @@
 #import "Album.h"
 
 @implementation SubsonicTableViewController
-@synthesize tableData;
+@synthesize tableData, searchResults;
 
 #pragma mark -
 #pragma mark Initialization
@@ -38,7 +38,8 @@
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reloadCredentials:) name:@"ReloadCredentials" object:nil];
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resetCredentials:) name:@"ResetCredentials" object:nil];
         self.title = title;
-        self.tableData = [NSArray array];
+        self.tableData = [NSMutableArray array];
+        self.searchResults = [NSMutableArray array];
     }
     return self;
 }
@@ -52,7 +53,6 @@
 	showProgressHUD = YES;
 	respondToRemoteTimer = NULL;
 	self.navigationController.navigationBar.barStyle = UIBarStyleBlack;
-	searchResults = [[NSMutableArray alloc] init];
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -263,7 +263,7 @@
 {
 	if (self.searchDisplayController.searchResultsTableView == tableView)
 	{
-		return [searchResults count];
+		return [self.searchResults count];
 	}
 	else 
 	{
@@ -366,6 +366,7 @@
 {
 	[hudView hide:NO];
 	RELEASE_SAFELY(hudView);
+    RELEASE_SAFELY(tableData);
 	RELEASE_SAFELY(searchResults);
 
     [super dealloc];
@@ -375,7 +376,7 @@
 
 - (BOOL)searchDisplayController:(UISearchDisplayController *)controller shouldReloadTableForSearchString:(NSString *)searchString
 {	
-	[searchResults removeAllObjects];
+	[self.searchResults removeAllObjects];
 	
 	for (id d in self.tableData)
 	{