| Index: trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/testing_page.php |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | <table border="1" cellpadding="6" width="600"> |
| 20 | 20 | <tr> |
| 21 | 21 | <td valign="top"> |
| 22 | | - <video src="test_audio.oga" type="audio/ogg"></video> |
| | 22 | + <playlist src="fresh_smil_load.php" type="audio/ogg"></playlist> |
| 23 | 23 | </td> |
| 24 | 24 | <td valign="top"><b>Test embed</b><br /> |
| 25 | 25 | </td> |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libAddMedia/mvUploader.js |
| — | — | @@ -329,7 +329,7 @@ |
| 330 | 330 | if(typeof JSON == 'undefined'){ |
| 331 | 331 | //we need to load the jQuery json parser: (older browsers don't have JSON.parse |
| 332 | 332 | mvJsLoader.doLoad({ |
| 333 | | - '$.secureEvalJSON':'jquery/plugins/jquery.json-1.3.js' |
| | 333 | + '$j.secureEvalJSON':'jquery/plugins/jquery.json-1.3.js' |
| 334 | 334 | },function(){ |
| 335 | 335 | var apiResult = $j.secureEvalJSON( data.upload['apiUploadResult'] ); |
| 336 | 336 | _this.processApiResult( apiResult ); |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libSequencer/mvPlayList.js |
| — | — | @@ -532,7 +532,7 @@ |
| 533 | 533 | * this won't work so well with time range loading for smil (need to work on that) |
| 534 | 534 | */ |
| 535 | 535 | loadFutureClips:function(){ |
| 536 | | - if( this.cur_clip.embed.bufferedPercent == 1){ |
| | 536 | + /*if( this.cur_clip.embed.bufferedPercent == 1){ |
| 537 | 537 | //set the buffer to the currentTime - duration |
| 538 | 538 | var curBuffredTime = this.cur_clip.getDuration() - this.cur_clip.embed.currentTime; |
| 539 | 539 | |
| — | — | @@ -543,7 +543,7 @@ |
| 544 | 544 | if( curBuffredTime < this.playlist_buffer_time ){ |
| 545 | 545 | js_log(" we only have " + curBuffredTime + ' buffed but we need: ' + this.playlist_buffer_time); |
| 546 | 546 | |
| 547 | | - for(var inx = this.cur_clip.order + 1; inx < this.default_track.clip.length; inx++ ){ |
| | 547 | + for(var inx = this.cur_clip.order + 1; inx < this.default_track.clips.length; inx++ ){ |
| 548 | 548 | var cClip = this.default_track.getClip( inx ); |
| 549 | 549 | |
| 550 | 550 | //check if the clip is already loaded (add its duration) |
| — | — | @@ -560,7 +560,7 @@ |
| 561 | 561 | } |
| 562 | 562 | } |
| 563 | 563 | } |
| 564 | | - } |
| | 564 | + }*/ |
| 565 | 565 | }, |
| 566 | 566 | //called to play the next clip if done call onClipDone |
| 567 | 567 | playNext: function(){ |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libEmbedVideo/mv_omtkEmbed.js |
| — | — | @@ -7,13 +7,13 @@ |
| 8 | 8 | getEmbedHTML : function (){ |
| 9 | 9 | var embed_code = this.getEmbedObj(); |
| 10 | 10 | //need omtk to fire an onReady event. |
| 11 | | - setTimeout('$j(\'#' + this.id + '\').get(0).postEmbedJS()', 1000); |
| | 11 | + setTimeout('$j(\'#' + this.id + '\').get(0).postEmbedJS()', 2000); |
| 12 | 12 | return this.wrapEmebedContainer( embed_code); |
| 13 | 13 | }, |
| 14 | 14 | getEmbedObj:function(){ |
| 15 | | - var player_path = mv_embed_path + 'binPlayers/omtk-fx/omtkp.swf'; |
| | 15 | + var player_path = mv_embed_path + 'binPlayers/omtk-fx/omtkp.swf'; |
| | 16 | + //player_path = 'omtkp.swf'; |
| 16 | 17 | js_log("player path: " + player_path); |
| 17 | | - //player_path = 'omtkp.swf'; |
| 18 | 18 | return '<object id="'+this.pid+'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="1" height="1">' + |
| 19 | 19 | '<param name="movie" value="' + player_path +'" />'+"\n"+ |
| 20 | 20 | '<!--[if !IE]>-->'+"\n"+ |