| Index: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php |
| — | — | @@ -6,7 +6,7 @@ |
| 7 | 7 | * for more info visit http://metavid.org/wiki/Code |
| 8 | 8 | * |
| 9 | 9 | */ |
| 10 | | -define( 'MV_VERSION', '1.0r44460' ); |
| | 10 | +define( 'MV_VERSION', '1.0r44924' ); |
| 11 | 11 | |
| 12 | 12 | if ( !defined( 'MEDIAWIKI' ) ) die( 1 ); |
| 13 | 13 | |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/example_usage/sample_page.php |
| — | — | @@ -47,7 +47,7 @@ |
| 48 | 48 | $sample_embed[2]['desc'] = 'simple video with controls and thumbnail'; |
| 49 | 49 | |
| 50 | 50 | |
| 51 | | -$sample_embed[3]['tag'] = '<video style="width:320px;height:240px" roe="http://metavid.org/w/index.php?title=Special:MvExportStream&stream_name=Senate_proceeding_08-01-07&t=0:00:00/0:20:00&feed_format=roe" ></video>'; |
| | 51 | +$sample_embed[3]['tag'] = '<video style="width:400px;height:300px" roe="http://metavid.org/w/index.php?title=Special:MvExportStream&stream_name=Senate_proceeding_08-01-07&t=0:05:38/0:05:58&feed_format=roe" ></video>'; |
| 52 | 52 | $sample_embed[3]['desc'] = 'Demo of ROE only attribute'; |
| 53 | 53 | |
| 54 | 54 | |
| Index: trunk/extensions/MetavidWiki/skins/mv_embed/libEmbedObj/mv_flashEmbed.js |
| — | — | @@ -1545,6 +1545,7 @@ |
| 1546 | 1546 | instanceOf:'flashEmbed', |
| 1547 | 1547 | monitorTimerId : 0, |
| 1548 | 1548 | old_pid:0, |
| | 1549 | + didSeekJump:false, |
| 1549 | 1550 | startedTimedPlayback:false, |
| 1550 | 1551 | supports: { |
| 1551 | 1552 | 'play_head':true, |
| — | — | @@ -1595,8 +1596,11 @@ |
| 1596 | 1597 | autoHide:'always', |
| 1597 | 1598 | top:'95%', |
| 1598 | 1599 | right:'0px' |
| 1599 | | - } |
| 1600 | | - } |
| | 1600 | + } |
| | 1601 | + }, |
| | 1602 | + screen: { |
| | 1603 | + opacity: 0.2 |
| | 1604 | + } |
| 1601 | 1605 | }; |
| 1602 | 1606 | |
| 1603 | 1607 | $f(this.pid, mv_embed_path + 'flowplayer/flowplayer-3.0.1.swf', flowConfig); |
| — | — | @@ -1609,6 +1613,9 @@ |
| 1610 | 1614 | this.fla.onResume( function(){ |
| 1611 | 1615 | _this.parent_play(); //update the interface |
| 1612 | 1616 | }); |
| | 1617 | + //hide by default (untill its ready) |
| | 1618 | + this.fla.setVolume(0); |
| | 1619 | + |
| 1613 | 1620 | //start monitor: |
| 1614 | 1621 | this.monitor(); |
| 1615 | 1622 | this.old_pid++; |
| — | — | @@ -1665,7 +1672,11 @@ |
| 1666 | 1673 | if( $j('#'+this.id).length != 0 ) |
| 1667 | 1674 | this.monitorTimerId = window.setInterval('$j(\'#'+_this.id+'\').get(0).monitor()', 250); |
| 1668 | 1675 | } |
| 1669 | | - |
| | 1676 | + //set the start & end ntp |
| | 1677 | + var end_ntp = (this.media_element.selected_source.end_ntp)? |
| | 1678 | + this.media_element.selected_source.end_ntp : seconds2ntp(0); |
| | 1679 | + var start_ntp = this.media_element.selected_source.start_ntp; |
| | 1680 | + |
| 1670 | 1681 | var flash_state = this.fla.getStatus(); |
| 1671 | 1682 | if( typeof flash_state == 'undefined' ){ |
| 1672 | 1683 | var flash_state = { |
| — | — | @@ -1674,7 +1685,7 @@ |
| 1675 | 1686 | }else{ |
| 1676 | 1687 | //simplification of buffer state ... should move to support returning time rages like: |
| 1677 | 1688 | //http://www.whatwg.org/specs/web-apps/current-work/#normalized-timeranges-object |
| 1678 | | - this.bufferedPercent = flash_state.bufferEnd / this.getDuration(); |
| | 1689 | + this.bufferedPercent = flash_state.bufferEnd / this.getDuration(); |
| 1679 | 1690 | } |
| 1680 | 1691 | //set the current Time (based on timeFormat) |
| 1681 | 1692 | if( this.media_element.selected_source.timeFormat =='anx' ){ |
| — | — | @@ -1687,15 +1698,13 @@ |
| 1688 | 1699 | //js_log('should stop buffering (does not seem to work)' + flash_state.bufferEnd + ' > dur: ' + this.getDuration() ); |
| 1689 | 1700 | this.fla.stopBuffering(); |
| 1690 | 1701 | } |
| 1691 | | - } |
| 1692 | | - |
| 1693 | | - var end_ntp = (this.media_element.selected_source.end_ntp)? |
| 1694 | | - this.media_element.selected_source.end_ntp : seconds2ntp(0); |
| 1695 | | - var start_ntp = this.media_element.selected_source.start_ntp; |
| | 1702 | + } |
| 1696 | 1703 | |
| 1697 | 1704 | if(this.currentTime > ntp2seconds(start_ntp) && !this.startedTimedPlayback){ |
| 1698 | | - this.startedTimedPlayback=true; |
| 1699 | | - js_log("time is "+ this.currentTime + " started playback"); |
| | 1705 | + this.startedTimedPlayback=true; |
| | 1706 | + js_log("time is "+ this.currentTime + " started playback"); |
| | 1707 | + this.fla.setVolume(90); |
| | 1708 | + $f().getPlugin('screen').css({'opacity':'1.0'}); |
| 1700 | 1709 | } |
| 1701 | 1710 | /* to support local seeks */ |
| 1702 | 1711 | if(this.currentTime > 1 && this.seek_time_sec != 0 && !this.media_element.selected_source.supports_url_time_encoding) |
| — | — | @@ -1713,6 +1722,7 @@ |
| 1714 | 1723 | if(!this.userSlide){ |
| 1715 | 1724 | if((this.currentTime - ntp2seconds(start_ntp))<0){ |
| 1716 | 1725 | this.setStatus('buffering...'); |
| | 1726 | + this.fla.setVolume(0); |
| 1717 | 1727 | }else{ |
| 1718 | 1728 | this.setStatus( seconds2ntp(this.currentTime) + '/' + end_ntp); |
| 1719 | 1729 | this.setSliderValue((this.currentTime - ntp2seconds(start_ntp)) / (ntp2seconds(end_ntp)-ntp2seconds(start_ntp)) ); |