| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -2067,6 +2067,10 @@ |
| 2068 | 2068 | $j( this ).show(); |
| 2069 | 2069 | this.controls = true; |
| 2070 | 2070 | } |
| | 2071 | + if( !this.useNativePlayerControls() && !this.isPersistentNativePlayer() && !_this.controlBuilder.checkOverlayControls() ){ |
| | 2072 | + // give the interface more space for the controls: |
| | 2073 | + this.$interface.css('height', this.height + _this.controlBuilder.height ); |
| | 2074 | + } |
| 2071 | 2075 | |
| 2072 | 2076 | // Update Thumbnail for the "player" |
| 2073 | 2077 | this.updatePosterHTML(); |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayerJava.js |
| — | — | @@ -2,7 +2,7 @@ |
| 3 | 3 | * List of domains and hosted location of cortado. Lets clients avoid the security warning for cross domain cortado |
| 4 | 4 | */ |
| 5 | 5 | window.cortadoDomainLocations = { |
| 6 | | - 'upload.wikimedia.org' : 'http://upload.wikimedia.org/jars/cortado.jar' |
| | 6 | + 'upload.wikimedia.org' : 'http://upload.wikimedia.org/jars/cortado.jar' |
| 7 | 7 | }; |
| 8 | 8 | |
| 9 | 9 | // Set the default location for CortadoApplet |
| — | — | @@ -32,16 +32,14 @@ |
| 33 | 33 | var _this = this; |
| 34 | 34 | mw.log( "java play url:" + this.getSrc( this.seek_time_sec ) ); |
| 35 | 35 | |
| 36 | | - var applet_loc = this.getAppletLocation(); |
| 37 | | - |
| 38 | | - mw.log('Applet location: ' + applet_loc ); |
| | 36 | + mw.log('Applet location: ' + this.getAppletLocation() ); |
| 39 | 37 | mw.log('Play media: ' + this.getSrc() ); |
| 40 | 38 | |
| 41 | 39 | // load directly in the page.. |
| 42 | | - // (media must be on the same server or applet must be signed) |
| | 40 | + // ( media must be on the same server or applet must be signed ) |
| 43 | 41 | var appletCode = '' + |
| 44 | 42 | '<applet id="' + this.pid + '" code="com.fluendo.player.Cortado.class" ' + |
| 45 | | - 'archive="' + applet_loc + '" width="' + parseInt( this.getWidth() ) + '" ' + |
| | 43 | + 'archive="' + this.getAppletLocation() + '" width="' + parseInt( this.getWidth() ) + '" ' + |
| 46 | 44 | 'height="' + parseInt( this.getHeight() ) + '"> ' + "\n" + |
| 47 | 45 | '<param name="url" value="' + this.getSrc() + '" /> ' + "\n" + |
| 48 | 46 | '<param name="local" value="false"/>' + "\n" + |
| — | — | @@ -56,8 +54,10 @@ |
| 57 | 55 | appletCode += '<param name="duration" value="' + parseFloat( this.getDuration() ) + '" />' + "\n"; |
| 58 | 56 | } |
| 59 | 57 | |
| 60 | | - appletCode += '<param name="bufferSize" value="4096" />' + "\n" + |
| 61 | | - '</applet>'; |
| | 58 | + appletCode += '<param name="BufferSize" value="4096" />' + |
| | 59 | + '<param name="BufferHigh" value="25">' + |
| | 60 | + '<param name="BufferLow" value="5">' + |
| | 61 | + '</applet>'; |
| 62 | 62 | |
| 63 | 63 | $j( this ).html( appletCode ); |
| 64 | 64 | |
| — | — | @@ -96,7 +96,7 @@ |
| 97 | 97 | */ |
| 98 | 98 | getAppletLocation: function() { |
| 99 | 99 | var mediaSrc = this.getSrc(); |
| 100 | | - var applet_loc = false; |
| | 100 | + var appletLoc = false; |
| 101 | 101 | if ( |
| 102 | 102 | !mw.isLocalDomain( mediaSrc ) |
| 103 | 103 | || |
| — | — | @@ -105,15 +105,15 @@ |
| 106 | 106 | mw.getConfig( 'relativeCortadoAppletPath' ) === false ) |
| 107 | 107 | ){ |
| 108 | 108 | if ( window.cortadoDomainLocations[ mw.parseUri( mediaSrc ).host ] ) { |
| 109 | | - applet_loc = window.cortadoDomainLocations[ mw.parseUri( mediaSrc ).host ]; |
| | 109 | + appletLoc = window.cortadoDomainLocations[ mw.parseUri( mediaSrc ).host ]; |
| 110 | 110 | } else { |
| 111 | | - applet_loc = 'http://theora.org/cortado.jar'; |
| | 111 | + appletLoc = 'http://theora.org/cortado.jar'; |
| 112 | 112 | } |
| 113 | 113 | } else { |
| 114 | 114 | // Get the local relative cortado applet location: |
| 115 | | - applet_loc = mw.getConfig( 'relativeCortadoAppletPath' ); |
| | 115 | + appletLoc = mw.getConfig( 'relativeCortadoAppletPath' ); |
| 116 | 116 | } |
| 117 | | - return applet_loc; |
| | 117 | + return appletLoc; |
| 118 | 118 | }, |
| 119 | 119 | |
| 120 | 120 | /** |
| — | — | @@ -128,11 +128,12 @@ |
| 129 | 129 | //mw.log(' ct: ' + this.playerElement.getPlayPosition() + ' ' + this.supportsURLTimeEncoding()); |
| 130 | 130 | |
| 131 | 131 | currentTime = this.playerElement.currentTime; |
| 132 | | - if ( this.currentTime < 0 ) { |
| | 132 | + // ( java cortado has -1 time ~sometimes~ ) |
| | 133 | + /*if ( this.currentTime < 0 ) { |
| 133 | 134 | mw.log( 'pp:' + this.currentTime ); |
| 134 | 135 | // Probably reached clip ( should fire ondone event instead ) |
| 135 | 136 | this.onClipDone(); |
| 136 | | - } |
| | 137 | + }*/ |
| 137 | 138 | } catch ( e ) { |
| 138 | 139 | mw.log( 'could not get time from jPlayer: ' + e ); |
| 139 | 140 | } |
| — | — | @@ -188,7 +189,7 @@ |
| 189 | 190 | mw.log( 'error:doPlayThenSeek failed' ); |
| 190 | 191 | } |
| 191 | 192 | } |
| 192 | | - } |
| | 193 | + }; |
| 193 | 194 | readyForSeek(); |
| 194 | 195 | }, |
| 195 | 196 | |