Update samples that used MediaPlayerFactory.

This should resolve Dash-Industry-Forum#1136 and replace Dash-Industry-Forum#1135
boushley · Feb 6, 2016 · 99930ba · 99930ba
1 parent cee121f
commit 99930ba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/samples/getting-started-basic-embed/auto-load-single-video-src.html b/samples/getting-started-basic-embed/auto-load-single-video-src.html
@@ -16,9 +16,9 @@
         }
     </style>
 
-    <body onload="dashjs.MediaPlayerFactory.createAll()">
+    <body>
         <div>
-            <video class="dashjs-player" autoplay src="http://dash.edgesuite.net/envivio/EnvivioDash3/manifest.mpd" controls="true"/>
+            <video data-dashjs-player autoplay src="http://dash.edgesuite.net/envivio/EnvivioDash3/manifest.mpd" controls="true"/>
         </div>
     </body>
 </html>
diff --git a/samples/getting-started-basic-embed/auto-load-single-video.html b/samples/getting-started-basic-embed/auto-load-single-video.html
@@ -16,9 +16,9 @@
         }
     </style>
 
-    <body onload="dashjs.MediaPlayerFactory.createAll()">
+    <body>
         <div>
-            <video class="dashjs-player" autoplay preload="none" controls="true">
+            <video autoplay preload="none" controls="true">
                 <source src="http://dash.edgesuite.net/envivio/EnvivioDash3/manifest.mpd" type="application/dash+xml"/>
             </video>
         </div>

diff --git a/src/streaming/MediaPlayerFactory.js b/src/streaming/MediaPlayerFactory.js
@@ -1,4 +1,3 @@
-import FactoryMaker from '../core/FactoryMaker.js';
 import MediaPlayer from './MediaPlayer.js';
 
 function MediaPlayerFactory() {
@@ -93,9 +92,7 @@ function MediaPlayerFactory() {
     };
 }
 
-MediaPlayerFactory.__dashjs_factory_name = 'MediaPlayerFactory';
-let factoryFactory = FactoryMaker.getSingletonFactory(MediaPlayerFactory);
-let instance = factoryFactory().getInstance();
+let instance = MediaPlayerFactory();
 
 function loadHandler() {
     window.removeEventListener('load', loadHandler);
@@ -104,7 +101,7 @@ function loadHandler() {
 
 let avoidAutoCreate = window && window.dashjs && window.dashjs.skipAutoCreate;
 
-if (window && window.addEventListener && !avoidAutoCreate) {
+if (!avoidAutoCreate && window && window.addEventListener) {
     if (window.document.readyState === 'complete') {
         instance.createAll();
     } else {