Merge lp:~urbanape/ubuntuone-ios-client/fix-auto-next into lp:ubuntuone-ios-client

[Zachery Bir]

This fixes a bug in the behavior where we advance tracks at the end of a loop.

[Jason Foreman (threeve)]

Looks good!

review: Approve

=== modified file 'musicstreaming/utilities/StreamingPlayer.m'
--- musicstreaming/utilities/StreamingPlayer.m	2011-05-13 08:07:05 +0000
+++ musicstreaming/utilities/StreamingPlayer.m	2011-06-16 19:18:32 +0000
@@ -253,7 +253,7 @@
 		}	
 		else
 		{
-			[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setPlayButtonImage) name:@"setPlayButtonImage" object:nil];
+			self.isPlaying = NO;
 			[self destroyStreamer];
 		}
 	}	
@@ -294,7 +294,7 @@
 			
 			playlist = self.isShuffle ? [NSArray arrayWithArray:shufflePlaylist] : [NSArray arrayWithArray:currentPlaylist];
 			
-			currentSong = [playlist objectAtIndex:0];
+			self.currentSong = [playlist objectAtIndex:0];
 			
 			self.songUrl = [[Subsonic sharedSubsonic] getStreamingURLForSongId:self.currentSong.songId];
 			

=== modified file 'musicstreaming/view_controllers/AlbumListViewController.m'
--- musicstreaming/view_controllers/AlbumListViewController.m	2011-06-15 00:46:43 +0000
+++ musicstreaming/view_controllers/AlbumListViewController.m	2011-06-16 19:18:32 +0000
@@ -33,6 +33,10 @@
 + (UINavigationController *)navigableViewController
 {
     AlbumListViewController *albumListViewController = [[[AlbumListViewController alloc] initWithTitle:NSLocalizedString(@"Albums", @"")] autorelease];
+	AlbumListParser *parser = [[AlbumListParser alloc] init];
+	albumListViewController.parserDelegate = parser;
+	albumListViewController.viewName = @"getAlbums.view";
+	
     UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:albumListViewController] autorelease];
     nav.navigationBar.barStyle = UIBarStyleBlack;
     nav.tabBarItem.image = [UIImage imageNamed:@"albums"];
@@ -95,34 +99,6 @@
 }
 
 
-- (void)beginLoadingRemoteData:(NSString*)force
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getAlbums.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;
-	}
-	
-	[xmlParser release];
-	[parser release];
-	
-	[self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO];
-	[self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO];
-	[pool release];
-}
-
-
 - (void)updateReachability:(Reachability*)reachability;
 {
 	[super updateReachability:reachability];

=== modified file 'musicstreaming/view_controllers/AlbumViewController.m'
--- musicstreaming/view_controllers/AlbumViewController.m	2011-06-15 00:46:43 +0000
+++ musicstreaming/view_controllers/AlbumViewController.m	2011-06-16 19:18:32 +0000
@@ -96,8 +96,6 @@
 	if (error)
 	{
 		[self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:error waitUntilDone:NO];
-		[pool release];
-		return;		
 	}
 		
 	[self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO];

=== modified file 'musicstreaming/view_controllers/ArtistListViewController.m'
--- musicstreaming/view_controllers/ArtistListViewController.m	2011-06-15 00:46:43 +0000
+++ musicstreaming/view_controllers/ArtistListViewController.m	2011-06-16 19:18:32 +0000
@@ -44,6 +44,10 @@
 + (UINavigationController *)navigableViewController
 {
     ArtistListViewController *artistListViewController = [[[ArtistListViewController alloc] initWithTitle:NSLocalizedString(@"Artists", @"")] autorelease];
+	ArtistListParser *parser = [[ArtistListParser alloc] init];
+	artistListViewController.parserDelegate = parser;
+	artistListViewController.viewName = @"getIndexes.view";
+	
     UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:artistListViewController] autorelease];
     nav.navigationBar.barStyle = UIBarStyleBlack;
     nav.tabBarItem.image = [UIImage imageNamed:@"artists"];
