ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding deprecated methods back

Browse Source
This commit is contained in:
Max Gu
2016-05-18 14:05:08 -07:00
parent a93bc72e25
commit 90877847c2
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AsyncDisplayKit/ASVideoNode.h
View File

@@ -124,6 +124,11 @@ NS_ASSUME_NONNULL_BEGIN
*/ */
- (void)videoNodeDidRecoverFromStall:(ASVideoNode *)videoNode; - (void)videoNodeDidRecoverFromStall:(ASVideoNode *)videoNode;
// Below are deprecated methods. To be removed in ASDK 2.0 release
- (void)videoPlaybackDidFinish:(ASVideoNode *)videoNode __deprecated;
- (void)videoNodeWasTapped:(ASVideoNode *)videoNode __deprecated;
- (void)videoNode:(ASVideoNode *)videoNode didPlayToSecond:(NSTimeInterval)second __deprecated;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
#endif #endif

24
AsyncDisplayKit/ASVideoNode.mm
View File

@@ -46,6 +46,11 @@ static NSString * const kStatus = @"status";
unsigned int delegateVideoNodeDidFinishInitialLoading:1; unsigned int delegateVideoNodeDidFinishInitialLoading:1;
unsigned int delegateVideoNodeDidStallAtTimeInterval:1; unsigned int delegateVideoNodeDidStallAtTimeInterval:1;
unsigned int delegateVideoNodeDidRecoverFromStall:1; unsigned int delegateVideoNodeDidRecoverFromStall:1;
//Flags for deprecated methods
unsigned int delegateVideoDidPlayToEnd_deprecated:1;
unsigned int delegateDidTapVideoNode_deprecated:1;
unsigned int delegateVideoNodeDidPlayToTimeInterval_deprecated:1;
} _delegateFlags; } _delegateFlags;
BOOL _shouldBePlaying; BOOL _shouldBePlaying;
@@ -339,6 +344,10 @@ static NSString * const kStatus = @"status";
{ {
if (_delegateFlags.delegateDidTapVideoNode) { if (_delegateFlags.delegateDidTapVideoNode) {
[_delegate didTapVideoNode:self]; [_delegate didTapVideoNode:self];
} else if (_delegateFlags.delegateDidTapVideoNode_deprecated) {
// TODO: This method is deprecated, remove in ASDK 2.0
[_delegate videoNodeWasTapped:self];
} else { } else {
if (_shouldBePlaying) { if (_shouldBePlaying) {
[self pause]; [self pause];
@@ -384,6 +393,10 @@ static NSString * const kStatus = @"status";
if (_delegateFlags.delegateVideoNodeDidPlayToTimeInterval) { if (_delegateFlags.delegateVideoNodeDidPlayToTimeInterval) {
[_delegate videoNode:self didPlayToTimeInterval:timeInSeconds]; [_delegate videoNode:self didPlayToTimeInterval:timeInSeconds];
} else if (_delegateFlags.delegateVideoNodeDidPlayToTimeInterval_deprecated) {
// TODO: This method is deprecated, remove in ASDK 2.0
[_delegate videoNode:self didPlayToSecond:timeInSeconds];
} }
} }
@@ -506,6 +519,14 @@ static NSString * const kStatus = @"status";
_delegateFlags.delegateVideoNodeDidFinishInitialLoading = [_delegate respondsToSelector:@selector(videoNodeDidFinishInitialLoading:)]; _delegateFlags.delegateVideoNodeDidFinishInitialLoading = [_delegate respondsToSelector:@selector(videoNodeDidFinishInitialLoading:)];
_delegateFlags.delegateVideoNodeDidStallAtTimeInterval = [_delegate respondsToSelector:@selector(videoNode:didStallAtTimeInterval:)]; _delegateFlags.delegateVideoNodeDidStallAtTimeInterval = [_delegate respondsToSelector:@selector(videoNode:didStallAtTimeInterval:)];
_delegateFlags.delegateVideoNodeDidRecoverFromStall = [_delegate respondsToSelector:@selector(videoNodeDidRecoverFromStall:)]; _delegateFlags.delegateVideoNodeDidRecoverFromStall = [_delegate respondsToSelector:@selector(videoNodeDidRecoverFromStall:)];
// deprecated methods
_delegateFlags.delegateVideoDidPlayToEnd_deprecated = [_delegate respondsToSelector:@selector(videoPlaybackDidFinish:)];
_delegateFlags.delegateVideoNodeDidPlayToTimeInterval_deprecated = [_delegate respondsToSelector:@selector(videoNode:didPlayToSecond:)];
_delegateFlags.delegateDidTapVideoNode_deprecated = [_delegate respondsToSelector:@selector(videoNodeWasTapped:)];
ASDisplayNodeAssert((_delegateFlags.delegateVideoDidPlayToEnd && _delegateFlags.delegateVideoDidPlayToEnd_deprecated) == NO, @"Implemented both deprecated and non-deprecated methods - please remove videoPlaybackDidFinish, it's deprecated");
ASDisplayNodeAssert((_delegateFlags.delegateVideoNodeDidPlayToTimeInterval && _delegateFlags.delegateVideoNodeDidPlayToTimeInterval_deprecated) == NO, @"Implemented both deprecated and non-deprecated methods - please remove videoNodeWasTapped, it's deprecated");
ASDisplayNodeAssert((_delegateFlags.delegateDidTapVideoNode && _delegateFlags.delegateDidTapVideoNode_deprecated) == NO, @"Implemented both deprecated and non-deprecated methods - please remove didPlayToSecond, it's deprecated");
} }
} }
@@ -654,6 +675,9 @@ static NSString * const kStatus = @"status";
self.playerState = ASVideoNodePlayerStateFinished; self.playerState = ASVideoNodePlayerStateFinished;
if (_delegateFlags.delegateVideoDidPlayToEnd) { if (_delegateFlags.delegateVideoDidPlayToEnd) {
[_delegate videoDidPlayToEnd:self]; [_delegate videoDidPlayToEnd:self];
} else if (_delegateFlags.delegateVideoDidPlayToEnd_deprecated) {
// TODO: This method is deprecated, remove in ASDK 2.0
[_delegate videoPlaybackDidFinish:self];
} }
[_player seekToTime:kCMTimeZero]; [_player seekToTime:kCMTimeZero];