railbird/react-native-video
10
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #70 from brentvatne/fix/player-access

Browse Source 
Fix issues that arise due to accessing _player on a queue other than main
This commit is contained in:
Baris Sencan
2015-07-01 14:16:59 -07:00
parent 228566951e e8e3ffec89
commit dae2ea2f66
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
RCTVideo.m
View File

@@ -264,13 +264,13 @@ static NSString *const statusKeyPath = @"status";
dispatch_async(dispatch_get_main_queue(), ^{
// listen for end of file
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(playerItemDidEnd:)
selector:@selector(playerItemDidReachEnd:)
name:AVPlayerItemDidPlayToEndTimeNotification
object:[_player currentItem]];
});
}
- (void)playerItemDidEnd:(NSNotification *)notification
- (void)playerItemDidReachEnd:(NSNotification *)notification
{
[_eventDispatcher sendInputEventWithName:RNVideoEventEnd body:@{
@"target": self.reactTag
@@ -287,17 +287,23 @@ static NSString *const statusKeyPath = @"status";
- (void)setResizeMode:(NSString*)mode
{
_resizeMode = mode;
_playerLayer.videoGravity = mode;
dispatch_async(dispatch_get_main_queue(), ^{
_playerLayer.videoGravity = mode;
});
}
- (void)setPaused:(BOOL)paused
{
if (paused) {
[self stopProgressTimer];
[_player pause];
dispatch_async(dispatch_get_main_queue(), ^{
[_player pause];
});
} else {
[self startProgressTimer];
[_player play];
dispatch_async(dispatch_get_main_queue(), ^{
[_player play];
});
}
_paused = paused;
@@ -317,13 +323,15 @@ static NSString *const statusKeyPath = @"status";
CMTime tolerance = CMTimeMake(1000, timeScale);
if (CMTimeCompare(current, cmSeekTime) != 0) {
[_player seekToTime:cmSeekTime toleranceBefore:tolerance toleranceAfter:tolerance completionHandler:^(BOOL finished) {
[_eventDispatcher sendInputEventWithName:RNVideoEventSeek body:@{
@"currentTime": [NSNumber numberWithFloat:CMTimeGetSeconds(item.currentTime)],
@"seekTime": [NSNumber numberWithFloat:seekTime],
@"target": self.reactTag
dispatch_async(dispatch_get_main_queue(), ^{
[_player seekToTime:cmSeekTime toleranceBefore:tolerance toleranceAfter:tolerance completionHandler:^(BOOL finished) {
[_eventDispatcher sendInputEventWithName:RNVideoEventSeek body:@{
@"currentTime": [NSNumber numberWithFloat:CMTimeGetSeconds(item.currentTime)],
@"seekTime": [NSNumber numberWithFloat:seekTime],
@"target": self.reactTag
}];
}];
}];
});
_pendingSeek = false;
}
@@ -357,17 +365,23 @@ static NSString *const statusKeyPath = @"status";
- (void)applyModifiers
{
if (_muted) {
[_player setVolume:0];
[_player setMuted:YES];
dispatch_async(dispatch_get_main_queue(), ^{
[_player setVolume:0];
[_player setMuted:YES];
});
} else {
[_player setVolume:_volume];
[_player setMuted:NO];
dispatch_async(dispatch_get_main_queue(), ^{
[_player setVolume:_volume];
[_player setMuted:NO];
});
}
[self setResizeMode:_resizeMode];
[self setRepeat:_repeat];
[self setPaused:_paused];
[_player setRate:_rate];
dispatch_async(dispatch_get_main_queue(), ^{
[_player setRate:_rate];
});
}
- (void)setRepeat:(BOOL)repeat {