Skip to content

Commit

Permalink
Merge pull request #43 from twrecked/fixed-dash
Browse files Browse the repository at this point in the history
Used v3.1.1 of mpeg-dash.
  • Loading branch information
twrecked authored Jul 31, 2020
2 parents 84e0d5d + a313f68 commit 3fdc899
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
0.1.4: used fixed version of dash
0.1.3: better name parsing
added camera on/off support
0.1.2: added mpeg-dash support
Expand Down
2 changes: 1 addition & 1 deletion custom_cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"aarlo-glance": {
"changelog": "https://github.com/twrecked/lovelace-hass-aarlo/blob/master/changelog",
"remote_location": "https://raw.githubusercontent.com/twrecked/lovelace-hass-aarlo/master/dist/hass-aarlo.js",
"version": "0.1.3",
"version": "0.1.4",
"visit_repo": "https://github.com/twrecked/lovelace-hass-aarlo"
}
}
7 changes: 6 additions & 1 deletion dist/hass-aarlo.js
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,11 @@ class AarloGlance extends LitElement {
};
}, true);
this._dash.initialize(video, this._stream, true);
// this._dash.updateSettings({
// 'debug': {
// 'logLevel': dashjs.Debug.LOG_LEVEL_DEBUG
// }
// });
}
} else {
// Start HLS to handle video streaming.
Expand Down Expand Up @@ -1279,7 +1284,7 @@ const s = document.createElement("script");
s.src = 'https://cdn.jsdelivr.net/npm/hls.js@latest';
s.onload = function() {
const s2 = document.createElement("script");
s2.src = 'https://cdn.dashjs.org/latest/dash.all.min.js';
s2.src = 'http://cdn.dashjs.org/v3.1.1/dash.all.min.js';
s2.onload = function() {
customElements.define('aarlo-glance', AarloGlance);
// const s3 = document.createElement("script");
Expand Down

0 comments on commit 3fdc899

Please sign in to comment.