@@ -86,33 +90,6 @@
 	[self.tableView reloadData];
 }
 
-- (void)beginLoadingRemoteData:(NSString*)force
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getIndexes.view"];
-	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
-	
-	ArtistListParser *parser = [[ArtistListParser alloc] init];
-	[xmlParser setDelegate:parser];
-	
-	if (![xmlParser parse])
-	{
-		[self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:[xmlParser parserError] waitUntilDone:NO];
-		[xmlParser release];
-		[parser release];
-		[pool release];
-		return;
-	}
-				
-	[xmlParser release];
-	[parser release];
-	
-	[self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO];
-	[self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO];
-	[pool release];
-}
-
 - (void)updateReachability:(Reachability*)reachability;
 {
 	[super updateReachability:reachability];

=== modified file 'musicstreaming/view_controllers/ArtistViewController.m'
--- musicstreaming/view_controllers/ArtistViewController.m	2011-06-16 16:52:07 +0000
+++ musicstreaming/view_controllers/ArtistViewController.m	2011-06-16 19:18:32 +0000
@@ -109,8 +109,6 @@
 	if (error)
 	{
 		[self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:error waitUntilDone:NO];
-		[pool release];
-		return;		
 	}
 	
 	[pool release];

=== modified file 'musicstreaming/view_controllers/PlaylistListViewController.m'
--- musicstreaming/view_controllers/PlaylistListViewController.m	2011-06-15 16:49:27 +0000
+++ musicstreaming/view_controllers/PlaylistListViewController.m	2011-06-16 19:18:32 +0000
@@ -30,6 +30,10 @@
 + (UINavigationController *)navigableViewController
 {
     PlaylistListViewController *playlistListViewController = [[[PlaylistListViewController alloc] initWithTitle:NSLocalizedString(@"Playlists", @"")] autorelease];
+	PlaylistListParser *parser = [[PlaylistListParser alloc] init];
+	playlistListViewController.parserDelegate = parser;
+	playlistListViewController.viewName = @"getPlaylists.view";
+	
     UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:playlistListViewController] autorelease];
     nav.navigationBar.barStyle = UIBarStyleBlack;
     nav.tabBarItem.image = [UIImage imageNamed:@"playlists"];
@@ -42,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;
 }
@@ -71,33 +75,6 @@
 	[self.tableView reloadData];
 }
 
-- (void)beginLoadingRemoteData:(NSString*)force
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	
-    NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getPlaylists.view"];
-    NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
-
-    PlaylistListParser *parser = [[PlaylistListParser alloc] init];
-    [xmlParser setDelegate:parser];
-    
-    if (![xmlParser parse])
-    {
-        [self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:[xmlParser parserError] waitUntilDone:NO];
-        [xmlParser release];
-        [parser release];
-        [pool release];
-        return;
-    }
-
-    [xmlParser release];
-    [parser release];
-	
-	[self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO];
-	[self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO];
-	[pool release];
-}
-
 #pragma mark - UITableView
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section

=== modified file 'musicstreaming/view_controllers/PlaylistViewController.m'
--- musicstreaming/view_controllers/PlaylistViewController.m	2011-06-15 16:49:27 +0000
+++ musicstreaming/view_controllers/PlaylistViewController.m	2011-06-16 19:18:32 +0000
@@ -98,8 +98,6 @@
 	if (error)
 	{
 		[self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:error waitUntilDone:NO];
-		[pool release];
-		return;		
 	}
 		
 	[self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO];

=== modified file 'musicstreaming/view_controllers/SongListViewController.m'
--- musicstreaming/view_controllers/SongListViewController.m	2011-06-15 00:46:43 +0000
+++ musicstreaming/view_controllers/SongListViewController.m	2011-06-16 19:18:32 +0000
@@ -31,6 +31,10 @@
 + (UINavigationController *)navigableViewController
 {
     SongListViewController *songListViewController = [[[SongListViewController alloc] initWithTitle:NSLocalizedString(@"Songs", @"")] autorelease];
+	SongListParser *parser = [[SongListParser alloc] init];
+	songListViewController.parserDelegate = parser;
+	songListViewController.viewName = @"getSongs.view";
+	
     UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:songListViewController] autorelease];
     nav.navigationBar.barStyle = UIBarStyleBlack;
     nav.tabBarItem.image = [UIImage imageNamed:@"songs"];
