Fix deallocations

priore · May 19, 2016 · c7632f7 · c7632f7
1 parent 6ec1a9c
commit c7632f7
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 30 deletions.
diff --git a/AVPlayerOverlay.podspec b/AVPlayerOverlay.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                    = 'AVPlayerOverlay'
-  s.version                 = '1.3.0'
+  s.version                 = '1.3.1'
   s.summary                 = 'AVPlayer with custom controls and full screen features.'
   s.license                 = 'MIT'
   s.ios.platform            = '7.1'

diff --git a/AVPlayerOverlay/AVPlayer/AVPlayerOverlayVC.m b/AVPlayerOverlay/AVPlayer/AVPlayerOverlayVC.m
@@ -77,14 +77,18 @@ - (void)viewDidLoad
 
 - (void)dealloc
 {
-    _volume = nil;
+    [NSObject cancelPreviousPerformRequestsWithTarget:self];
 
     if (_timeObserver)
         [_player removeTimeObserver:_timeObserver];
     _timeObserver = nil;
-
+
+    _volume = nil;
+    _player = nil;
+
     [_window removeFromSuperview], _window = nil;
     [_mainWindow makeKeyAndVisible];
+
 }
 
 - (void)setPlayer:(AVPlayer *)player
@@ -104,11 +108,11 @@ - (void)setPlayer:(AVPlayer *)player
         } else {
 
             __weak typeof(self) wself = self;
-            self.timeObserver =  [self.player addPeriodicTimeObserverForInterval:CMTimeMakeWithSeconds(1.0 / 60.0, NSEC_PER_SEC)
-                                                                           queue:NULL
-                                                                      usingBlock:^(CMTime time){
-                                                                          [wself updateProgressBar];
-                                                                      }];
+            self.timeObserver =  [_player addPeriodicTimeObserverForInterval:CMTimeMakeWithSeconds(1.0 / 60.0, NSEC_PER_SEC)
+                                                                       queue:NULL
+                                                                  usingBlock:^(CMTime time){
+                                                                      [wself updateProgressBar];
+                                                                  }];
             _videoSlider.value = 0;
             _volumeSlider.value = _player.volume;
         }

diff --git a/AVPlayerOverlay/AVPlayer/AVPlayerVC.m b/AVPlayerOverlay/AVPlayer/AVPlayerVC.m
@@ -33,30 +33,22 @@ - (void)viewDidLoad
         [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
         [[AVAudioSession sharedInstance] setActive:YES error:nil];
 
-        [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillResignActiveNotification
-                                                          object:nil
-                                                           queue:NULL
-                                                      usingBlock:^(NSNotification *note) {
-                                                          [self playInBackground:YES];
-                                                      }];
-
-        [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillEnterForegroundNotification
-                                                          object:nil
-                                                           queue:NULL
-                                                      usingBlock:^(NSNotification *note) {
-                                                          [self playInBackground:NO];
-                                                      }];
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(applicationWillResignActiveNotification:)
+                                                     name:UIApplicationWillResignActiveNotification
+                                                   object:nil];
+
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(applicationWillEnterForegroundNotification:)
+                                                     name:UIApplicationWillEnterForegroundNotification
+                                                   object:nil];
     }
 
-    [[NSNotificationCenter defaultCenter] addObserverForName:AVPlayerVCSetVideoURLNotification
-                                                      object:nil
-                                                       queue:NULL
-                                                  usingBlock:^(NSNotification *note) {
-                                                      self.videoURL = note.object;
-                                                  }];
-
-
-
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(avPlayerVCSetVideoURLNotification:)
+                                                 name:AVPlayerVCSetVideoURLNotification
+                                               object:nil];
+
     _overlayVC = [self.storyboard instantiateViewControllerWithIdentifier:_overlayStoryboardId];
 
     [self addChildViewController:_overlayVC];
@@ -135,6 +127,11 @@ - (void)remoteControlReceivedWithEvent:(UIEvent *)event
 - (void)dealloc
 {
     _overlayVC = nil;
+
+    [self.player pause], self.player = nil;
+
+    [NSObject cancelPreviousPerformRequestsWithTarget:self];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 #pragma mark - Video (only audio) on background
@@ -161,4 +158,21 @@ - (void)playInBackground:(BOOL)play
         [self.player performSelector:@selector(play) withObject:nil afterDelay:1.0];
 }
 
+#pragma mark - Notifications
+
+- (void)applicationWillResignActiveNotification:(NSNotification*)note
+{
+    [self playInBackground:YES];
+}
+
+- (void)applicationWillEnterForegroundNotification:(NSNotification*)note
+{
+    [self playInBackground:NO];
+}
+
+- (void)avPlayerVCSetVideoURLNotification:(NSNotification*)note
+{
+    self.videoURL = note.object;
+}
+
 @end