| Index: trunk/extensions/MetavidWiki/includes/MV_Title.php |
| — | — | @@ -283,7 +283,8 @@ |
| 284 | 284 | if ( $this->getStartTime() != '' && $this->getEndTime() != '' ) { |
| 285 | 285 | if ( $quality == $mvDefaultVideoQualityKey || |
| 286 | 286 | $quality == $mvDefaultVideoHighQualityKey ) { |
| 287 | | - $time_req = '.anx?t=' . $this->getStartTime() . '/' . $this->getEndTime(); |
| | 287 | + //removed .anx |
| | 288 | + $time_req = '?t=' . $this->getStartTime() . '/' . $this->getEndTime(); |
| 288 | 289 | } else if ( $quality == $mvDefaultFlashQualityKey ) { |
| 289 | 290 | $time_req = '?t=' . $this->getStartTime() . '/' . $this->getEndTime(); |
| 290 | 291 | } |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_embed.js |
| — | — | @@ -26,9 +26,6 @@ |
| 27 | 27 | //note: this is necessary for remote embedding because of java security model) |
| 28 | 28 | var mv_java_iframe = true; |
| 29 | 29 | |
| 30 | | -//ogg chop links ( removes .anx from stream) should be deprecated shortly |
| 31 | | -var ogg_chop_links = true; |
| 32 | | - |
| 33 | 30 | //media_server mv_embed_path (the path on media servers to mv_embed for java iframe with leading and trailing slashes) |
| 34 | 31 | var mv_media_iframe_path = '/mv_embed/'; |
| 35 | 32 | |
| — | — | @@ -78,7 +75,7 @@ |
| 79 | 76 | |
| 80 | 77 | gMsg['error_swap_vid']='Error:mv_embed was unable to swap the video tag for the mv_embed interface'; |
| 81 | 78 | |
| 82 | | -gMsg['download_from']='Download Selection:'; |
| | 79 | +gMsg['download_segment']='Download Selection:'; |
| 83 | 80 | gMsg['download_full']='Download Full Video File:' |
| 84 | 81 | gMsg['download_clip']='Download the Clip'; |
| 85 | 82 | gMsg['download_text']='Download Text (<a style="color:white" title="cmml" href="http://wiki.xiph.org/index.php/CMML">cmml</a> xml):'; |
| — | — | @@ -1244,9 +1241,7 @@ |
| 1245 | 1242 | } |
| 1246 | 1243 | }, |
| 1247 | 1244 | show:function(){ |
| 1248 | | - //js_log("show text interface"); |
| 1249 | | - /*fade out cc button*/ |
| 1250 | | - $j('#metaButton_'+this.pe.id).fadeOut('fast'); |
| | 1245 | + js_log("f:show() text interface"); |
| 1251 | 1246 | /*slide in intefrace container*/ |
| 1252 | 1247 | //dont' know how 'px' creeps in here: |
| 1253 | 1248 | this.pe.height = this.pe.height.replace('px', ''); |
| — | — | @@ -1414,11 +1409,9 @@ |
| 1415 | 1410 | |
| 1416 | 1411 | init : function(element) |
| 1417 | 1412 | { |
| 1418 | | - js_log(element); |
| | 1413 | + js_log('adding mediaSource: ' + element); |
| 1419 | 1414 | |
| 1420 | | - this.src = $j(element).attr('src'); |
| 1421 | | - if(ogg_chop_links) |
| 1422 | | - this.src = this.src.replace(".anx", ''); |
| | 1415 | + this.src = $j(element).attr('src'); |
| 1423 | 1416 | |
| 1424 | 1417 | this.marked_default = false; |
| 1425 | 1418 | |
| — | — | @@ -1457,6 +1450,11 @@ |
| 1458 | 1451 | //js_log('Adding mediaSource of type ' + this.mime_type + ' and uri ' + this.src + ' and title ' + this.title); |
| 1459 | 1452 | this.parseURLDuration(); |
| 1460 | 1453 | }, |
| | 1454 | + updateSource:function(element){ |
| | 1455 | + //for now just update the title: |
| | 1456 | + if ($j(element).attr("title")) |
| | 1457 | + this.title = $j(element).attr("title"); |
| | 1458 | + }, |
| 1461 | 1459 | /** updates the src time and start & end |
| 1462 | 1460 | * @param {String} start_time in NTP format |
| 1463 | 1461 | * @param {String} end_time in NTP format |
| — | — | @@ -1733,8 +1731,11 @@ |
| 1734 | 1732 | } |
| 1735 | 1733 | var new_src = $j(element).attr('src'); |
| 1736 | 1734 | //make sure an existing element with the same src does not already exist: |
| 1737 | | - for(i in this.sources){ |
| 1738 | | - if(this.sources[i].getURI()==new_src){ |
| | 1735 | + for(i in this.sources){ |
| | 1736 | + if(this.sources[i].getURI()==new_src){ |
| | 1737 | + js_log('checking existing: '+this.sources[i].getURI() + ' != '+ new_src); |
| | 1738 | + //can't add it all but try to update any additional attr: |
| | 1739 | + this.sources[i].updateSource(element); |
| 1739 | 1740 | return false; |
| 1740 | 1741 | } |
| 1741 | 1742 | } |
| — | — | @@ -2619,7 +2620,7 @@ |
| 2620 | 2621 | } |
| 2621 | 2622 | } |
| 2622 | 2623 | select_html+='</ul></div>'; |
| 2623 | | - js_log(select_html); |
| | 2624 | + //js_log(select_html); |
| 2624 | 2625 | return select_html; |
| 2625 | 2626 | }, |
| 2626 | 2627 | selectPlaybackMethod:function(){ |
| — | — | @@ -2670,10 +2671,11 @@ |
| 2671 | 2672 | } |
| 2672 | 2673 | }, |
| 2673 | 2674 | getShowVideoDownload:function(){ |
| 2674 | | - var out='<b style="color:white;">'+getMsg('download_from')+'</b><br>'; |
| | 2675 | + var out='<b style="color:white;">'+getMsg('download_segment')+'</b><br>'; |
| 2675 | 2676 | out+='<span style="color:white"><blockquote>'; |
| 2676 | 2677 | var dl_list=''; |
| 2677 | 2678 | var dl_txt_list=''; |
| | 2679 | + |
| 2678 | 2680 | $j.each(this.media_element.getSources(), function(index, source){ |
| 2679 | 2681 | var dl_line = '<li>' + '<a style="color:white" href="' + source.getURI() +'"> ' |
| 2680 | 2682 | + source.getTitle()+'</a> '+ '</li>'+"\n"; |
| — | — | @@ -2942,7 +2944,7 @@ |
| 2943 | 2945 | //add json_ to req url |
| 2944 | 2946 | if(req_url.indexOf("feed_format=")!=-1) |
| 2945 | 2947 | req_url = req_url.replace(/feed_format=/, 'feed_format=json_'); |
| 2946 | | - js_log('json url: '+ req_url); |
| | 2948 | + //js_log('json url: '+ req_url); |
| 2947 | 2949 | //response type is mv_json_response or proxy dissabled |
| 2948 | 2950 | loadExternalJs(req_url+'&cb=mv_jsdata_cb&cb_inx='+(global_req_cb.length-1)); |
| 2949 | 2951 | } |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/README |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | 2 | *********************************************** |
| 3 | 3 | * |
| 4 | | -* mv_embed version .6 |
| | 4 | +* mv_embed version 1.0rc1 |
| 5 | 5 | * for details see: http://metavid.ucsc.edu/wiki/index.php/Mv_embed |
| 6 | 6 | * and this README |
| 7 | 7 | * |
| — | — | @@ -16,7 +16,6 @@ |
| 17 | 17 | v.7 |
| 18 | 18 | |
| 19 | 19 | |
| 20 | | - |
| 21 | 20 | v.6 |
| 22 | 21 | * added msg system for compatibility with translations |
| 23 | 22 | * add support for relative file or path names for media files for cortado. |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_data_proxy.php |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | * (so that remote use of mv_embed can load remote xml ) |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | | -// NOTE THIS IS DISABLED BY DEFAULT FOR A RESON |
| | 11 | +// NOTE THIS IS DISABLED BY DEFAULT FOR A REASON |
| 12 | 12 | // See var mv_data_proxy in mv_embed.js for more info |
| 13 | 13 | die( 'note mv_data_proxy is disabled by default' ); |
| 14 | 14 | |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/mv_playlist.js |
| — | — | @@ -1679,11 +1679,11 @@ |
| 1680 | 1680 | $j('#'+tObj.overlay_selector_id).show(); |
| 1681 | 1681 | |
| 1682 | 1682 | //do update: |
| 1683 | | - js_log('doing update for: '+ tObj.pClip.id + |
| | 1683 | + /*js_log('doing update for: '+ tObj.pClip.id + |
| 1684 | 1684 | ' type:' + tObj.transAttrType + |
| 1685 | 1685 | ' t_type:'+ tObj.type + |
| 1686 | 1686 | ' subypte:'+ tObj.subtype + |
| 1687 | | - ' percent:' + percent); |
| | 1687 | + ' percent:' + percent);*/ |
| 1688 | 1688 | |
| 1689 | 1689 | this['type'][tObj.type][tObj.subtype].u(tObj,percent); |
| 1690 | 1690 | }, |