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

Renaming the delegate flags for the deprecated methods

Browse Source
This commit is contained in:
Max Gu 2016-05-18 22:10:06 -07:00
parent 1c64a4a785
commit 73b41ee450
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
AsyncDisplayKit/ASVideoNode.mm
View File

@ -48,9 +48,9 @@ static NSString * const kStatus = @"status";
unsigned int delegateVideoNodeDidRecoverFromStall:1; unsigned int delegateVideoNodeDidRecoverFromStall:1;
//Flags for deprecated methods //Flags for deprecated methods
unsigned int delegateVideoDidPlayToEnd_deprecated:1; unsigned int delegateVideoPlaybackDidFinish_deprecated:1;
unsigned int delegateDidTapVideoNode_deprecated:1; unsigned int delegateVideoNodeWasTapped_deprecated:1;
unsigned int delegateVideoNodeDidPlayToTimeInterval_deprecated:1; unsigned int delegateVideoNodeDidPlayToSecond_deprecated:1;
} _delegateFlags; } _delegateFlags;
BOOL _shouldBePlaying; BOOL _shouldBePlaying;
@ -345,7 +345,7 @@ static NSString * const kStatus = @"status";
if (_delegateFlags.delegateDidTapVideoNode) { if (_delegateFlags.delegateDidTapVideoNode) {
[_delegate didTapVideoNode:self]; [_delegate didTapVideoNode:self];
} else if (_delegateFlags.delegateDidTapVideoNode_deprecated) { } else if (_delegateFlags.delegateVideoNodeWasTapped_deprecated) {
// TODO: This method is deprecated, remove in ASDK 2.0 // TODO: This method is deprecated, remove in ASDK 2.0
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@ -397,7 +397,7 @@ 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) { } else if (_delegateFlags.delegateVideoNodeDidPlayToSecond_deprecated) {
// TODO: This method is deprecated, remove in ASDK 2.0 // TODO: This method is deprecated, remove in ASDK 2.0
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@ -527,12 +527,12 @@ static NSString * const kStatus = @"status";
_delegateFlags.delegateVideoNodeDidRecoverFromStall = [_delegate respondsToSelector:@selector(videoNodeDidRecoverFromStall:)]; _delegateFlags.delegateVideoNodeDidRecoverFromStall = [_delegate respondsToSelector:@selector(videoNodeDidRecoverFromStall:)];
// deprecated methods // deprecated methods
_delegateFlags.delegateVideoDidPlayToEnd_deprecated = [_delegate respondsToSelector:@selector(videoPlaybackDidFinish:)]; _delegateFlags.delegateVideoPlaybackDidFinish_deprecated = [_delegate respondsToSelector:@selector(videoPlaybackDidFinish:)];
_delegateFlags.delegateVideoNodeDidPlayToTimeInterval_deprecated = [_delegate respondsToSelector:@selector(videoNode:didPlayToSecond:)]; _delegateFlags.delegateVideoNodeDidPlayToSecond_deprecated = [_delegate respondsToSelector:@selector(videoNode:didPlayToSecond:)];
_delegateFlags.delegateDidTapVideoNode_deprecated = [_delegate respondsToSelector:@selector(videoNodeWasTapped:)]; _delegateFlags.delegateVideoNodeWasTapped_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.delegateVideoDidPlayToEnd && _delegateFlags.delegateVideoPlaybackDidFinish_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.delegateVideoNodeDidPlayToTimeInterval && _delegateFlags.delegateVideoNodeDidPlayToSecond_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"); ASDisplayNodeAssert((_delegateFlags.delegateDidTapVideoNode && _delegateFlags.delegateVideoNodeWasTapped_deprecated) == NO, @"Implemented both deprecated and non-deprecated methods - please remove didPlayToSecond, it's deprecated");
} }
} }
@ -681,7 +681,7 @@ 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) { } else if (_delegateFlags.delegateVideoPlaybackDidFinish_deprecated) {
// TODO: This method is deprecated, remove in ASDK 2.0 // TODO: This method is deprecated, remove in ASDK 2.0
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@ -799,4 +799,4 @@ static NSString * const kStatus = @"status";
} }
@end @end
#endif #endif