Merge lp:~rockstar/ubuntuone-ios-music/airplay-support into lp:ubuntuone-ios-music

[Paul Hummer]

Support airplay

This branch adds airplay support, so any airplay compatible devices can receive the music streaming as well as control play/pause/next/prev AND receive information about the song.

Tested on my AppleTV

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

Cool feature :-)

review: Approve

=== modified file 'Music/Utilities/UOPlayer.m'
--- Music/Utilities/UOPlayer.m	2013-02-13 18:33:19 +0000
+++ Music/Utilities/UOPlayer.m	2013-02-13 20:34:28 +0000
@@ -60,6 +60,12 @@
     [self addObserver:self forKeyPath:@"currentIndex" options:nil context:NULL];
     
     player = [[AVPlayer alloc] init];
+    player.allowsAirPlayVideo = NO;
+    __block id weakself = self;
+    [player addPeriodicTimeObserverForInterval:CMTimeMake(1, 1) queue:NULL usingBlock:^(CMTime time) {
+        [weakself heartbeat];
+    }];
+    
     NSError *error;
     AVAudioSession *audioSession = [AVAudioSession sharedInstance];
     [audioSession setDelegate:self];
@@ -74,6 +80,7 @@
     }
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(songComplete) name:AVPlayerItemDidPlayToEndTimeNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(songChanged) name:kPlayerSongChanged object:nil];
     
     [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerStateChanged object:nil];
     return self;
@@ -251,13 +258,6 @@
     AVPlayerItem *item = [[AVPlayerItem alloc] initWithURL:song.localURL];
     [player replaceCurrentItemWithPlayerItem:item];
     [player play];
-    
-    NSDictionary *songInfo = @{MPMediaItemPropertyAlbumArtist: song.albumArtist.name,
-                               MPMediaItemPropertyAlbumTitle: song.album.title,
-                               MPMediaItemPropertyTitle: song.title,
-                               MPMediaItemPropertyArtwork: [[MPMediaItemArtwork alloc] initWithImage:song.art]
-                               };
-    [[MPNowPlayingInfoCenter defaultCenter] setNowPlayingInfo:songInfo];
 
     [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerSongChanged object:nil];
     [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerStateChanged object:nil];
@@ -278,4 +278,27 @@
     [self next];
 }
 
+- (void)songChanged {
+    Song *song = [[self currentPlaylist] objectAtIndex:self.currentIndex];
+    NSDictionary *songInfo = @{MPMediaItemPropertyAlbumTitle: song.album.title,
+                               MPMediaItemPropertyAlbumTrackCount: [NSNumber numberWithInt:[song.album.songs count]],
+                               MPMediaItemPropertyAlbumTrackNumber: [NSNumber numberWithInt:song.track],
+                               MPMediaItemPropertyAlbumArtist: song.albumArtist ? song.albumArtist.name : song.artist.name,
+                               MPMediaItemPropertyArtwork: [[MPMediaItemArtwork alloc] initWithImage:song.art],
+                               MPMediaItemPropertyPlaybackDuration: [NSNumber numberWithInt:song.duration],
+                               MPMediaItemPropertyTitle: song.title,
+                               
+                               MPNowPlayingInfoPropertyPlaybackQueueIndex: [NSNumber numberWithInt:self.currentIndex],
+                               MPNowPlayingInfoPropertyPlaybackQueueCount: [NSNumber numberWithInt:[songs count]]
+                               };
+    [[MPNowPlayingInfoCenter defaultCenter] setNowPlayingInfo:songInfo];
+}
+
+- (void)heartbeat {
+    NSMutableDictionary *songInfo = [[[MPNowPlayingInfoCenter defaultCenter] nowPlayingInfo] mutableCopy];
+    [songInfo setObject:[NSNumber numberWithInt:CMTimeGetSeconds([player currentTime])] forKey:MPNowPlayingInfoPropertyElapsedPlaybackTime];
+    [[MPNowPlayingInfoCenter defaultCenter] setNowPlayingInfo:songInfo];
+    //NSLog(@"heartbeat");
+}
+
 @end

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2013-02-13 04:36:08 +0000
+++ U1Music.xcodeproj/project.pbxproj	2013-02-13 20:34:28 +0000
@@ -667,7 +667,6 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				52BC20DB16CB417700E22294 /* CoreMedia.framework */,
 				5268508516AE516B001F65A6 /* RestKit.xcodeproj */,
 				5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */,
 				93F3346C1247FB78006C6707 /* Music */,
@@ -702,6 +701,7 @@
 			children = (
 				52BC20D416CB18A100E22294 /* AVFoundation.framework */,
 				5279764815F00B2600F8435F /* libz.dylib */,
+				52BC20DB16CB417700E22294 /* CoreMedia.framework */,
 				5257416C16C5653100530CCC /* Crashlytics.framework */,
 				5268510716AEFD20001F65A6 /* MobileCoreServices.framework */,
 				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,