From c783288602e68deb3c7fbe1454e651490be92f71 Mon Sep 17 00:00:00 2001 From: buffpojken Date: Sun, 13 Sep 2015 17:44:31 +0200 Subject: [PATCH 1/3] added patched support for completely local files --- Pod/Classes/AUMediaItem.h | 5 +++++ Pod/Classes/AUMediaPlayer.m | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Pod/Classes/AUMediaItem.h b/Pod/Classes/AUMediaItem.h index 1f72195..4356891 100644 --- a/Pod/Classes/AUMediaItem.h +++ b/Pod/Classes/AUMediaItem.h @@ -30,6 +30,11 @@ typedef NS_ENUM(NSInteger, AUMediaType){ @protocol AUMediaItem +@optional + +- (bool)isLocalItem; +- (NSString *)localPath; + @required /***************************************************************************** diff --git a/Pod/Classes/AUMediaPlayer.m b/Pod/Classes/AUMediaPlayer.m index bcedc79..1ae97b0 100644 --- a/Pod/Classes/AUMediaPlayer.m +++ b/Pod/Classes/AUMediaPlayer.m @@ -279,6 +279,10 @@ - (void)updatePlayerWithItem:(id)item error:(NSError * __autoreleas [self prepareForCurrentItemReplacementWithItem:item]; NSURL *url = nil; + if([item isLocalItem]) { + url = [NSURL fileURLWithPath: [item localPath]]; + NSLog(@"Playback will occur with a completely local item at: %@", url); + } if ([_library itemIsDownloaded:item]) { url = [NSURL fileURLWithPath:[_library localPathForItem:item]]; NSLog(@"Playback will occur from local file with url: %@", url); From 9f320035bbb5017bd5eb8de095c1ae12e0b314aa Mon Sep 17 00:00:00 2001 From: buffpojken Date: Sun, 13 Sep 2015 17:57:52 +0200 Subject: [PATCH 2/3] made sure only one is selected --- Pod/Classes/AUMediaPlayer.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pod/Classes/AUMediaPlayer.m b/Pod/Classes/AUMediaPlayer.m index 1ae97b0..e41a23e 100644 --- a/Pod/Classes/AUMediaPlayer.m +++ b/Pod/Classes/AUMediaPlayer.m @@ -283,7 +283,7 @@ - (void)updatePlayerWithItem:(id)item error:(NSError * __autoreleas url = [NSURL fileURLWithPath: [item localPath]]; NSLog(@"Playback will occur with a completely local item at: %@", url); } - if ([_library itemIsDownloaded:item]) { + if ([_library itemIsDownloaded:item] && !url) { url = [NSURL fileURLWithPath:[_library localPathForItem:item]]; NSLog(@"Playback will occur from local file with url: %@", url); } From cf75a26e71f64a12917005823028d9df0031d48f Mon Sep 17 00:00:00 2001 From: buffpojken Date: Thu, 17 Sep 2015 01:37:51 +0200 Subject: [PATCH 3/3] fixed issues with PR --- Pod/Classes/AUMediaItem.h | 2 +- Pod/Classes/AUMediaPlayer.m | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Pod/Classes/AUMediaItem.h b/Pod/Classes/AUMediaItem.h index 4356891..3f91e28 100644 --- a/Pod/Classes/AUMediaItem.h +++ b/Pod/Classes/AUMediaItem.h @@ -32,7 +32,7 @@ typedef NS_ENUM(NSInteger, AUMediaType){ @optional -- (bool)isLocalItem; +- (BOOL)isLocalItem; - (NSString *)localPath; @required diff --git a/Pod/Classes/AUMediaPlayer.m b/Pod/Classes/AUMediaPlayer.m index e41a23e..9d48e8a 100644 --- a/Pod/Classes/AUMediaPlayer.m +++ b/Pod/Classes/AUMediaPlayer.m @@ -281,7 +281,6 @@ - (void)updatePlayerWithItem:(id)item error:(NSError * __autoreleas NSURL *url = nil; if([item isLocalItem]) { url = [NSURL fileURLWithPath: [item localPath]]; - NSLog(@"Playback will occur with a completely local item at: %@", url); } if ([_library itemIsDownloaded:item] && !url) { url = [NSURL fileURLWithPath:[_library localPathForItem:item]];