Revision: 51665
Author: dale
Date: 2009-06-09 22:29:03 +0000 (Tue, 09 Jun 2009)
Log Message:
-----------
fixed startOffset listing for java and vlc
Modified Paths:
--------------
branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/javaEmbed.js
branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/vlcEmbed.js
Property Changed:
----------------
branches/new-upload/phase3/extensions/
Property changes on: branches/new-upload/phase3/extensions
___________________________________________________________________
Added: svn:ignore
+ SemanticMediaWiki
ExternalData
Gadgets
MetavidWiki
OggHandler
Modified: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-09 22:16:02 UTC (rev 51664)
+++ branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-09 22:29:03 UTC (rev 51665)
@@ -1224,8 +1224,7 @@
},
//do seek function (should be overwritten by implementing embedLibs)
// first check if seek can be done on locally downloaded content.
- doSeek : function( perc ){
- alert('f:baseEmbed:doSeek:' + perc + ' to st:' +
this.seek_time_sec + ' sf:' + this.start_ntp);
+ doSeek : function( perc ){
if( this.supportsURLTimeEncoding() ){
//make sure this.seek_time_sec is up-to-date:
Modified: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/javaEmbed.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/javaEmbed.js
2009-06-09 22:16:02 UTC (rev 51664)
+++ branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/javaEmbed.js
2009-06-09 22:29:03 UTC (rev 51665)
@@ -89,9 +89,8 @@
//java reads ogg media time.. so no need to add the
start or seek offset:
//js_log(' ct: ' + this.jce.getPlayPosition() + ' '
+ this.supportsURLTimeEncoding());
this.currentTime = this.jce.getPlayPosition();
- if(this.startOffset && !
this.supportsURLTimeEncoding()){
- this.currentTime =
this.currentTime - this.startOffset;
- }
+
+
if( this.jce.getPlayPosition() < 0){
js_log('pp:'+this.jce.getPlayPosition());
//probably reached clip end
Modified: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/vlcEmbed.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/vlcEmbed.js
2009-06-09 22:16:02 UTC (rev 51664)
+++ branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/vlcEmbed.js
2009-06-09 22:29:03 UTC (rev 51665)
@@ -189,9 +189,7 @@
js_log('setting duration to ' + this.vlc.input.length
/1000);
this.duration = this.vlc.input.length /1000;
}
- this.currentTime = this.vlc.input.time/1000;
- if(this.startOffset)
- this.currentTime = this.currentTime - this.startOffset;
+ this.currentTime = this.vlc.input.time/1000;
},
onPause: function(){
this.parent_pause(); //update the inteface if paused via native
control
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
