| Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_playlist.js |
| — | — | @@ -415,7 +415,7 @@ |
| 416 | 416 | var clip_float_sec=0; |
| 417 | 417 | for(var i in this.default_track.clips){ |
| 418 | 418 | var clip = this.default_track.clips[i]; |
| 419 | | - if( (clip.getDuration() + pl_sum_time) > float_sec ){ |
| | 419 | + if( (clip.getDuration() + pl_sum_time) >= float_sec ){ |
| 420 | 420 | if(this.cur_clip.id != clip.id){ |
| 421 | 421 | $j('#clipDesc_'+this.cur_clip.id).hide(); |
| 422 | 422 | this.cur_clip = clip; |
| — | — | @@ -430,7 +430,7 @@ |
| 431 | 431 | this.cur_clip.embed.start_offset=this.cur_clip.embed.media_element.selected_source.start_offset; |
| 432 | 432 | |
| 433 | 433 | //render effects ontop: |
| 434 | | - //issue thumbnail update request: (if plugin supports it will render out |
| | 434 | + //issue thumbnail update request: (if plugin supports it will render out frame) |
| 435 | 435 | this.cur_clip.embed.updateTimeThumb(perc); |
| 436 | 436 | |
| 437 | 437 | this.cur_clip.embed.currentTime = (float_sec -pl_sum_time)+this.cur_clip.embed.start_offset ; |
| — | — | @@ -1537,7 +1537,7 @@ |
| 1538 | 1538 | //handles the rendering of overlays loaind of future clips (if nessesary) |
| 1539 | 1539 | //@@todo could be lazy loaded if nessesary |
| 1540 | 1540 | mvPlayList.prototype.doSmilActions = function(){ |
| 1541 | | - //js_log('f:doSmilActions'); |
| | 1541 | + js_log('f:doSmilActions: ' + this.cur_clip.embed.currentTime); |
| 1542 | 1542 | var offSetTime = 0; //offset time should let us start a transition later on if we have to. |
| 1543 | 1543 | _pClip = this.cur_clip; |
| 1544 | 1544 | |
| — | — | @@ -1592,7 +1592,7 @@ |
| 1593 | 1593 | //only update if userSlide (otherwise hanndled by internal transition timer) |
| 1594 | 1594 | if(this.userSlide){ |
| 1595 | 1595 | js_log('user slide update transition state:'+ _pClip.embed.currentTime ); |
| 1596 | | - _pClip.transIn.run_animation(); |
| | 1596 | + mvTransLib.doUpdate(_pClip.transIn, (_pClip.embed.currentTime / _pClip.dur) ); |
| 1597 | 1597 | } |
| 1598 | 1598 | }else if(_pClip.transIn.animation_state==2){ |
| 1599 | 1599 | //close up shop: |