Unverified Commit c427d0ba authored by Hampton Maxwell's avatar Hampton Maxwell Committed by GitHub
Browse files

Merge pull request #1267 from react-native-community/chore/external-playback-cleanup 

Minor cleanups to onExternalPlaybackChange
parents 2688dd9e 77724790

Video.js

+2 −1
Changes for Video.js: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ export default class Video extends Component { 
      onVideoBuffer: this._onBuffer,

      onTimedMetadata: this._onTimedMetadata,

      onVideoAudioBecomingNoisy: this._onAudioBecomingNoisy,

      onVideoExternalPlaybackChange: this._onExternalPlaybackChange,

      onVideoFullscreenPlayerWillPresent: this._onFullscreenPlayerWillPresent,

      onVideoFullscreenPlayerDidPresent: this._onFullscreenPlayerDidPresent,

      onVideoFullscreenPlayerWillDismiss: this._onFullscreenPlayerWillDismiss,
@@ -252,7 +253,6 @@ export default class Video extends Component { 
      onPlaybackRateChange: this._onPlaybackRateChange,

      onAudioFocusChanged: this._onAudioFocusChanged,

      onAudioBecomingNoisy: this._onAudioBecomingNoisy,

      onExternalPlaybackChange: this._onExternalPlaybackChange,

    });



    const posterStyle = {
@@ -291,6 +291,7 @@ Video.propTypes = { 
  onVideoEnd: PropTypes.func,

  onTimedMetadata: PropTypes.func,

  onVideoAudioBecomingNoisy: PropTypes.func,

  onVideoExternalPlaybackChange: PropTypes.func,

  onVideoFullscreenPlayerWillPresent: PropTypes.func,

  onVideoFullscreenPlayerDidPresent: PropTypes.func,

  onVideoFullscreenPlayerWillDismiss: PropTypes.func,

ios/Video/RCTVideo.h

+1 −1
Changes for ios/Video/RCTVideo.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
@property (nonatomic, copy) RCTBubblingEventBlock onPlaybackStalled;

@property (nonatomic, copy) RCTBubblingEventBlock onPlaybackResume;

@property (nonatomic, copy) RCTBubblingEventBlock onPlaybackRateChange;

@property (nonatomic, copy) RCTBubblingEventBlock onExternalPlaybackChange;

@property (nonatomic, copy) RCTBubblingEventBlock onVideoExternalPlaybackChange;



- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher NS_DESIGNATED_INITIALIZER;

ios/Video/RCTVideo.m

+2 −2
Changes for ios/Video/RCTVideo.m: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -657,8 +657,8 @@ static int const RCTVideoUnset = -1; 
      }

    }

    else if([keyPath isEqualToString:externalPlaybackActive]) {

        if(self.onExternalPlaybackChange) {

          self.onExternalPlaybackChange(@{@"isExternalPlaybackActive": [NSNumber numberWithBool:_player.isExternalPlaybackActive],

        if(self.onVideoExternalPlaybackChange) {

          self.onVideoExternalPlaybackChange(@{@"isExternalPlaybackActive": [NSNumber numberWithBool:_player.isExternalPlaybackActive],

                                          @"target": self.reactTag});

        }

    }

ios/Video/RCTVideoManager.m

+1 −1
Changes for ios/Video/RCTVideoManager.m: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ RCT_EXPORT_VIEW_PROPERTY(onReadyForDisplay, RCTBubblingEventBlock); 
RCT_EXPORT_VIEW_PROPERTY(onPlaybackStalled, RCTBubblingEventBlock);

RCT_EXPORT_VIEW_PROPERTY(onPlaybackResume, RCTBubblingEventBlock);

RCT_EXPORT_VIEW_PROPERTY(onPlaybackRateChange, RCTBubblingEventBlock);

RCT_EXPORT_VIEW_PROPERTY(onExternalPlaybackChange, RCTBubblingEventBlock);

RCT_EXPORT_VIEW_PROPERTY(onVideoExternalPlaybackChange, RCTBubblingEventBlock);



- (NSDictionary *)constantsToExport

{