diff --git a/AsyncDisplayKit/ASVideoNode.mm b/AsyncDisplayKit/ASVideoNode.mm index c1fecba3c7..63b00830bc 100644 --- a/AsyncDisplayKit/ASVideoNode.mm +++ b/AsyncDisplayKit/ASVideoNode.mm @@ -170,7 +170,7 @@ static NSString * const kStatus = @"status"; ASPerformBlockOnMainThread(^{ // Ensure the asset hasn't changed since the image request was made if (ASAssetIsEqual(weakSelf.asset, asset)) { - [weakSelf setPlaceholderImage:image]; + [weakSelf setVideoPlaceholderImage:image]; } }); }]; @@ -201,7 +201,7 @@ static NSString * const kStatus = @"status"; }); } -- (void)setPlaceholderImage:(UIImage *)image +- (void)setVideoPlaceholderImage:(UIImage *)image { ASDN::MutexLocker l(_videoLock); diff --git a/AsyncDisplayKitTests/ASVideoNodeTests.m b/AsyncDisplayKitTests/ASVideoNodeTests.m index 4d6b471c9a..3effa2431a 100644 --- a/AsyncDisplayKitTests/ASVideoNodeTests.m +++ b/AsyncDisplayKitTests/ASVideoNodeTests.m @@ -31,7 +31,7 @@ @property (atomic, readwrite) AVPlayer *player; @property (atomic, readwrite) BOOL shouldBePlaying; -- (void)setPlaceholderImage:(UIImage *)image; +- (void)setVideoPlaceholderImage:(UIImage *)image; @end @@ -330,7 +330,7 @@ - (void)testSettingVideoGravityChangesPlaceholderContentMode { - [_videoNode setPlaceholderImage:[[UIImage alloc] init]]; + [_videoNode setVideoPlaceholderImage:[[UIImage alloc] init]]; XCTAssertEqual(UIViewContentModeScaleAspectFit, _videoNode.placeholderImageNode.contentMode); _videoNode.gravity = AVLayerVideoGravityResize; @@ -363,7 +363,7 @@ UIImage *firstImage = [[UIImage alloc] init]; _videoNode.asset = _firstAsset; - [_videoNode setPlaceholderImage:firstImage]; + [_videoNode setVideoPlaceholderImage:firstImage]; XCTAssertEqual(firstImage, _videoNode.placeholderImageNode.image); _videoNode.asset = _secondAsset; @@ -374,7 +374,7 @@ { _videoNode.asset = _firstAsset; [_videoNode fetchData]; - [_videoNode setPlaceholderImage:[[UIImage alloc] init]]; + [_videoNode setVideoPlaceholderImage:[[UIImage alloc] init]]; XCTAssertNotNil(_videoNode.player); XCTAssertNotNil(_videoNode.currentItem); XCTAssertNotNil(_videoNode.placeholderImageNode.image);