src/widgets/MashupPlayer.js
changeset 967 b4c6e64acb2d
parent 965 eadb7290c325
child 970 b1c3bf6eca78
--- a/src/widgets/MashupPlayer.js	Wed Sep 26 18:55:36 2012 +0200
+++ b/src/widgets/MashupPlayer.js	Tue Oct 02 12:05:15 2012 +0200
@@ -10,13 +10,14 @@
 IriSP.Widgets.MashupPlayer.prototype.defaults = {
     aspect_ratio: 14/9,
     split_screen: false,
-    player_type: "PopcornPlayer"
+    player_type: "PopcornPlayer",
+    background: "#000000"
 }
 
 IriSP.Widgets.MashupPlayer.prototype.draw = function() {
     var _this = this,
         _mashup = this.media,
-        _pauseState = true,
+        _pauseState = (!this.autostart && !this.autoplay),
         _currentMedia = null,
         _currentAnnotation = null,
         _segmentBegin,
@@ -88,6 +89,10 @@
         });
     }
     
+    this.$.css({
+        background: this.background
+    });
+    
     var _grid = Math.ceil(Math.sqrt(_mashup.medias.length)),
         _width = (this.split_screen ? this.width / _grid : this.width),
         _height = (this.split_screen ? this.height / _grid : this.height)
@@ -210,6 +215,6 @@
         }
     }
     
-    changeCurrentAnnotation();
+    _mashup.on("loadedmetadata", changeCurrentAnnotation);
    
 }
\ No newline at end of file