| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerGeneric.js |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | * @return {String} |
| 24 | 24 | * embed code for generic ogg plugin |
| 25 | 25 | */ |
| 26 | | - doEmbedHTML: function() { |
| | 26 | + embedPlayerHTML: function() { |
| 27 | 27 | $( this ).html( |
| 28 | 28 | '<object type="application/ogg" ' + |
| 29 | 29 | 'width="' + this.getWidth() + '" height="' + this.getHeight() + '" ' + |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js |
| — | — | @@ -168,7 +168,7 @@ |
| 169 | 169 | // for more on CMML see: http://wiki.xiph.org/CMML |
| 170 | 170 | 'cmmlData': null, |
| 171 | 171 | |
| 172 | | - // Stores the seek time request, Updated by the doSeek function |
| | 172 | + // Stores the seek time request, Updated by the seek function |
| 173 | 173 | 'serverSeekTime' : 0, |
| 174 | 174 | |
| 175 | 175 | // If the embedPlayer is current 'seeking' |
| — | — | @@ -672,23 +672,23 @@ |
| 673 | 673 | /** |
| 674 | 674 | * Get the plugin embed html ( should be implemented by embed player interface ) |
| 675 | 675 | */ |
| 676 | | - doEmbedHTML: function() { |
| 677 | | - return 'Error: function doEmbedHTML should be implemented by embed player interface '; |
| | 676 | + embedPlayerHTML: function() { |
| | 677 | + return 'Error: function embedPlayerHTML should be implemented by embed player interface '; |
| 678 | 678 | }, |
| 679 | 679 | |
| 680 | 680 | /** |
| 681 | 681 | * Seek function ( should be implemented by embedPlayer interface |
| 682 | | - * playerNative, playerKplayer etc. ) embedPlayer doSeek only handles URL |
| | 682 | + * playerNative, playerKplayer etc. ) embedPlayer seek only handles URL |
| 683 | 683 | * time seeks |
| 684 | 684 | */ |
| 685 | | - doSeek: function( percent ) { |
| | 685 | + seek: function( percent ) { |
| 686 | 686 | var _this = this; |
| 687 | 687 | |
| 688 | 688 | this.seeking = true; |
| 689 | 689 | |
| 690 | 690 | // See if we should do a server side seek ( player independent ) |
| 691 | 691 | if ( this.supportsURLTimeEncoding() ) { |
| 692 | | - mw.log( 'EmbedPlayer::doSeek:: updated serverSeekTime: ' + mw.seconds2npt ( this.serverSeekTime ) + |
| | 692 | + mw.log( 'EmbedPlayer::seek:: updated serverSeekTime: ' + mw.seconds2npt ( this.serverSeekTime ) + |
| 693 | 693 | ' currentTime: ' + _this.currentTime ); |
| 694 | 694 | // make sure we need to seek: |
| 695 | 695 | if( _this.currentTime == _this.serverSeekTime ){ |
| — | — | @@ -1475,7 +1475,7 @@ |
| 1476 | 1476 | this.posterDisplayed = false; |
| 1477 | 1477 | // Hide any button if present: |
| 1478 | 1478 | this.$interface.find( '.play-btn-large' ).remove(); |
| 1479 | | - this.doEmbedHTML(); |
| | 1479 | + this.embedPlayerHTML(); |
| 1480 | 1480 | } |
| 1481 | 1481 | } |
| 1482 | 1482 | |
| — | — | @@ -1783,7 +1783,7 @@ |
| 1784 | 1784 | _this.currentTime + " javascript based currentTime update to " + |
| 1785 | 1785 | seekPercent + ' == ' + _this.currentTime ); |
| 1786 | 1786 | _this.previousTime = _this.currentTime; |
| 1787 | | - this.doSeek( seekPercent ); |
| | 1787 | + this.seek( seekPercent ); |
| 1788 | 1788 | } |
| 1789 | 1789 | } |
| 1790 | 1790 | }, |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js |
| — | — | @@ -1963,9 +1963,9 @@ |
| 1964 | 1964 | var perc = ui.value / 1000; |
| 1965 | 1965 | // Set seek time (in case we have to do a url seek) |
| 1966 | 1966 | embedPlayer.seek_time_sec = mw.npt2seconds( embedPlayer.jump_time, true ); |
| 1967 | | - mw.log( 'do jump to: ' + embedPlayer.jump_time + ' perc:' + perc + ' sts:' + embedPlayer.seek_time_sec ); |
| | 1967 | + mw.log( 'PlayerControlsBuilder:: Seek to: ' + embedPlayer.jump_time + ' perc:' + perc + ' sts:' + embedPlayer.seek_time_sec ); |
| 1968 | 1968 | ctrlObj.setStatus( gM( 'mwe-embedplayer-seeking' ) ); |
| 1969 | | - embedPlayer.doSeek( perc ); |
| | 1969 | + embedPlayer.seek( perc ); |
| 1970 | 1970 | } |
| 1971 | 1971 | } |
| 1972 | 1972 | }; |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerJava.js |
| — | — | @@ -29,7 +29,7 @@ |
| 30 | 30 | /** |
| 31 | 31 | * Output the the embed html |
| 32 | 32 | */ |
| 33 | | - doEmbedHTML: function () { |
| | 33 | + embedPlayerHTML: function () { |
| 34 | 34 | var _this = this; |
| 35 | 35 | mw.log( "java play url:" + this.getSrc( this.seek_time_sec ) ); |
| 36 | 36 | |
| — | — | @@ -141,15 +141,15 @@ |
| 142 | 142 | * |
| 143 | 143 | * @param {Float} percentage Percentage to seek into the stream |
| 144 | 144 | */ |
| 145 | | - doSeek: function( percentage ) { |
| | 145 | + seek: function( percentage ) { |
| 146 | 146 | mw.log( 'java:seek:p: ' + percentage + ' : ' + this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' + this.seek_time_sec ); |
| 147 | 147 | this.getPlayerElement(); |
| 148 | 148 | |
| 149 | 149 | if ( this.supportsURLTimeEncoding() ) { |
| 150 | | - this.parent_doSeek( percentage ); |
| | 150 | + this.parent_seek( percentage ); |
| 151 | 151 | } else if ( this.playerElement ) { |
| 152 | 152 | // do a (generally broken) local seek: |
| 153 | | - mw.log( "Cortado seek is not very accurate :: doSeek::" + ( percentage * parseFloat( this.getDuration() ) ) ); |
| | 153 | + mw.log( "Cortado seek is not very accurate :: seek::" + ( percentage * parseFloat( this.getDuration() ) ) ); |
| 154 | 154 | this.playerElement.currentTime = ( percentage * parseFloat( this.getDuration() ) ); |
| 155 | 155 | } else { |
| 156 | 156 | this.doPlayThenSeek( percentage ); |
| — | — | @@ -172,7 +172,7 @@ |
| 173 | 173 | _this.getPlayerElement(); |
| 174 | 174 | // if we have .jre ~in theory~ we can seek (but probably not) |
| 175 | 175 | if ( _this.playerElement ) { |
| 176 | | - _this.doSeek( perc ); |
| | 176 | + _this.seek( perc ); |
| 177 | 177 | } else { |
| 178 | 178 | // try to get player for 10 seconds: |
| 179 | 179 | if ( rfsCount < 200 ) { |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | * |
| 37 | 37 | * _this.checkPlayerSources() |
| 38 | 38 | * _this.setupSourcePlayer() |
| 39 | | - * _this.inheritEmbedPlayer() |
| | 39 | + * _this.updatePlaybackInterface() |
| 40 | 40 | * _this.selectedPlayer.load() |
| 41 | 41 | * _this.showPlayer() |
| 42 | 42 | * |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerVlc.js |
| — | — | @@ -37,7 +37,7 @@ |
| 38 | 38 | /** |
| 39 | 39 | * Get embed HTML |
| 40 | 40 | */ |
| 41 | | - doEmbedHTML: function() { |
| | 41 | + embedPlayerHTML: function() { |
| 42 | 42 | var _this = this; |
| 43 | 43 | $( this ).html( |
| 44 | 44 | '<object classid="clsid:9BE31822-FDAD-461B-AD51-BE1D1C159921" ' + |
| — | — | @@ -123,10 +123,10 @@ |
| 124 | 124 | * |
| 125 | 125 | * @param {Float} percent Seek to this percent of the stream |
| 126 | 126 | */ |
| 127 | | - doSeek : function( percent ) { |
| | 127 | + seek : function( percent ) { |
| 128 | 128 | this.getPlayerElement(); |
| 129 | 129 | if ( this.supportsURLTimeEncoding() ) { |
| 130 | | - this.parent_doSeek( percent ); |
| | 130 | + this.parent_seek( percent ); |
| 131 | 131 | } else if ( this.playerElement ) { |
| 132 | 132 | this.seeking = true; |
| 133 | 133 | mw.log( "do vlc http seek to: " + percent ) |
| — | — | @@ -156,7 +156,7 @@ |
| 157 | 157 | var newState = _this.playerElement.input.state; |
| 158 | 158 | // if playing we are ready to do the |
| 159 | 159 | if ( newState == 3 ) { |
| 160 | | - _this.doSeek( percent ); |
| | 160 | + _this.seek( percent ); |
| 161 | 161 | } else { |
| 162 | 162 | // try to get player for 10 seconds: |
| 163 | 163 | if ( rfsCount < 200 ) { |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js |
| — | — | @@ -84,7 +84,7 @@ |
| 85 | 85 | /** |
| 86 | 86 | * Return the embed code |
| 87 | 87 | */ |
| 88 | | - doEmbedHTML : function () { |
| | 88 | + embedPlayerHTML : function () { |
| 89 | 89 | var _this = this; |
| 90 | 90 | |
| 91 | 91 | // Reset some play state flags: |
| — | — | @@ -231,8 +231,8 @@ |
| 232 | 232 | * |
| 233 | 233 | * @param {Float} percentage |
| 234 | 234 | */ |
| 235 | | - doSeek: function( percentage ) { |
| 236 | | - mw.log( 'Native::doSeek p: ' + percentage + ' : ' + this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' + this.seek_time_sec ); |
| | 235 | + seek: function( percentage ) { |
| | 236 | + mw.log( 'Native::seek p: ' + percentage + ' : ' + this.supportsURLTimeEncoding() + ' dur: ' + this.getDuration() + ' sts:' + this.seek_time_sec ); |
| 237 | 237 | this.seeking = true; |
| 238 | 238 | |
| 239 | 239 | // Run the onSeeking interface update |
| — | — | @@ -246,7 +246,7 @@ |
| 247 | 247 | this.doNativeSeek( percentage ); |
| 248 | 248 | } else { |
| 249 | 249 | // We support URLTimeEncoding call parent seek: |
| 250 | | - this.parent_doSeek( percentage ); |
| | 250 | + this.parent_seek( percentage ); |
| 251 | 251 | } |
| 252 | 252 | } else if ( this.playerElement && this.playerElement.duration ) { |
| 253 | 253 | // (could also check bufferedPercent > percentage seek (and issue oggz_chop request or not) |
| — | — | @@ -555,7 +555,7 @@ |
| 556 | 556 | // No vid loaded |
| 557 | 557 | mw.log( 'native::load() ... doEmbed' ); |
| 558 | 558 | this.onlyLoadFlag = true; |
| 559 | | - this.doEmbedHTML(); |
| | 559 | + this.embedPlayerHTML(); |
| 560 | 560 | this.onLoadedCallback = callback; |
| 561 | 561 | } else { |
| 562 | 562 | // Should not happen offten |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerKplayer.js |
| — | — | @@ -32,7 +32,7 @@ |
| 33 | 33 | /** |
| 34 | 34 | * Write the Embed html to the target |
| 35 | 35 | */ |
| 36 | | - doEmbedHTML : function() { |
| | 36 | + embedPlayerHTML : function() { |
| 37 | 37 | var _this = this; |
| 38 | 38 | |
| 39 | 39 | mw.log("kPlayer:: embed src::" + _this.getSrc()); |
| — | — | @@ -216,17 +216,17 @@ |
| 217 | 217 | * @param {Float} |
| 218 | 218 | * percentage Percentage of total stream length to seek to |
| 219 | 219 | */ |
| 220 | | - doSeek: function( percentage ) { |
| | 220 | + seek: function( percentage ) { |
| 221 | 221 | var _this = this; |
| 222 | 222 | var seekTime = percentage * this.getDuration(); |
| 223 | | - mw.log( 'EmbedPlayerKalturaKplayer:: doSeek: ' + percentage + ' time:' + seekTime ); |
| | 223 | + mw.log( 'EmbedPlayerKalturaKplayer:: seek: ' + percentage + ' time:' + seekTime ); |
| 224 | 224 | if (this.supportsURLTimeEncoding()) { |
| 225 | 225 | |
| 226 | 226 | // Make sure we could not do a local seek instead: |
| 227 | 227 | if (!(percentage < this.bufferedPercent |
| 228 | 228 | && this.playerElement.duration && !this.didSeekJump)) { |
| 229 | 229 | // We support URLTimeEncoding call parent seek: |
| 230 | | - this.parent_doSeek( percentage ); |
| | 230 | + this.parent_seek( percentage ); |
| 231 | 231 | return; |
| 232 | 232 | } |
| 233 | 233 | } |