Revert "Merge pull request #122 from kjpolaszek/master"

This reverts commit 662e7d4, reversing changes made to 4945c26.
StreetVoice · Dec 4, 2016 · 5a9bc4b · 5a9bc4b
1 parent 915ee25
commit 5a9bc4b
Showing 1 changed file with 12 additions and 21 deletions.
diff --git 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];
+    });
 }