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

fix: clear event binding function references #38

Merged
merged 6 commits into from
Dec 12, 2017
Merged

fix: clear event binding function references #38

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2adaa99
create an object for all the binding functions references.
odedhutzler Dec 6, 2017
5b011b6
.bind=>arrow functions, destroy, remove empty line
odedhutzler Dec 7, 2017
4f667f4
adding types + enum shaka events
odedhutzler Dec 7, 2017
a0630ca
adding html5 events to html5 events. and shaka events to shaka
odedhutzler Dec 7, 2017
ff26649
removing the object intilization function.
odedhutzler Dec 11, 2017
cdebe37
Merge branch 'master' into event_binding_handler
Dec 12, 2017
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
49 changes: 37 additions & 12 deletions src/dash-adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@ import Widevine from './drm/widevine'
import PlayReady from './drm/playready'
import {DefaultConfig} from './default-config'

type ShakaEventType = { [event: string]: string };

/**
* Shaka events enum
* @type {Object}
* @const
*/
const ShakaEvent: ShakaEventType = {
ERROR: 'error',
ADAPTION: 'adaption',
BUFFERING: 'buffering'
};

/**
* Adapter of shaka lib for dash content
* @classdesc
Expand Down Expand Up @@ -54,6 +67,19 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
* @private
*/
_shaka: any;
/**
* an object containing all the events we bind and unbind to.
* @member {Object} - _adapterEventsBindings
* @type {Object}
* @private
*/
_adapterEventsBindings: { [name: string]: Function } = {
[ShakaEvent.ERROR]: (event) => this._onError(event),
[ShakaEvent.ADAPTION] : () => this._onAdaptation(),
[ShakaEvent.BUFFERING] : (event) => this._onBuffering(event),
[BaseMediaSourceAdapter.Html5Events.WAITING] : () => this._onWaiting(),
[BaseMediaSourceAdapter.Html5Events.PLAYING] : () => this._onPlaying()
};
/**
* The load promise
* @member {Promise<Object>} - _loadPromise
Expand Down Expand Up @@ -211,12 +237,11 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
* @returns {void}
*/
_addBindings(): void {
this._shaka.addEventListener('adaptation', this._onAdaptation.bind(this));
this._shaka.addEventListener('error', this._onError.bind(this));
this._shaka.addEventListener('buffering', this._onBuffering.bind(this));
//TODO use events enum when available
this._videoElement.addEventListener('waiting', this._onWaiting.bind(this));
this._videoElement.addEventListener('playing', this._onPlaying.bind(this));
this._shaka.addEventListener(ShakaEvent.ADAPTION, this._adapterEventsBindings.adaption);
this._shaka.addEventListener(ShakaEvent.ERROR, this._adapterEventsBindings.error);
this._shaka.addEventListener(ShakaEvent.BUFFERING, this._adapterEventsBindings.buffering);
this._videoElement.addEventListener(BaseMediaSourceAdapter.Html5Events.WAITING, this._adapterEventsBindings.waiting);
this._videoElement.addEventListener(BaseMediaSourceAdapter.Html5Events.PLAYING, this._adapterEventsBindings.playing);
}

/**
Expand All @@ -226,12 +251,11 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
* @returns {void}
*/
_removeBindings(): void {
this._shaka.removeEventListener('adaptation', this._onAdaptation);
this._shaka.removeEventListener('error', this._onError.bind(this));
this._shaka.removeEventListener('buffering', this._onBuffering.bind(this));
//TODO use events enum when available
this._videoElement.removeEventListener('waiting', this._onWaiting.bind(this));
this._videoElement.removeEventListener('playing', this._onPlaying.bind(this));
this._shaka.removeEventListener(ShakaEvent.ADAPTION, this._adapterEventsBindings.adaption);
this._shaka.removeEventListener(ShakaEvent.ERROR, this._adapterEventsBindings.error);
this._shaka.removeEventListener(ShakaEvent.BUFFERING, this._adapterEventsBindings.buffering);
this._videoElement.removeEventListener(BaseMediaSourceAdapter.Html5Events.WAITING, this._adapterEventsBindings.waiting);
this._videoElement.removeEventListener(BaseMediaSourceAdapter.Html5Events.PLAYING, this._adapterEventsBindings.playing);
}

/**
Expand Down Expand Up @@ -284,6 +308,7 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
this._removeBindings();
return this._shaka.destroy();
}
this._adapterEventsBindings = {};
});
}

Expand Down