fix(hls): Fixes hls support

podlove · Jun 9, 2018 · 9f2e7c3 · 9f2e7c3
1 parent 5d476c1
commit 9f2e7c3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/build/blocks/rules.js b/build/blocks/rules.js
@@ -11,7 +11,8 @@ const vue = () => ({
 
 const javascript = () => ({
   test: /\.js?$/,
-  loader: 'babel-loader'
+  loader: 'babel-loader',
+  exclude: [/node_modules/]
 })
 
 const images = prefix => ({

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "docs:install": "cd docs && bundle install",
     "docs:dev": "npm run docs:install && jekyll build --source docs --destination dist && cp -R docs/fixtures/* dist/fixtures",
     "docs:prod": "npm run docs:install && jekyll build --source docs --destination dist --config docs/_config_prd.yml && cp -R docs/fixtures/* dist/fixtures",
-    "webpack:dev": "webpack-dev-server --config build/webpack.config.dev.js",
+    "webpack:dev": "webpack-dev-server --progress --config build/webpack.config.dev.js",
     "webpack:build": "webpack --config build/webpack.config.prod.js",
     "webpack:cdn": "webpack --config build/webpack.config.cdn.js",
     "build": "npm run webpack:build",
@@ -59,7 +59,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@podlove/html5-audio-driver": "1.2.0",
+    "@podlove/html5-audio-driver": "1.2.1",
     "babel-polyfill": "6.26.0",
     "binary-search": "1.3.3",
     "color": "3.0.0",

diff --git a/src/effects/player.js b/src/effects/player.js
@@ -31,7 +31,7 @@ export default mediaPlayer => handleActions({
     const player = mediaPlayer(audioFiles)
 
     playerActions = player.actions
-
+    player.events.onError(console.log)
     // register events
     player.events.onPlaytimeUpdate(compose(dispatch, actions.setPlaytime, secondsToMilliseconds))
     player.events.onDurationChange(compose(dispatch, actions.setDuration, secondsToMilliseconds))

diff --git a/src/media/index.js b/src/media/index.js
@@ -1,7 +1,8 @@
-import { audio, events as audioEvents, actions as audioActions } from '@podlove/html5-audio-driver'
+import { audio, events as audioEvents, actions as audioActions } from '@podlove/html5-audio-driver/src'
+import { attatchStream } from '@podlove/html5-audio-driver/src/hls'
 
 export default (audioFiles) => {
-  const audioElement = audio(audioFiles)
+  const audioElement = attatchStream(audio(audioFiles))
 
   return {
     events: audioEvents(audioElement),

diff --git a/yarn.lock b/yarn.lock
@@ -236,11 +236,11 @@
     pretty-ms "^0.2.1"
     text-table "^0.2.0"
 
-"@podlove/html5-audio-driver@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@podlove/html5-audio-driver/-/html5-audio-driver-1.2.0.tgz#a5785f17a358413b17a7991790810ec7b73c9153"
+"@podlove/html5-audio-driver@1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@podlove/html5-audio-driver/-/html5-audio-driver-1.2.1.tgz#c66b8bfe98cf75ad538b4c496e9f05a440657422"
   dependencies:
-    hls.js "^0.9.1"
+    hls.js "0.9.1"
     ramda "0.24.1"
 
 "@sinonjs/formatio@^2.0.0":
@@ -4815,7 +4815,7 @@ he@1.1.x, he@^1.1.0, he@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
-hls.js@^0.9.1:
+hls.js@0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.9.1.tgz#36516d4fac3ab44108e5c127ef0f3e9cd06f6330"
   dependencies: