Skip to content

Commit

Permalink
Fixed readme conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelrpinto committed Jun 6, 2018
1 parent 41384e2 commit 600f77a
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ First select your project in Xcode.

<img src="./docs/tvOS-step-1.jpg" width="40%">

After that, select the tvOS target of your application and select « General » tab
After that, select the tvOS target of your application and select « General » tab

<img src="./docs/tvOS-step-2.jpg" width="40%">

Scroll to « Linked Frameworks and Libraries » and tap on the + button
Scroll to « Linked Frameworks and Libraries » and tap on the + button

<img src="./docs/tvOS-step-3.jpg" width="40%">

Expand Down Expand Up @@ -184,13 +184,6 @@ using System.Collections.Generic;
ref={(ref) => {
this.player = ref
}} // Store reference
rate={1.0} // 0 is paused, 1 is normal.
volume={1.0} // 0 is muted, 1 is normal.
stereoPan={0} // [Android only] The audio player’s stereo pan position. A value of –1.0 is full left, 0.0 is center, and 1.0 is full right. Default 0.0
muted={true|false} // Mutes the audio entirely. Default false
paused={true|false} // Pauses playback entirely. Default false
resizeMode="cover" // Fill the whole screen at aspect ratio.*
repeat={true|false} // Repeat forever. Default false
playInBackground={true|false} // Audio continues to play when app entering background. Default false
playWhenInactive={true|false} // [iOS] Video continues to play when control or notification center are shown. Default false
onBuffer={this.onBuffer} // Callback when remote video is buffering
Expand Down Expand Up @@ -352,6 +345,14 @@ Adjust the volume.

Platforms: all

#### stereoPan
The audio player’s stereo pan position. Any value between –1.0 and 1.0 is accepted.
* **-1.0** - Full left
* **0.0 (default)** - Center
* **1.0** - Full right

Platforms: Android

### Additional props

To see the full list of available props, you can check the [propTypes](https://github.com/react-native-community/react-native-video/blob/master/Video.js#L246) of the Video.js component.
Expand Down Expand Up @@ -418,3 +419,4 @@ To enable audio to play in background on iOS the audio session needs to be set t
---

**MIT Licensed**

0 comments on commit 600f77a

Please sign in to comment.