@@ -76,33 +80,6 @@
 	[self.tableView reloadData];
 }
 
-- (void)beginLoadingRemoteData:(NSString*)force
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"getSongs.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;
-	}
-			
-	[xmlParser release];
-	[parser release];
-	
-	[self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO];
-	[self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO];
-	[pool release];
-}
-
 - (void)updateReachability:(Reachability *)reachability
 {
 	[super updateReachability:reachability];

=== modified file 'musicstreaming/view_controllers/SubsonicTableViewController.h'
--- musicstreaming/view_controllers/SubsonicTableViewController.h	2011-06-15 00:46:43 +0000
+++ musicstreaming/view_controllers/SubsonicTableViewController.h	2011-06-16 19:18:32 +0000
@@ -32,6 +32,8 @@
 	NSTimer *respondToRemoteTimer;
     NSMutableArray *tableData;
 	NSMutableArray *searchResults;
+	id <NSXMLParserDelegate> parserDelegate;
+	NSString *viewName;
 	
 @protected
 	BOOL canStream;
@@ -64,6 +66,8 @@
 
 @property(nonatomic,retain) NSMutableArray *tableData;
 @property(nonatomic,retain) NSMutableArray *searchResults;
+@property(nonatomic,assign) id<NSXMLParserDelegate> parserDelegate;
+@property(nonatomic,retain) NSString *viewName;
 
 extern NSString * const NOTIF_reloadAccountCredentials;
 extern NSString * const NOTIF_removeCachedContent;

=== modified file 'musicstreaming/view_controllers/SubsonicTableViewController.m'
--- musicstreaming/view_controllers/SubsonicTableViewController.m	2011-06-16 17:56:08 +0000
+++ musicstreaming/view_controllers/SubsonicTableViewController.m	2011-06-16 19:18:32 +0000
@@ -35,6 +35,7 @@
 
 @implementation SubsonicTableViewController
 @synthesize tableData, searchResults;
+@synthesize parserDelegate, viewName;
 @synthesize hasLoadedRemoteData;
 
 #pragma mark - Initialization
@@ -50,7 +51,10 @@
         self.title = title;
         self.tableData = [NSMutableArray array];
         self.searchResults = [NSMutableArray array];
+		self.parserDelegate = nil;
+		self.viewName = nil;
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resetTableData:) name:NOTIF_removeCachedContent object:nil];
+		
     }
     return self;
 }
@@ -270,10 +274,23 @@
 
 - (void)beginLoadingRemoteData:(NSString*)force
 {
-	//Starts with an NSAutoreleasePool
-	//Loads data either from CoreData or from an XML feed. If force == @"YES"
-	//Release the pool
-	//Call finishLoadingData on the main thread.
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
+	NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:self.viewName];
+	NSXMLParser *xmlParser = [[NSXMLParser alloc] initWithContentsOfURL:url];
+	
+	[xmlParser setDelegate:self.parserDelegate];
+	
+	if (![xmlParser parse])
+	{
+		[self performSelectorOnMainThread:@selector(failedLoadingData:) withObject:[xmlParser parserError] waitUntilDone:NO];
+	}
+				
+	[xmlParser release];
+	
+	[self performSelectorOnMainThread:@selector(loadLocalData) withObject:nil waitUntilDone:NO];
+	[self performSelectorOnMainThread:@selector(finishLoadingData) withObject:nil waitUntilDone:NO];
+	[pool release];
 }
 
 - (void)finishLoadingData
@@ -418,6 +435,8 @@
 {
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 	[hudView hide:NO];
+	RELEASE_SAFELY(parserDelegate);
+	RELEASE_SAFELY(viewName);
 	RELEASE_SAFELY(hudView);
     RELEASE_SAFELY(tableData);
 	RELEASE_SAFELY(searchResults);