Cleanup ASVideoNode a bit

Author: maicki

AsyncDisplayKit/ASVideoNode.mm

@@ -90,7 +90,8 @@ @implementation ASVideoNode
 
 // TODO: Support preview images with HTTP Live Streaming videos.
 
-#pragma mark - Construction and Layout
+#pragma mark - Lifecycle
+
 
 - (instancetype)init
 {
@@ -228,6 +229,22 @@ - (void) removePlayerObservers:(AVPlayer *)player
   }
 }
 
+- (void)_fetchDataForVideoNode
+{
+  [self setNeedsPreload];
+}
+
+- (void)_clearVideoNode
+{
+  self.videoPlaceholderImage = nil;
+  self.player = nil;
+  self.currentItem = nil;
+  self.playerState = ASVideoNodePlayerStateUnknown;
+}
+
+#pragma mark - Layout
+
+
 - (void)layout
 {
   [super layout];
@@ -301,7 +318,7 @@ - (void)setVideoPlaceholderImage:(UIImage *)image
   if (image != nil) {
     self.contentMode = ASContentModeFromVideoGravity(_gravity);
   }
-  [self __setImage:image];
+  self.image = image;
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
@@ -413,10 +430,7 @@ - (void)didExitPreloadState
 
   {
     ASDN::MutexLocker l(__instanceLock__);
-
-    self.player = nil;
-    self.currentItem = nil;
-    self.playerState = ASVideoNodePlayerStateUnknown;
+    [self _clearVideoNode];
   }
 }
 
@@ -507,10 +521,15 @@ - (AVAsset *)asset
 
 - (void)_setAndFetchAsset:(AVAsset *)asset url:(NSURL *)assetURL
 {
-  [self didExitPreloadState];
-  _asset = asset;
-  _assetURL = assetURL;
-  [self setNeedsPreload];
+  [self _clearVideoNode];
+  
+  {
+    ASDN::MutexLocker l(__instanceLock__);
+    _asset = asset;
+    _assetURL = assetURL;
+  }
+  
+  [self _fetchDataForVideoNode];
 }
 
 - (void)setVideoComposition:(AVVideoComposition *)videoComposition
@@ -619,7 +638,7 @@ - (void)play
   }
 
   if (_player == nil) {
-    [self setNeedsPreload];
+    [self _fetchDataForVideoNode];
   }
 
   if (_playerNode == nil) {