http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72766
Revision: 72766
Author: dale
Date: 2010-09-10 23:09:34 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
don't include audio seeking in frame-by-frame playback
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-10 23:07:27 UTC (rev 72765)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-10 23:09:34 UTC (rev 72766)
@@ -108,7 +108,7 @@
_this.currentSequencePage =
_this.parseSequencerPage( smilPage );
// Cache the latest serverSmil ( for local
change checks )
// ( save requests automatically respond with
warnings on other user updates )
- _this.serverSmilXml
=_this.currentSequencePage.sequenceXML;
+ _this.serverSmilXml =
_this.currentSequencePage.sequenceXML ;
// Cache the pre / post bits
@@ -121,7 +121,7 @@
_this.currentSequencePage.pageStart ="\nTo
edit this sequence " +
'[{{fullurl:{{FULLPAGENAME}}|withJS=MediaWiki:MwEmbed.js}} enable the
sequencer] for this page';
}
- return _this.currentSequencePage.pageStart +
+ return _this.currentSequencePage.pageStart +
"\n\n<!-- " + SEQUENCER_PAYLOADKEY + "\n" +
xmlString +
"\n\n " + SEQUENCER_PAYLOADKEY + " -->\n" +
@@ -139,10 +139,17 @@
}
// trim the output:
return {
- 'pageStart' : pageText.substring(0,
pageText.indexOf( startKey ) ),
- 'sequenceXML' : pageText.substring(
pageText.indexOf( startKey ) + startKey.length,
- pageText.indexOf(endKey ) ),
- 'pageEnd' : pageText.substring(
pageText.indexOf(endKey) + endKey.length )
+ 'pageStart' : $j.trim(
+ pageText.substring(0, pageText.indexOf(
startKey ) )
+ ),
+ 'sequenceXML' : $j.trim(
+ pageText.substring( pageText.indexOf(
startKey ) + startKey.length,
+
pageText.indexOf(endKey )
+ )
+ ),
+ 'pageEnd' : $j.trim(
+ pageText.substring(
pageText.indexOf(endKey) + endKey.length )
+ )
}
},
Modified: branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
2010-09-10 23:07:27 UTC (rev 72765)
+++ branches/MwEmbedStandAlone/modules/SmilPlayer/mw.SmilAnimate.js
2010-09-10 23:09:34 UTC (rev 72766)
@@ -213,11 +213,13 @@
break;
case 'img':
this.transformImageForTime( smilElement,
animateTime );
- break;
+ break;
case 'video':
- case 'audio':
this.transformMediaForTime( smilElement,
animateTime );
break;
+ case 'audio':
+ // audio has no frame transform ( only playback
)
+ break;
}
},
@@ -253,30 +255,30 @@
* Used to support video playback
*/
transformMediaForPlayback: function( smilElement, animateTime ){
- var $vid = $j ( '#' + this.smil.getSmilElementPlayerID(
smilElement ) );
+ var $media = $j ( '#' + this.smil.getSmilElementPlayerID(
smilElement ) );
// Set activePlayback flag ( informs edit and buffer actions )
$j( smilElement ).data('activePlayback', true)
// Make the video is being displayed and get a pointer to the
video element:
- var vid = $vid.show().get( 0 );
+ var media = $media.show().get( 0 );
// Set volume to master volume
- vid.volume = this.smil.embedPlayer.volume;
+ media.volume = this.smil.embedPlayer.volume;
// Seek to correct time if off by more than 1 second
// ( buffer delays management things insync below this range )
// Check the buffer if we can play this time and the video is
"paused" ( if so start playback )
if( this.smil.getBuffer().canPlayTime( smilElement, animateTime
)
- && vid.paused
+ && media.paused
) {
//mw.log( "transformMediaForPlayback:: should play:" +
animateTime );
- vid.play();
+ media.play();
return ;
}
// Else issue the initial "play" request
- vid.play();
+ media.play();
},
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
