Merge pull request #135 from zhgchgli0718/change-and-add-item-change-…

…delegate Optimize hysteriaPlayerCurrentItemChanged
StreetVoice · Jan 21, 2021 · 8ce5063 · 8ce5063
2 parents b032bad + 64981d2
commit 8ce5063
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/HysteriaPlayer/HysteriaPlayer.h b/HysteriaPlayer/HysteriaPlayer.h
@@ -47,6 +47,7 @@ typedef NS_ENUM(NSInteger, HysteriaPlayerFailed) {
 @optional
 - (void)hysteriaPlayerWillChangedAtIndex:(NSInteger)index;
 - (void)hysteriaPlayerCurrentItemChanged:(AVPlayerItem *)item;
+- (void)hysteriaPlayerCurrentItemEvicted:(AVPlayerItem *)item;
 - (void)hysteriaPlayerRateChanged:(BOOL)isPlaying;
 - (void)hysteriaPlayerDidReachEnd;
 - (void)hysteriaPlayerCurrentItemPreloaded:(CMTime)time;

diff --git a/HysteriaPlayer/HysteriaPlayer.m b/HysteriaPlayer/HysteriaPlayer.m
@@ -765,13 +765,17 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
     if (object == self.audioPlayer && [keyPath isEqualToString:@"currentItem"]) {
         AVPlayerItem *newPlayerItem = [change objectForKey:NSKeyValueChangeNewKey];
         AVPlayerItem *lastPlayerItem = [change objectForKey:NSKeyValueChangeOldKey];
-        if (lastPlayerItem != (id)[NSNull null]) {
+        if (lastPlayerItem != (id)[NSNull null] && lastPlayerItem != nil) {
             @try {
                 [lastPlayerItem removeObserver:self forKeyPath:@"loadedTimeRanges" context:nil];
                 [lastPlayerItem removeObserver:self forKeyPath:@"status" context:nil];
             } @catch(id anException) {
                 //do nothing, obviously it wasn't attached because an exception was thrown
             }
+
+            if ([self.delegate respondsToSelector:@selector(hysteriaPlayerCurrentItemEvicted:)]) {
+                [self.delegate hysteriaPlayerCurrentItemEvicted:lastPlayerItem];
+            }
         }
         if (newPlayerItem != (id)[NSNull null]) {
             [newPlayerItem addObserver:self forKeyPath:@"loadedTimeRanges" options:NSKeyValueObservingOptionNew context:nil];