https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103531
Revision: 103531
Author: dale
Date: 2011-11-18 00:12:00 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
renamed doEmbedHTML to embedPlayerHTML and doSeek to seek
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerGeneric.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerKplayer.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerVlc.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2011-11-18 00:09:30 UTC (rev 103530)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2011-11-18 00:12:00 UTC (rev 103531)
@@ -168,7 +168,7 @@
// for more on CMML see: http://wiki.xiph.org/CMML
'cmmlData': null,
- // Stores the seek time request, Updated by the doSeek function
+ // Stores the seek time request, Updated by the seek function
'serverSeekTime' : 0,
// If the embedPlayer is current 'seeking'
@@ -672,23 +672,23 @@
/**
* Get the plugin embed html ( should be implemented by embed player
interface )
*/
- doEmbedHTML: function() {
- return 'Error: function doEmbedHTML should be implemented by
embed player interface ';
+ embedPlayerHTML: function() {
+ return 'Error: function embedPlayerHTML should be implemented
by embed player interface ';
},
/**
* Seek function ( should be implemented by embedPlayer interface
- * playerNative, playerKplayer etc. ) embedPlayer doSeek only handles
URL
+ * playerNative, playerKplayer etc. ) embedPlayer seek only handles URL
* time seeks
*/
- doSeek: function( percent ) {
+ seek: function( percent ) {
var _this = this;
this.seeking = true;
// See if we should do a server side seek ( player independent )
if ( this.supportsURLTimeEncoding() ) {
- mw.log( 'EmbedPlayer::doSeek:: updated serverSeekTime:
' + mw.seconds2npt ( this.serverSeekTime ) +
+ mw.log( 'EmbedPlayer::seek:: updated serverSeekTime: '
+ mw.seconds2npt ( this.serverSeekTime ) +
' currentTime: ' + _this.currentTime );
// make sure we need to seek:
if( _this.currentTime == _this.serverSeekTime ){
@@ -1475,7 +1475,7 @@
this.posterDisplayed = false;
// Hide any button if present:
this.$interface.find( '.play-btn-large'
).remove();
- this.doEmbedHTML();
+ this.embedPlayerHTML();
}
}
@@ -1783,7 +1783,7 @@
_this.currentTime + "
javascript based currentTime update to " +
seekPercent + ' == ' +
_this.currentTime );
_this.previousTime = _this.currentTime;
- this.doSeek( seekPercent );
+ this.seek( seekPercent );
}
}
},
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerGeneric.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerGeneric.js
2011-11-18 00:09:30 UTC (rev 103530)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerGeneric.js
2011-11-18 00:12:00 UTC (rev 103531)
@@ -22,7 +22,7 @@
* @return {String}
* embed code for generic ogg plugin
*/
- doEmbedHTML: function() {
+ embedPlayerHTML: function() {
$( this ).html(
'<object type="application/ogg" ' +
'width="' + this.getWidth() + '" height="' +
this.getHeight() + '" ' +
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js
2011-11-18 00:09:30 UTC (rev 103530)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js
2011-11-18 00:12:00 UTC (rev 103531)
@@ -29,7 +29,7 @@
/**
* Output the the embed html
*/
- doEmbedHTML: function () {
+ embedPlayerHTML: function () {
var _this = this;
mw.log( "java play url:" + this.getSrc( this.seek_time_sec ) );
@@ -141,15 +141,15 @@
*
* @param {Float} percentage Percentage to seek into the stream
*/
- doSeek: function( percentage ) {
+ seek: function( percentage ) {
mw.log( 'java:seek:p: ' + percentage + ' : ' +
this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' +
this.seek_time_sec );
this.getPlayerElement();
if ( this.supportsURLTimeEncoding() ) {
- this.parent_doSeek( percentage );
+ this.parent_seek( percentage );
} else if ( this.playerElement ) {
// do a (generally broken) local seek:
- mw.log( "Cortado seek is not very accurate :: doSeek::"
+ ( percentage * parseFloat( this.getDuration() ) ) );
+ mw.log( "Cortado seek is not very accurate :: seek::" +
( percentage * parseFloat( this.getDuration() ) ) );
this.playerElement.currentTime = ( percentage *
parseFloat( this.getDuration() ) );
} else {
this.doPlayThenSeek( percentage );
@@ -172,7 +172,7 @@
_this.getPlayerElement();
// if we have .jre ~in theory~ we can seek (but
probably not)
if ( _this.playerElement ) {
- _this.doSeek( perc );
+ _this.seek( perc );
} else {
// try to get player for 10 seconds:
if ( rfsCount < 200 ) {
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerKplayer.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerKplayer.js
2011-11-18 00:09:30 UTC (rev 103530)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerKplayer.js
2011-11-18 00:12:00 UTC (rev 103531)
@@ -32,7 +32,7 @@
/**
* Write the Embed html to the target
*/
- doEmbedHTML : function() {
+ embedPlayerHTML : function() {
var _this = this;
mw.log("kPlayer:: embed src::" + _this.getSrc());
@@ -216,17 +216,17 @@
* @param {Float}
* percentage Percentage of total stream length to seek to
*/
- doSeek: function( percentage ) {
+ seek: function( percentage ) {
var _this = this;
var seekTime = percentage * this.getDuration();
- mw.log( 'EmbedPlayerKalturaKplayer:: doSeek: ' + percentage + '
time:' + seekTime );
+ mw.log( 'EmbedPlayerKalturaKplayer:: seek: ' + percentage + '
time:' + seekTime );
if (this.supportsURLTimeEncoding()) {
// Make sure we could not do a local seek instead:
if (!(percentage < this.bufferedPercent
&& this.playerElement.duration &&
!this.didSeekJump)) {
// We support URLTimeEncoding call parent seek:
- this.parent_doSeek( percentage );
+ this.parent_seek( percentage );
return;
}
}
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
2011-11-18 00:09:30 UTC (rev 103530)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
2011-11-18 00:12:00 UTC (rev 103531)
@@ -84,7 +84,7 @@
/**
* Return the embed code
*/
- doEmbedHTML : function () {
+ embedPlayerHTML : function () {
var _this = this;
// Reset some play state flags:
@@ -231,8 +231,8 @@
*
* @param {Float} percentage
*/
- doSeek: function( percentage ) {
- mw.log( 'Native::doSeek p: ' + percentage + ' : ' +
this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' +
this.seek_time_sec );
+ seek: function( percentage ) {
+ mw.log( 'Native::seek p: ' + percentage + ' : ' +
this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' +
this.seek_time_sec );
this.seeking = true;
// Run the onSeeking interface update
@@ -246,7 +246,7 @@
this.doNativeSeek( percentage );
} else {
// We support URLTimeEncoding call parent seek:
- this.parent_doSeek( percentage );
+ this.parent_seek( percentage );
}
} else if ( this.playerElement && this.playerElement.duration )
{
// (could also check bufferedPercent > percentage seek
(and issue oggz_chop request or not)
@@ -555,7 +555,7 @@
// No vid loaded
mw.log( 'native::load() ... doEmbed' );
this.onlyLoadFlag = true;
- this.doEmbedHTML();
+ this.embedPlayerHTML();
this.onLoadedCallback = callback;
} else {
// Should not happen offten
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerVlc.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerVlc.js
2011-11-18 00:09:30 UTC (rev 103530)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerVlc.js
2011-11-18 00:12:00 UTC (rev 103531)
@@ -37,7 +37,7 @@
/**
* Get embed HTML
*/
- doEmbedHTML: function() {
+ embedPlayerHTML: function() {
var _this = this;
$( this ).html(
'<object
classid="clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921" ' +
@@ -123,10 +123,10 @@
*
* @param {Float} percent Seek to this percent of the stream
*/
- doSeek : function( percent ) {
+ seek : function( percent ) {
this.getPlayerElement();
if ( this.supportsURLTimeEncoding() ) {
- this.parent_doSeek( percent );
+ this.parent_seek( percent );
} else if ( this.playerElement ) {
this.seeking = true;
mw.log( "do vlc http seek to: " + percent )
@@ -156,7 +156,7 @@
var newState = _this.playerElement.input.state;
// if playing we are ready to do the
if ( newState == 3 ) {
- _this.doSeek( percent );
+ _this.seek( percent );
} else {
// try to get player for 10 seconds:
if ( rfsCount < 200 ) {
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js
2011-11-18 00:09:30 UTC (rev 103530)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js
2011-11-18 00:12:00 UTC (rev 103531)
@@ -35,7 +35,7 @@
*
* _this.checkPlayerSources()
* _this.setupSourcePlayer()
- * _this.inheritEmbedPlayer()
+ * _this.updatePlaybackInterface()
* _this.selectedPlayer.load()
* _this.showPlayer()
*
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2011-11-18 00:09:30 UTC (rev 103530)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2011-11-18 00:12:00 UTC (rev 103531)
@@ -1963,9 +1963,9 @@
var perc =
ui.value / 1000;
// Set seek
time (in case we have to do a url seek)
embedPlayer.seek_time_sec = mw.npt2seconds( embedPlayer.jump_time, true );
- mw.log( 'do
jump to: ' + embedPlayer.jump_time + ' perc:' + perc + ' sts:' +
embedPlayer.seek_time_sec );
+ mw.log(
'PlayerControlsBuilder:: Seek to: ' + embedPlayer.jump_time + ' perc:' + perc +
' sts:' + embedPlayer.seek_time_sec );
ctrlObj.setStatus( gM( 'mwe-embedplayer-seeking' ) );
-
embedPlayer.doSeek( perc );
+
embedPlayer.seek( perc );
}
}
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
