| Property changes on: branches/new-upload/phase3/extensions |
| ___________________________________________________________________ |
| Name: svn:ignore |
| 1 | 1 | + SemanticMediaWiki |
| ExternalData |
| Gadgets |
| MetavidWiki |
| OggHandler |
| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/javaEmbed.js |
| — | — | @@ -89,9 +89,8 @@ |
| 90 | 90 | //java reads ogg media time.. so no need to add the start or seek offset: |
| 91 | 91 | //js_log(' ct: ' + this.jce.getPlayPosition() + ' ' + this.supportsURLTimeEncoding()); |
| 92 | 92 | this.currentTime = this.jce.getPlayPosition(); |
| 93 | | - if(this.startOffset && ! this.supportsURLTimeEncoding()){ |
| 94 | | - this.currentTime = this.currentTime - this.startOffset; |
| 95 | | - } |
| | 93 | + |
| | 94 | + |
| 96 | 95 | if( this.jce.getPlayPosition() < 0){ |
| 97 | 96 | js_log('pp:'+this.jce.getPlayPosition()); |
| 98 | 97 | //probably reached clip end |
| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/vlcEmbed.js |
| — | — | @@ -189,9 +189,7 @@ |
| 190 | 190 | js_log('setting duration to ' + this.vlc.input.length /1000); |
| 191 | 191 | this.duration = this.vlc.input.length /1000; |
| 192 | 192 | } |
| 193 | | - this.currentTime = this.vlc.input.time/1000; |
| 194 | | - if(this.startOffset) |
| 195 | | - this.currentTime = this.currentTime - this.startOffset; |
| | 193 | + this.currentTime = this.vlc.input.time/1000; |
| 196 | 194 | }, |
| 197 | 195 | onPause: function(){ |
| 198 | 196 | this.parent_pause(); //update the inteface if paused via native control |
| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js |
| — | — | @@ -1224,8 +1224,7 @@ |
| 1225 | 1225 | }, |
| 1226 | 1226 | //do seek function (should be overwritten by implementing embedLibs) |
| 1227 | 1227 | // first check if seek can be done on locally downloaded content. |
| 1228 | | - doSeek : function( perc ){ |
| 1229 | | - alert('f:baseEmbed:doSeek:' + perc + ' to st:' + this.seek_time_sec + ' sf:' + this.start_ntp); |
| | 1228 | + doSeek : function( perc ){ |
| 1230 | 1229 | if( this.supportsURLTimeEncoding() ){ |
| 1231 | 1230 | |
| 1232 | 1231 | //make sure this.seek_time_sec is up-to-date: |