| Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Timed_Text.html |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | <td valign="top" width="410"> |
| 23 | 23 | <video poster="http://ia340929.us.archive.org/0/items/princess_iron_fan/princess_iron_fan.thumbs/princess_iron_fan_000360.jpg" |
| 24 | 24 | duration="1:13:0" linkback="http://www.archive.org/details/princess_iron_fan" > |
| 25 | | - <source type="video/ogg" src="http://www.archive.org/download/princess_iron_fan/princess_iron_fan.ogv" URLTimeEncoding="true"></source> |
| | 25 | + <source type="video/ogg" src="http://www.archive.org/download/princess_iron_fan/princess_iron_fan.ogv" ></source> |
| 26 | 26 | <source type="video/h264" src="http://www.archive.org/download/princess_iron_fan/princess_iron_fan_512kb.mp4"></source> |
| 27 | 27 | <text category="SUB" lang="en" type="text/x-srt" default="true" |
| 28 | 28 | title="English subtitles" src="media/princess_archive_org/princess_iron_fan.srt"> |
| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js |
| — | — | @@ -392,8 +392,7 @@ |
| 393 | 393 | $j('#mv_play_head_'+embedObj.id + ' .ui-slider-range').addClass('ui-corner-all').css('z-index', 2); |
| 394 | 394 | //extended class list for jQuery ui themeing (we can probably refactor this with custom buffering highliter) |
| 395 | 395 | $j('#mv_play_head_'+embedObj.id).append( ctrlBuilder.getMvBufferHtml() ); |
| 396 | | - |
| 397 | | - |
| | 396 | + |
| 398 | 397 | //videoOptions: |
| 399 | 398 | $j('#mv_vid_options_'+ctrlBuilder.id+' .vo_selection').click(function(){ |
| 400 | 399 | embedObj.selectPlaybackMethod(); |
| Index: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/nativeEmbed.js |
| — | — | @@ -84,6 +84,7 @@ |
| 85 | 85 | this.parent_doSeek(perc); |
| 86 | 86 | } |
| 87 | 87 | }else if(this.vid && this.vid.duration ){ |
| | 88 | + //(could also check bufferedPercent > perc seek (and issue oggz_chop request or not) |
| 88 | 89 | this.doNativeSeek(perc); |
| 89 | 90 | }else{ |
| 90 | 91 | this.doPlayThenSeek(perc) |
| — | — | @@ -95,7 +96,7 @@ |
| 96 | 97 | this.parent_monitor(); |
| 97 | 98 | }, |
| 98 | 99 | doPlayThenSeek:function(perc){ |
| 99 | | - js_log('doPlayThenSeek Hack'); |
| | 100 | + js_log('native::doPlayThenSeek::'); |
| 100 | 101 | var _this = this; |
| 101 | 102 | this.play(); |
| 102 | 103 | var rfsCount = 0; |
| Index: branches/new-upload/phase3/js2/mwEmbed/libTimedText/mvTextInterface.js |
| — | — | @@ -5,7 +5,6 @@ |
| 6 | 6 | "close" : "close", |
| 7 | 7 | "improve_transcript" : "Improve", |
| 8 | 8 | }) |
| 9 | | - |
| 10 | 9 | // text interface object (for inline display captions) |
| 11 | 10 | var mvTextInterface = function( parentEmbed ){ |
| 12 | 11 | return this.init( parentEmbed ); |
| — | — | @@ -180,7 +179,7 @@ |
| 181 | 180 | _this.pe.highlightPlaySection( { |
| 182 | 181 | 'start' : $j(this).parent().attr("start"), |
| 183 | 182 | 'end' : $j(this).parent().attr("end") |
| 184 | | - }); |
| | 183 | + }); |
| 185 | 184 | }, |
| 186 | 185 | out:function () { |
| 187 | 186 | js_log('mvttseek: out'); |
| — | — | @@ -288,7 +287,7 @@ |
| 289 | 288 | } |
| 290 | 289 | }; |
| 291 | 290 | /*js_log('search_for_range:'+search_for_range + ' for: '+ cur_time);*/ |
| 292 | | - if(search_for_range){ |
| | 291 | + if( search_for_range ){ |
| 293 | 292 | //search for current time: add tt_scroll_highlight to clip |
| 294 | 293 | // optimize: |
| 295 | 294 | // should do binnary search not iterative |
| — | — | @@ -516,4 +515,4 @@ |
| 517 | 516 | } |
| 518 | 517 | } |
| 519 | 518 | } |
| 520 | | -}; |
| \ No newline at end of file |
| | 519 | +}; |