| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/mv_javaEmbed.js |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | var mediaSrc = this.media_element.selected_source.getURI( this.seek_time_sec ); |
| 28 | 28 | |
| 29 | 29 | if(mediaSrc.indexOf('://')!=-1 & parseUri(document.URL).host != parseUri(mediaSrc).host){ |
| 30 | | - applet_loc = 'http://xiph.org/cortado.jar'; |
| | 30 | + applet_loc = 'http://theora.org/cortado.jar'; |
| 31 | 31 | }else{ |
| 32 | 32 | applet_loc = mv_embed_path+'binPlayers/cortado/cortado-wmf-r46643.jar'; |
| 33 | 33 | } |
| — | — | @@ -73,22 +73,19 @@ |
| 74 | 74 | monitor:function(){ |
| 75 | 75 | this.getJCE() |
| 76 | 76 | if(this.jce){ |
| 77 | | - try{ |
| 78 | | - //java reads "playtime" not ogg media time.. so add the start_offset or seek_offset |
| 79 | | - //js_log(' ct: ' + this.jce.getPlayPosition() + ' so:' + this.start_offset + ' st:' + this.seek_time_sec); |
| 80 | | - if(!this.start_offset) |
| 81 | | - this.start_offset = 0; |
| 82 | | - |
| 83 | | - this.currentTime = (this.seek_time_sec==0)? |
| 84 | | - this.jce.getPlayPosition() + this.start_offset : |
| 85 | | - this.jce.getPlayPosition() + this.seek_time_sec ; |
| | 77 | + try{ |
| | 78 | + //java reads ogg media time.. so no need to add the start or seek offset: |
| | 79 | + //js_log(' ct: ' + this.jce.getPlayPosition() + ' so:' + this.start_offset + ' st:' + this.seek_time_sec); |
| | 80 | + if(!this.start_offset) |
| | 81 | + this.start_offset = 0; |
| | 82 | + this.currentTime = this.jce.getPlayPosition(); |
| 86 | 83 | }catch (e){ |
| 87 | 84 | ///js_log('could not get time from jPlayer: ' + e); |
| 88 | 85 | } |
| 89 | 86 | if( this.currentTime < 0){ |
| 90 | 87 | //probably reached clip end |
| 91 | 88 | this.onClipDone(); |
| 92 | | - } |
| | 89 | + } |
| 93 | 90 | } |
| 94 | 91 | //once currentTime is updated call parent_monitor |
| 95 | 92 | this.parent_monitor(); |