diff -r b1b624f81f22 -r 3a2f9993c6cb integration/js/model.js --- a/integration/js/model.js Thu Jan 17 17:21:51 2013 +0100 +++ b/integration/js/model.js Tue Jan 29 17:26:56 2013 +0100 @@ -548,6 +548,7 @@ this.volume = .5; this.paused = true; this.muted = false; + this.loadedMetadata = false; var _this = this; this.on("play", function() { _this.paused = false; @@ -572,6 +573,9 @@ _this.trigger("enter-annotation",_a); }); }); + this.on("loadedmetadata", function() { + _this.loadedMetadata = true; + }) } Model.Playable.prototype = new Model.Element(); @@ -815,17 +819,6 @@ Model.Mashup.prototype = new Model.Playable(); -Model.Mashup.prototype.checkLoaded = function() { - var loaded = !!this.segments.length; - this.getMedias().forEach(function(_m) { - loaded = loaded && _m.loaded; - }); - this.loaded = loaded; - if (loaded) { - this.trigger("loadedmetadata"); - } -} - Model.Mashup.prototype.updateTimes = function() { var _time = 0; this.segments.forEach(function(_segment) {