Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add flash engine #2

Merged
merged 12 commits into from
Aug 2, 2018
Merged

feat: add flash engine #2

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
56412bb
add code
Jun 25, 2018
45d05ff
udpate
Jun 25, 2018
ad18811
add playback rate
Jul 15, 2018
5ca4d28
review fixes
Jul 25, 2018
c05d0bc
chore: prettier configuration
Jul 26, 2018
52218e0
chore: prettier fixes
Jul 26, 2018
356c8c2
fix review +flow + getLogger from playkit-js
Jul 29, 2018
545b308
remove capping and move to currentLevel param
Jul 29, 2018
0cc9d02
use the adapter promise
Jul 29, 2018
7eaab44
change the api load to promise
Jul 30, 2018
355bd7e
fix(FEC-8435,FEC-8437): add muted state and add empty hideTextTrack t…
Jul 31, 2018
d3799d5
fix(FEC-8441): after end event send time update
Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/flash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class Flash extends FakeEventTarget implements IEngine {

_srcToLoad: ?string;

_muted: boolean;

/**
* The Flash class logger.
* @type {any}
Expand Down Expand Up @@ -127,6 +129,9 @@ class Flash extends FakeEventTarget implements IEngine {
this._init(source, config);
}

hideTextTrack(): void {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is in the flow typings - didn't it alert you on missing interface?


}
_init(source: PKMediaSourceObject, config: Object): void {
this._eventManager = new EventManager();

Expand Down Expand Up @@ -414,9 +419,13 @@ class Flash extends FakeEventTarget implements IEngine {
* @returns {void}
*/
set volume(vol: number): void {
this._volume = vol;
if (this._api) {
this._api.volume(vol);
if (this._muted) {
this._volumeBeforeMute = vol;
} else {
this._volume = vol;
if (this._api) {
this._api.volume(vol);
}
}
}

Expand Down Expand Up @@ -515,9 +524,11 @@ class Flash extends FakeEventTarget implements IEngine {
*/
set muted(mute: boolean): void {
if (mute) {
this._volumeBeforeMute = this.volume;
this.volume = 0;
this._muted = true;
this._volumeBeforeMute = this.volume;
} else {
this._muted = false;
if (this._volumeBeforeMute) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be 0 so check typeof this._volumeBeforeMute === 'number'

this.volume = this._volumeBeforeMute;
} else {
Expand Down