From 5a9bc4bf7afce5b69c20487178337de711cb9975 Mon Sep 17 00:00:00 2001 From: Saiday Date: Sun, 4 Dec 2016 19:28:42 +0800 Subject: [PATCH] Revert "Merge pull request #122 from kjpolaszek/master" This reverts commit 662e7d4d9d0ffec5740e98f0de7c264bf3273667, reversing changes made to 4945c265c26dc80ecaa3e146128a9842591953f2. --- HysteriaPlayer/HysteriaPlayer.m | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/HysteriaPlayer/HysteriaPlayer.m b/HysteriaPlayer/HysteriaPlayer.m index 5afdc14..817d8ae 100755 --- a/HysteriaPlayer/HysteriaPlayer.m +++ b/HysteriaPlayer/HysteriaPlayer.m @@ -305,28 +305,19 @@ - (void)getSourceURLAtIndex:(NSInteger)index preBuffer:(BOOL)preBuffer - (void)setupPlayerItemWithUrl:(NSURL *)url index:(NSInteger)index { - AVURLAsset *asset = [[AVURLAsset alloc] initWithURL:url options:nil]; - NSArray *keys = @[@"playable"]; - - AVPlayerItem *item = [AVPlayerItem playerItemWithAsset:asset]; + AVPlayerItem *item = [AVPlayerItem playerItemWithURL:url]; + if (!item) + return; - [asset loadValuesAsynchronouslyForKeys:keys completionHandler:^() { - - dispatch_async(dispatch_get_main_queue(), ^{ - - [self setHysteriaIndex:item key:[NSNumber numberWithInteger:index]]; - - if (self.isMemoryCached) { - NSMutableArray *playerItems = [NSMutableArray arrayWithArray:self.playerItems]; - [playerItems addObject:item]; - self.playerItems = playerItems; - } - - if ([self getLastItemIndex] == index) { - [self insertPlayerItem:item]; - } - }); - }]; + dispatch_async(dispatch_get_main_queue(), ^{ + [self setHysteriaIndex:item key:[NSNumber numberWithInteger:index]]; + if (self.isMemoryCached) { + NSMutableArray *playerItems = [NSMutableArray arrayWithArray:self.playerItems]; + [playerItems addObject:item]; + self.playerItems = playerItems; + } + [self insertPlayerItem:item]; + }); }