r51482 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r51481‎ | r51482 | r51483 >
Date:23:55, 4 June 2009
Author:dale
Status:deferred
Tags:
Comment:
* reorganized example usage folder
* playlist player style updates
Modified paths:
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Add_Media_Wizard.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Firefogg_Make_Advanced.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Firefogg_Make_Simple.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Make_Ogg_Advanced.html (deleted) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Make_Ogg_Simple.html (deleted) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Remote_Content_ogg_flv.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Themable.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Timed_Text.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/Sequence_Editor.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/SequencerPlayer_Seeking.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/SequencerPlayer_Simple.html (added) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/remote_metavid_ogg_flv.html (deleted) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/sample_add_media_wizard.html (deleted) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/sample_themable_player.html (deleted) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/sample_timed_text.html (deleted) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/seeking_example.html (deleted) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/simple_smil_example.html (deleted) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/example_usage/simple_video_tag.html (deleted) (history)
  • /branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js (modified) (history)

Diff [purge]

Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Make_Ogg_Advanced.html
——@@ -1,45 +0,0 @@
2 -<!DOCTYPE HTML>
3 -<html><head>
4 -<meta http-equiv="content-type" content="text/html; charset=UTF-8">
5 - <title>Firefogg - Make Ogg Video in your Browser</title>
6 - <!-- <script type="text/javascript" src="../jsScriptLoader.php?class=mv_embed"></script> -->
7 - <script type="text/javascript" src="../jsScriptLoader.php?class=mv_embed"></script>
8 -<style type="text/css" media="all">@import "http://www.firefogg.org/css/style.css";</style>
9 -<style type="text/css" media="all">
10 -.install{
11 -display:none;
12 -}
13 -</style>
14 -<script type="text/javascript">
15 -mwAddOnloadHook(function(){
16 - $j('#firefogg_app').firefogg({
17 - 'encoder_interface' : true,
18 - 'encode_local' : true
19 - },function(){
20 - $j('#loadFogg').hide();
21 - });
22 - $j('#doThemeRoller').click(function(){
23 - if(window.jquitr){
24 - jquitr.addThemeRoller();
25 - } else{
26 - loadExternalJs('http://jqueryui.com/themeroller/developertool/developertool.js.php');
27 - }
28 - }).html('custom themes');
29 -});
30 -</script>
31 -</head><body>
32 -<div id="main">
33 - <h1><a href="http://www.firefogg.org/index.html"><img
34 -src="http://www.firefogg.org/png/firefogg.png" alt="Firefogg"></a><br>
35 -Make Ogg Video</h1>
36 -<br>
37 - <br>
38 - <div style="margin-right:auto;margin-left:auto;width:500px;" id="loadFogg">Loading firefogg<blink>...</blink></div>
39 - <div style="margin-right:auto;margin-left:auto;width:500px;height:250px" id="firefogg_app"></div>
40 -
41 - <div style="height:250px"></div>
42 - <center><span style="font:size:80%">Built using <a href="http://firefogg.org">firefogg</a>, <a href="http://www.mediawiki.org/wiki/Media_Projects_Overview#MwEmbed">MwEmbed</a> and <a href="http://jqueryui.com/">jquery.ui</a>. Supports
43 - <a href="#" id="doThemeRoller">...</a>
44 - </span>
45 - </center>
46 -</body></html>
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/sample_themable_player.html
——@@ -1,27 +0,0 @@
2 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
3 -"http://www.w3.org/TR/html4/loose.dtd">
4 -<html>
5 -<head>
6 - <title>Sample Themed Player</title>
7 - <script type="text/javascript" src="../mv_embed.js?debug=true"></script>
8 -</head>
9 -<script type="text/javascript">
10 -mwAddOnloadHook(function(){
11 - $j('#doThemeRoller').click(function(){
12 - if(window.jquitr){
13 - jquitr.addThemeRoller();
14 - } else{
15 - loadExternalJs('http://jqueryui.com/themeroller/developertool/developertool.js.php');
16 - }
17 - }).html('<span class="ui-icon ui-icon-newwin"/>Run Theme Roller</span>');
18 -});
19 -</script>
20 -<body bgcolor="#FFF">
21 -<h3> Sample Themed Player:</h3>
22 -<a id="doThemeRoller" class="ui-icon_link ui-state-default ui-corner-all" href="#">loading theme editor<blink>...</blink></a><p><p>
23 -<video src="media/sample_fish.ogg" thumbnail="media/sample_fish.jpg" duration="26"></video>
24 - </table>
25 -
26 -</body>
27 -</html>
28 -
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/seeking_example.html
——@@ -1,78 +0,0 @@
2 -<!doctype html>
3 -<html>
4 -<head>
5 - <title>mv_embed Seeking Example</title>
6 - <script type="text/javascript" src="../mv_embed.js"></script>
7 - <style>
8 - #render_box {
9 - position:absolute;
10 - width:400px;
11 - height:300px;
12 - }
13 - #frame_overlay {
14 - position:absolute;
15 - width:400px;
16 - height:300px;
17 - top: 28px;
18 - left: 9px;
19 - }
20 -
21 - </style>
22 - <script>
23 -var pos = 0;
24 -var duration = 2;
25 -var step = 0.04;
26 -var render = false;
27 -
28 -function renderNext() {
29 - $j('#pos').val(pos);
30 - document.getElementById('render_box').setCurrentTime(pos, function(currentTime) {
31 - return function() {
32 - //ogg.addFrame('frame_overlay');
33 - pos += step;
34 - if(render && pos <= duration)
35 - renderNext();
36 - };
37 - }(pos));
38 -}
39 -
40 -function startRender() {
41 - //ogg = new Firefogg();
42 - //ogg.initRender('{"videoQuality": 10, "framerate": 25, "width": 400, "height": 300}', 'sample_smil.ogv');
43 - $j("#buttonStart").attr("disabled", true);
44 - if(!render) {
45 - //document.getElementById('render_box').play();
46 - //document.getElementById('render_box').pause();
47 - setTimeout(function() {
48 - //duration = document.getElementById('render_box').getDuration();
49 - render = true;
50 - pos = 0;
51 - renderNext();
52 - }, 1000);
53 - }
54 -}
55 -function stopRender() {
56 - render = false;
57 - $j("#buttonStart").attr("disabled", false);
58 - $j("#buttonSop").attr("disabled", true);
59 -}
60 -function seek() {
61 - var seekTo = $j('#pos').val();
62 - document.getElementById('render_box').setCurrentTime(seekTo, function() { js_log('seeked'); });
63 -}
64 - </script>
65 -</head>
66 -<body>
67 -<playlist id="render_box" src="media/sample_smil.xml" controls="false"></playlist>
68 -<div id="frame_overlay"></div>
69 -
70 -<div id="info" style="position: absolute; top:360px">
71 - <button onclick="startRender()" id="buttonStart">Start</button>
72 - <button onclick="stopRender()" id="buttonStart">Stop</button>
73 - position: <input type="text" id="pos" value="6.6" />
74 - <button onclick="seek()">seek</button>
75 - <span id="status"></span><br>
76 -</div>
77 -</body>
78 -</html>
79 -
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Make_Ogg_Simple.html
——@@ -1,39 +0,0 @@
2 -<!DOCTYPE HTML>
3 -<html><head>
4 -<meta http-equiv="content-type" content="text/html; charset=UTF-8">
5 - <title>Firefogg - Make Ogg Video in your Browser</title>
6 - <!-- <script type="text/javascript" src="../jsScriptLoader.php?class=mv_embed&urid=da&debug=true"></script> -->
7 - <script type="text/javascript" src="../mv_embed.js"></script>
8 -<style type="text/css" media="all">@import "http://www.firefogg.org/css/style.css";</style>
9 -<style type="text/css" media="all">
10 -.install{
11 -display:none;
12 -}
13 -input{
14 -font-size:150%;
15 -}
16 -</style>
17 -<script type="text/javascript">
18 -mwAddOnloadHook(function(){
19 - $j('#control_container').firefogg({
20 - 'encoder_interface' : false,
21 - 'encode_local' : true
22 - }, function(){
23 - $j('#loadFogg').hide();
24 - });
25 -});
26 -</script>
27 -</head><body>
28 -<div id="main">
29 - <h1><a href="http://www.firefogg.org/index.html"><img
30 -src="http://www.firefogg.org/png/firefogg.png" alt="Firefogg"></a><br>
31 -Make Ogg Video</h1>
32 -<br><br><br>
33 -<center>
34 - <div style="width:500px">
35 - <span id="loadFogg">Loading firefogg <blink>...</blink></span>
36 - <div style="float:left;height:400px" id="control_container"></div>
37 - <br><br>
38 - </div>
39 -</center>
40 -</body></html>
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/remote_metavid_ogg_flv.html
——@@ -1,43 +0,0 @@
2 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
3 -"http://www.w3.org/TR/html4/loose.dtd">
4 -<html>
5 -<head>
6 - <title>remote_metavid_ogg_flv_timed_text</title>
7 - <script type="text/javascript" src="../mv_embed.js"></script>
8 -</head>
9 -<body>
10 -<h3> Remote Metavid Embed with Timed Text over ROE xml (json encapuslated) </h3>
11 -
12 -<span id="default_attr">
13 -</span> <br />
14 -<br />
15 - <table border="1" cellpadding="6" width="600">
16 - <tr>
17 - <td valign="top"><video id="embed_vid"
18 -thumbnail="http://metavid.org/wiki/index.php?action=ajax&rs=mv_frame_server&stream_id=501&t=0:01:32&amp;size=400x300"
19 -roe="http://metavid.org/wiki/index.php?title=Special:MvExportStream&stream_name=House_proceeding_01-28-08&feed_format=roe&t=0:01:32/0:03:20"
20 -style="width:400px;height:300px"
21 -controls="true" embed_link="true" >
22 - <source type="video/x-flv" src="http://mvbox2.cse.ucsc.edu/mvFlvServer.php/house_proceeding_01-28-08.flv?t=0:01:32/0:03:20"></source>
23 - <source type="video/ogg" src="http://metavidstorage01.ucsc.edu/media/house_proceeding_01-28-08.ogg?t=0:01:32/0:03:20"></source>
24 -
25 -</video></td>
26 - <td valign="top"><b>Sample Embed 0</b><br />
27 - Sample Similar to <a href="http://metavid.org">metavid usage</a><br />
28 - &lt;-- code used: <br />
29 - <pre> &lt;video id=&quot;embed_vid&quot;
30 -thumbnail=&quot;http://metavid.org/wiki/index.php?action=ajax&amp;rs=mv_frame_server&amp;stream_id=501&amp;t=0:01:32&amp;amp;size=400x300&quot;
31 -
32 -roe=&quot;http://metavid.org/wiki/index.php?title=Special:MvExportStream&amp;stream_name=House_proceeding_01-28-08&amp;feed_format=roe&amp;t=0:01:32/0:03:20&quot;
33 -style=&quot;width:400px;height:300px&quot;
34 -controls=&quot;true&quot; embed_link=&quot;true&quot; &gt;
35 - &lt;source type=&quot;video/x-flv&quot; src=&quot;http://mvbox2.cse.ucsc.edu/mvFlvServer.php/house_proceeding_01-28-08.flv?t=0:01:32/0:03:20&quot;&gt;&lt;/source&gt;
36 -
37 - &lt;source type=&quot;video/ogg&quot; src=&quot;http://metavidstorage01.ucsc.edu/media/house_proceeding_01-28-08.ogg?t=0:01:32/0:03:20&quot;&gt;&lt;/source&gt;
38 -&lt;/video&gt;</pre>
39 - </td>
40 - </table>
41 - <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />&nbsp;
42 - </body>
43 -</html>
44 -
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/sample_timed_text.html
——@@ -1,48 +0,0 @@
2 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
3 -"http://www.w3.org/TR/html4/loose.dtd">
4 -<html>
5 -<head>
6 - <title>sample mv embed</title>
7 - <script type="text/javascript" src="../mv_embed.js?debug=true"></script>
8 -</head>
9 -<body>
10 -<h3> Mv_Embed Timed Text Examples:</h3>
11 -Click on the little lower right "CC" icon to expose the timed text
12 - <table border="1" cellpadding="6" width="950">
13 - <tr>
14 - <td valign="top" width="410">
15 -
16 - <video roe="http://metavid.org/w/index.php?title=Special:MvExportStream&stream_name=House_proceeding_07-18-06_00&t=1:23:16/1:23:44&feed_format=roe" ></video> </td>
17 - <td valign="top">
18 - Metavid based ROE file using CMML<br> <pre>&lt;video roe=&quot;http://metavid.org/w/index.php?title=Special:MvExportStream&amp;stream_name=House_proceeding_07-18-06_00&amp;t=1:23:16/1:23:44&amp;feed_format=roe&quot; &gt;&lt;/video&gt;</pre><iframe width="600" height="250" src="http://metavid.org/w/index.php?title=Special:MvExportStream&stream_name=House_proceeding_07-18-06_00&t=1:23:16/1:23:44&feed_format=roe" ></iframe> </td>
19 -
20 - </tr>
21 - <tr>
22 - <td valign="top" width="410">
23 - <video src="media/sample_fish.ogg" poster="media/sample_fish.jpg" duration="26">
24 - <text category="SUB" lang="en" type="text/x-srt" default="true"
25 - title="english SRT subtitles" src="media/sample_fish_text_en.srt">
26 - </text>
27 - <text category="SUB" lang="es" type="text/x-srt"
28 - title="spanish SRT subtitles" src="media/sample_fish_text_es.srt">
29 - </text>
30 - </video>
31 - </td>
32 -
33 - <td valign="top">
34 - <h4>SRT text tags with languages and categories (ogg only)</h4><br> <pre>&lt;video src=&quot;media/sample_fish.ogg&quot; poster=&quot;media/sample_fish.jpg&quot; duration=&quot;26&quot;&gt;
35 - &lt;text category=&quot;SUB&quot; lang=&quot;en&quot; type=&quot;text/x-srt&quot; default=&quot;true&quot;
36 -
37 - title=&quot;english SRT subtitles&quot; src=&quot;media/sample_fish_text_en.srt&quot;&gt;
38 - &lt;/text&gt;
39 - &lt;text category=&quot;SUB&quot; lang=&quot;es&quot; type=&quot;text/x-srt&quot;
40 -
41 - title=&quot;spanish SRT subtitles&quot; src=&quot;media/sample_fish_text_es.srt&quot;&gt;
42 - &lt;/text&gt;
43 -&lt;/video&gt;</pre> </td>
44 - </tr>
45 - </table>
46 -
47 -</body>
48 -</html>
49 -
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/sample_add_media_wizard.html
——@@ -1,46 +0,0 @@
2 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
3 -"http://www.w3.org/TR/html4/loose.dtd">
4 -<html>
5 -<head>
6 - <title>sample mv embed</title>
7 - <style type="text/css">
8 - body{
9 - font-size:80%;
10 - }
11 - img {
12 - border:medium none;
13 - }
14 - </style>
15 - <script type="text/javascript" src="../mv_embed.js?debug=true"></script>
16 - <script type="text/javascript">
17 - mwAddOnloadHook(function(){
18 - $j('#add_media_link').addMediaWiz( {
19 - 'profile':'html_edit',
20 - 'target_textbox': '#wpTextbox1',
21 - 'target_render_area':'#inline_append',
22 - 'import_url_mode':'remote_html_embed',
23 - //note selections in the textbox will take over the default query
24 - 'default_query': 'fish',
25 - //here we can setup the conten provider overides
26 - 'cpconfig': {},
27 -
28 - //the local wiki api url:
29 - 'local_wiki_api_url': 'none'
30 - });
31 - });
32 -
33 - </script>
34 -</head>
35 -<body>
36 -<h3> Sample Add Media Wizard </h3>
37 -
38 -<a id="add_media_link" href="#">Add Media</a><br>
39 -<table border="1" width="800">
40 -<tr>
41 -<td valign="top" width="50%" id="inline_append">Asset Output</td>
42 -<td valign="top" width="50%" >Html Output:<textarea id="wpTextbox1" cols="60" rows="6" id="code_append" name="wpTextbox1" tabindex="3"/></textarea></td>
43 -</tr>
44 -</table>
45 -</body>
46 -</html>
47 -
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/simple_smil_example.html
——@@ -1,34 +0,0 @@
2 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
3 -"http://www.w3.org/TR/html4/loose.dtd">
4 -<html>
5 -<head>
6 - <title>Simple SMIL example</title>
7 - <script type="text/javascript" src="../mv_embed.js"></script>
8 -</head>
9 -<body>
10 -<h3> Simple SMIL example</h3>
11 -
12 -<span id="default_attr">
13 -</span> <br />
14 -<br />
15 - <table border="1" cellpadding="6" width="600">
16 - <tr>
17 - <td valign="top"><playlist id="smil_pl" src="media/sample_smil.xml"></td>
18 -
19 - <td valign="top"><b>Sample Embed 8</b><br />
20 - <br><b>Crossfading Videos</b><br/>
21 - The first video fades up from green when it starts to play,
22 - and the second video fades down to green when it ends.
23 - When the first video stops and the second video starts,
24 - though, the two videos crossfade into each other<br><iframe width="500" height="200" src="sample_smil.xml">sample smil here</iframe><br />
25 - &lt;-- code used: <br />
26 - <pre> &lt;playlist id=&quot;smil_pl&quot; src=&quot;media/sample_smil.xml&quot;&gt;</pre>
27 -
28 - </td>
29 - </tr>
30 -
31 - </table>
32 - <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />&nbsp;
33 - </body>
34 -</html>
35 -
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/simple_video_tag.html
——@@ -1,26 +0,0 @@
2 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
3 -"http://www.w3.org/TR/html4/loose.dtd">
4 -<html>
5 -<head>
6 - <title>Simple Video Tag Usage</title>
7 - <script type="text/javascript" src="../jsScriptLoader.php?class=mv_embed&debug=true"></script>
8 -</head>
9 -<body>
10 -<h3> Simple Video Tag Usage </h3>
11 -once you include: mv_embed.js on any remote page you can then use the video tag like so:
12 -<span id="default_attr">
13 -</span> <br />
14 -<br />
15 - <table border="1" cellpadding="6" width="600">
16 - <tr>
17 - <td valign="top"><video duration="26" thumbnail="http://metavid.org/w/index.php?action=ajax&rs=mv_frame_server&stream_id=71&t=1:23:16&size=400x300" src="http://metavidstorage01.ucsc.edu/media/house_proceeding_07-18-06_00.ogg?t=1:23:16/1:23:44"></video></video></td>
18 - <td valign="top"><b>Sample Embed</b><br />
19 - Simple video Embed:
20 - <pre>&lt;video thumbnail="http://metavid.org/w/index.php?action=ajax&rs=mv_frame_server&stream_id=71&t=1:23:16&size=400x300"
21 -src="http://metavidstorage01.ucsc.edu/media/house_proceeding_07-18-06_00.ogg?t=1:23:16/1:23:44"&gt;&lt;/video&gt;</pre>
22 - </td>
23 - </table>
24 - <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />&nbsp;
25 - </body>
26 -</html>
27 -
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/SequencerPlayer_Seeking.html
——@@ -0,0 +1,78 @@
 2+<!doctype html>
 3+<html>
 4+<head>
 5+ <title>mv_embed Seeking Example</title>
 6+ <script type="text/javascript" src="../mv_embed.js"></script>
 7+ <style>
 8+ #render_box {
 9+ position:absolute;
 10+ width:400px;
 11+ height:300px;
 12+ }
 13+ #frame_overlay {
 14+ position:absolute;
 15+ width:400px;
 16+ height:300px;
 17+ top: 28px;
 18+ left: 9px;
 19+ }
 20+
 21+ </style>
 22+ <script>
 23+var pos = 0;
 24+var duration = 2;
 25+var step = 0.04;
 26+var render = false;
 27+
 28+function renderNext() {
 29+ $j('#pos').val(pos);
 30+ document.getElementById('render_box').setCurrentTime(pos, function(currentTime) {
 31+ return function() {
 32+ //ogg.addFrame('frame_overlay');
 33+ pos += step;
 34+ if(render && pos <= duration)
 35+ renderNext();
 36+ };
 37+ }(pos));
 38+}
 39+
 40+function startRender() {
 41+ //ogg = new Firefogg();
 42+ //ogg.initRender('{"videoQuality": 10, "framerate": 25, "width": 400, "height": 300}', 'sample_smil.ogv');
 43+ $j("#buttonStart").attr("disabled", true);
 44+ if(!render) {
 45+ //document.getElementById('render_box').play();
 46+ //document.getElementById('render_box').pause();
 47+ setTimeout(function() {
 48+ //duration = document.getElementById('render_box').getDuration();
 49+ render = true;
 50+ pos = 0;
 51+ renderNext();
 52+ }, 1000);
 53+ }
 54+}
 55+function stopRender() {
 56+ render = false;
 57+ $j("#buttonStart").attr("disabled", false);
 58+ $j("#buttonSop").attr("disabled", true);
 59+}
 60+function seek() {
 61+ var seekTo = $j('#pos').val();
 62+ document.getElementById('render_box').setCurrentTime(seekTo, function() { js_log('seeked'); });
 63+}
 64+ </script>
 65+</head>
 66+<body>
 67+<playlist id="render_box" src="media/sample_smil.xml" controls="false"></playlist>
 68+<div id="frame_overlay"></div>
 69+
 70+<div id="info" style="position: absolute; top:360px">
 71+ <button onclick="startRender()" id="buttonStart">Start</button>
 72+ <button onclick="stopRender()" id="buttonStart">Stop</button>
 73+ position: <input type="text" id="pos" value="6.6" />
 74+ <button onclick="seek()">seek</button>
 75+ <span id="status"></span><br>
 76+</div>
 77+</body>
 78+</html>
 79+
Property changes on: branches/new-upload/phase3/js2/mwEmbed/example_usage/SequencerPlayer_Seeking.html
___________________________________________________________________
Name: svn:mergeinfo
180 + /trunk/phase3/js2/mv_embed/example_usage/seeking_example.html:46619-47809
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Themable.html
——@@ -0,0 +1,27 @@
 2+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 3+"http://www.w3.org/TR/html4/loose.dtd">
 4+<html>
 5+<head>
 6+ <title>Sample Themed Player</title>
 7+ <script type="text/javascript" src="../mv_embed.js?debug=true"></script>
 8+</head>
 9+<script type="text/javascript">
 10+mwAddOnloadHook(function(){
 11+ $j('#doThemeRoller').click(function(){
 12+ if(window.jquitr){
 13+ jquitr.addThemeRoller();
 14+ } else{
 15+ loadExternalJs('http://jqueryui.com/themeroller/developertool/developertool.js.php');
 16+ }
 17+ }).html('<span class="ui-icon ui-icon-newwin"/>Run Theme Roller</span>');
 18+});
 19+</script>
 20+<body bgcolor="#FFF">
 21+<h3> Sample Themed Player:</h3>
 22+<a id="doThemeRoller" class="ui-icon_link ui-state-default ui-corner-all" href="#">loading theme editor<blink>...</blink></a><p><p>
 23+<video src="media/sample_fish.ogg" thumbnail="media/sample_fish.jpg" duration="26"></video>
 24+ </table>
 25+
 26+</body>
 27+</html>
 28+
Property changes on: branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Themable.html
___________________________________________________________________
Name: svn:mergeinfo
129 + /trunk/phase3/js2/mv_embed/example_usage/sample_themable_player.html:46619-47809
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Firefogg_Make_Simple.html
——@@ -0,0 +1,39 @@
 2+<!DOCTYPE HTML>
 3+<html><head>
 4+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 5+ <title>Firefogg - Make Ogg Video in your Browser</title>
 6+ <!-- <script type="text/javascript" src="../jsScriptLoader.php?class=mv_embed&urid=da&debug=true"></script> -->
 7+ <script type="text/javascript" src="../mv_embed.js"></script>
 8+<style type="text/css" media="all">@import "http://www.firefogg.org/css/style.css";</style>
 9+<style type="text/css" media="all">
 10+.install{
 11+display:none;
 12+}
 13+input{
 14+font-size:150%;
 15+}
 16+</style>
 17+<script type="text/javascript">
 18+mwAddOnloadHook(function(){
 19+ $j('#control_container').firefogg({
 20+ 'encoder_interface' : false,
 21+ 'encode_local' : true
 22+ }, function(){
 23+ $j('#loadFogg').hide();
 24+ });
 25+});
 26+</script>
 27+</head><body>
 28+<div id="main">
 29+ <h1><a href="http://www.firefogg.org/index.html"><img
 30+src="http://www.firefogg.org/png/firefogg.png" alt="Firefogg"></a><br>
 31+Make Ogg Video</h1>
 32+<br><br><br>
 33+<center>
 34+ <div style="width:500px">
 35+ <span id="loadFogg">Loading firefogg <blink>...</blink></span>
 36+ <div style="float:left;height:400px" id="control_container"></div>
 37+ <br><br>
 38+ </div>
 39+</center>
 40+</body></html>
Property changes on: branches/new-upload/phase3/js2/mwEmbed/example_usage/Firefogg_Make_Simple.html
___________________________________________________________________
Name: svn:mergeinfo
141 + /trunk/phase3/js2/mv_embed/example_usage/Make_Ogg.html:46619-47809
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Sequence_Editor.html
——@@ -0,0 +1,34 @@
 2+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 3+"http://www.w3.org/TR/html4/loose.dtd">
 4+<html>
 5+<head>
 6+ <title>Simple SMIL example</title>
 7+ <script type="text/javascript" src="../mv_embed.js"></script>
 8+</head>
 9+<body>
 10+<h3> Simple SMIL example</h3>
 11+
 12+<span id="default_attr">
 13+</span> <br />
 14+<br />
 15+ <table border="1" cellpadding="6" width="600">
 16+ <tr>
 17+ <td valign="top"><playlist id="smil_pl" src="media/sample_smil.xml"></td>
 18+
 19+ <td valign="top"><b>Sample Embed 8</b><br />
 20+ <br><b>Crossfading Videos</b><br/>
 21+ The first video fades up from green when it starts to play,
 22+ and the second video fades down to green when it ends.
 23+ When the first video stops and the second video starts,
 24+ though, the two videos crossfade into each other<br><iframe width="500" height="200" src="sample_smil.xml">sample smil here</iframe><br />
 25+ &lt;-- code used: <br />
 26+ <pre> &lt;playlist id=&quot;smil_pl&quot; src=&quot;media/sample_smil.xml&quot;&gt;</pre>
 27+
 28+ </td>
 29+ </tr>
 30+
 31+ </table>
 32+ <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />&nbsp;
 33+ </body>
 34+</html>
 35+
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/SequencerPlayer_Simple.html
——@@ -0,0 +1,34 @@
 2+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 3+"http://www.w3.org/TR/html4/loose.dtd">
 4+<html>
 5+<head>
 6+ <title>Simple SMIL example</title>
 7+ <script type="text/javascript" src="../mv_embed.js"></script>
 8+</head>
 9+<body>
 10+<h3> Simple SMIL example</h3>
 11+
 12+<span id="default_attr">
 13+</span> <br />
 14+<br />
 15+ <table border="1" cellpadding="6" width="600">
 16+ <tr>
 17+ <td valign="top"><playlist id="smil_pl" src="media/sample_smil.xml"></td>
 18+
 19+ <td valign="top"><b>Sample Embed 8</b><br />
 20+ <br><b>Crossfading Videos</b><br/>
 21+ The first video fades up from green when it starts to play,
 22+ and the second video fades down to green when it ends.
 23+ When the first video stops and the second video starts,
 24+ though, the two videos crossfade into each other<br><iframe width="500" height="200" src="sample_smil.xml">sample smil here</iframe><br />
 25+ &lt;-- code used: <br />
 26+ <pre> &lt;playlist id=&quot;smil_pl&quot; src=&quot;media/sample_smil.xml&quot;&gt;</pre>
 27+
 28+ </td>
 29+ </tr>
 30+
 31+ </table>
 32+ <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />&nbsp;
 33+ </body>
 34+</html>
 35+
Property changes on: branches/new-upload/phase3/js2/mwEmbed/example_usage/SequencerPlayer_Simple.html
___________________________________________________________________
Name: svn:mergeinfo
136 + /trunk/phase3/js2/mv_embed/example_usage/simple_smil_example.html:46619-47809
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Timed_Text.html
——@@ -0,0 +1,48 @@
 2+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 3+"http://www.w3.org/TR/html4/loose.dtd">
 4+<html>
 5+<head>
 6+ <title>sample mv embed</title>
 7+ <script type="text/javascript" src="../mv_embed.js?debug=true"></script>
 8+</head>
 9+<body>
 10+<h3> Mv_Embed Timed Text Examples:</h3>
 11+Click on the little lower right "CC" icon to expose the timed text
 12+ <table border="1" cellpadding="6" width="950">
 13+ <tr>
 14+ <td valign="top" width="410">
 15+
 16+ <video roe="http://metavid.org/w/index.php?title=Special:MvExportStream&stream_name=House_proceeding_07-18-06_00&t=1:23:16/1:23:44&feed_format=roe" ></video> </td>
 17+ <td valign="top">
 18+ Metavid based ROE file using CMML<br> <pre>&lt;video roe=&quot;http://metavid.org/w/index.php?title=Special:MvExportStream&amp;stream_name=House_proceeding_07-18-06_00&amp;t=1:23:16/1:23:44&amp;feed_format=roe&quot; &gt;&lt;/video&gt;</pre><iframe width="600" height="250" src="http://metavid.org/w/index.php?title=Special:MvExportStream&stream_name=House_proceeding_07-18-06_00&t=1:23:16/1:23:44&feed_format=roe" ></iframe> </td>
 19+
 20+ </tr>
 21+ <tr>
 22+ <td valign="top" width="410">
 23+ <video src="media/sample_fish.ogg" poster="media/sample_fish.jpg" duration="26">
 24+ <text category="SUB" lang="en" type="text/x-srt" default="true"
 25+ title="english SRT subtitles" src="media/sample_fish_text_en.srt">
 26+ </text>
 27+ <text category="SUB" lang="es" type="text/x-srt"
 28+ title="spanish SRT subtitles" src="media/sample_fish_text_es.srt">
 29+ </text>
 30+ </video>
 31+ </td>
 32+
 33+ <td valign="top">
 34+ <h4>SRT text tags with languages and categories (ogg only)</h4><br> <pre>&lt;video src=&quot;media/sample_fish.ogg&quot; poster=&quot;media/sample_fish.jpg&quot; duration=&quot;26&quot;&gt;
 35+ &lt;text category=&quot;SUB&quot; lang=&quot;en&quot; type=&quot;text/x-srt&quot; default=&quot;true&quot;
 36+
 37+ title=&quot;english SRT subtitles&quot; src=&quot;media/sample_fish_text_en.srt&quot;&gt;
 38+ &lt;/text&gt;
 39+ &lt;text category=&quot;SUB&quot; lang=&quot;es&quot; type=&quot;text/x-srt&quot;
 40+
 41+ title=&quot;spanish SRT subtitles&quot; src=&quot;media/sample_fish_text_es.srt&quot;&gt;
 42+ &lt;/text&gt;
 43+&lt;/video&gt;</pre> </td>
 44+ </tr>
 45+ </table>
 46+
 47+</body>
 48+</html>
 49+
Property changes on: branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Timed_Text.html
___________________________________________________________________
Name: svn:mergeinfo
150 + /trunk/phase3/js2/mv_embed/example_usage/sample_timed_text.html:46619-47809
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Remote_Content_ogg_flv.html
——@@ -0,0 +1,43 @@
 2+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 3+"http://www.w3.org/TR/html4/loose.dtd">
 4+<html>
 5+<head>
 6+ <title>remote_metavid_ogg_flv_timed_text</title>
 7+ <script type="text/javascript" src="../mv_embed.js"></script>
 8+</head>
 9+<body>
 10+<h3> Remote Metavid Embed with Timed Text over ROE xml (json encapuslated) </h3>
 11+
 12+<span id="default_attr">
 13+</span> <br />
 14+<br />
 15+ <table border="1" cellpadding="6" width="600">
 16+ <tr>
 17+ <td valign="top"><video id="embed_vid"
 18+thumbnail="http://metavid.org/wiki/index.php?action=ajax&rs=mv_frame_server&stream_id=501&t=0:01:32&amp;size=400x300"
 19+roe="http://metavid.org/wiki/index.php?title=Special:MvExportStream&stream_name=House_proceeding_01-28-08&feed_format=roe&t=0:01:32/0:03:20"
 20+style="width:400px;height:300px"
 21+controls="true" embed_link="true" >
 22+ <source type="video/x-flv" src="http://mvbox2.cse.ucsc.edu/mvFlvServer.php/house_proceeding_01-28-08.flv?t=0:01:32/0:03:20"></source>
 23+ <source type="video/ogg" src="http://metavidstorage01.ucsc.edu/media/house_proceeding_01-28-08.ogg?t=0:01:32/0:03:20"></source>
 24+
 25+</video></td>
 26+ <td valign="top"><b>Sample Embed 0</b><br />
 27+ Sample Similar to <a href="http://metavid.org">metavid usage</a><br />
 28+ &lt;-- code used: <br />
 29+ <pre> &lt;video id=&quot;embed_vid&quot;
 30+thumbnail=&quot;http://metavid.org/wiki/index.php?action=ajax&amp;rs=mv_frame_server&amp;stream_id=501&amp;t=0:01:32&amp;amp;size=400x300&quot;
 31+
 32+roe=&quot;http://metavid.org/wiki/index.php?title=Special:MvExportStream&amp;stream_name=House_proceeding_01-28-08&amp;feed_format=roe&amp;t=0:01:32/0:03:20&quot;
 33+style=&quot;width:400px;height:300px&quot;
 34+controls=&quot;true&quot; embed_link=&quot;true&quot; &gt;
 35+ &lt;source type=&quot;video/x-flv&quot; src=&quot;http://mvbox2.cse.ucsc.edu/mvFlvServer.php/house_proceeding_01-28-08.flv?t=0:01:32/0:03:20&quot;&gt;&lt;/source&gt;
 36+
 37+ &lt;source type=&quot;video/ogg&quot; src=&quot;http://metavidstorage01.ucsc.edu/media/house_proceeding_01-28-08.ogg?t=0:01:32/0:03:20&quot;&gt;&lt;/source&gt;
 38+&lt;/video&gt;</pre>
 39+ </td>
 40+ </table>
 41+ <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />&nbsp;
 42+ </body>
 43+</html>
 44+
Property changes on: branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Remote_Content_ogg_flv.html
___________________________________________________________________
Name: svn:mergeinfo
145 + /trunk/phase3/js2/mv_embed/example_usage/remote_metavid_ogg_flv.html:46619-47809
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html
——@@ -0,0 +1,26 @@
 2+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 3+"http://www.w3.org/TR/html4/loose.dtd">
 4+<html>
 5+<head>
 6+ <title>Simple Video Tag Usage</title>
 7+ <script type="text/javascript" src="../jsScriptLoader.php?class=mv_embed&debug=true"></script>
 8+</head>
 9+<body>
 10+<h3> Simple Video Tag Usage </h3>
 11+once you include: mv_embed.js on any remote page you can then use the video tag like so:
 12+<span id="default_attr">
 13+</span> <br />
 14+<br />
 15+ <table border="1" cellpadding="6" width="600">
 16+ <tr>
 17+ <td valign="top"><video duration="26" thumbnail="http://metavid.org/w/index.php?action=ajax&rs=mv_frame_server&stream_id=71&t=1:23:16&size=400x300" src="http://metavidstorage01.ucsc.edu/media/house_proceeding_07-18-06_00.ogg?t=1:23:16/1:23:44"></video></video></td>
 18+ <td valign="top"><b>Sample Embed</b><br />
 19+ Simple video Embed:
 20+ <pre>&lt;video thumbnail="http://metavid.org/w/index.php?action=ajax&rs=mv_frame_server&stream_id=71&t=1:23:16&size=400x300"
 21+src="http://metavidstorage01.ucsc.edu/media/house_proceeding_07-18-06_00.ogg?t=1:23:16/1:23:44"&gt;&lt;/video&gt;</pre>
 22+ </td>
 23+ </table>
 24+ <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />&nbsp;
 25+ </body>
 26+</html>
 27+
Property changes on: branches/new-upload/phase3/js2/mwEmbed/example_usage/Player_Simple_Video_Tag.html
___________________________________________________________________
Name: svn:mergeinfo
128 + /trunk/phase3/js2/mv_embed/example_usage/simple_video_tag.html:46619-47809
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Add_Media_Wizard.html
——@@ -0,0 +1,46 @@
 2+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 3+"http://www.w3.org/TR/html4/loose.dtd">
 4+<html>
 5+<head>
 6+ <title>sample mv embed</title>
 7+ <style type="text/css">
 8+ body{
 9+ font-size:80%;
 10+ }
 11+ img {
 12+ border:medium none;
 13+ }
 14+ </style>
 15+ <script type="text/javascript" src="../mv_embed.js?debug=true"></script>
 16+ <script type="text/javascript">
 17+ mwAddOnloadHook(function(){
 18+ $j('#add_media_link').addMediaWiz( {
 19+ 'profile':'html_edit',
 20+ 'target_textbox': '#wpTextbox1',
 21+ 'target_render_area':'#inline_append',
 22+ 'import_url_mode':'remote_html_embed',
 23+ //note selections in the textbox will take over the default query
 24+ 'default_query': 'fish',
 25+ //here we can setup the conten provider overides
 26+ 'cpconfig': {},
 27+
 28+ //the local wiki api url:
 29+ 'local_wiki_api_url': 'none'
 30+ });
 31+ });
 32+
 33+ </script>
 34+</head>
 35+<body>
 36+<h3> Sample Add Media Wizard </h3>
 37+
 38+<a id="add_media_link" href="#">Add Media</a><br>
 39+<table border="1" width="800">
 40+<tr>
 41+<td valign="top" width="50%" id="inline_append">Asset Output</td>
 42+<td valign="top" width="50%" >Html Output:<textarea id="wpTextbox1" cols="60" rows="6" id="code_append" name="wpTextbox1" tabindex="3"/></textarea></td>
 43+</tr>
 44+</table>
 45+</body>
 46+</html>
 47+
Property changes on: branches/new-upload/phase3/js2/mwEmbed/example_usage/Add_Media_Wizard.html
___________________________________________________________________
Name: svn:mergeinfo
148 + /trunk/phase3/js2/mv_embed/example_usage/sample_add_media_wizard.html:46619-47809
Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Firefogg_Make_Advanced.html
——@@ -0,0 +1,45 @@
 2+<!DOCTYPE HTML>
 3+<html><head>
 4+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 5+ <title>Firefogg - Make Ogg Video in your Browser</title>
 6+ <!-- <script type="text/javascript" src="../jsScriptLoader.php?class=mv_embed"></script> -->
 7+ <script type="text/javascript" src="../jsScriptLoader.php?class=mv_embed"></script>
 8+<style type="text/css" media="all">@import "http://www.firefogg.org/css/style.css";</style>
 9+<style type="text/css" media="all">
 10+.install{
 11+display:none;
 12+}
 13+</style>
 14+<script type="text/javascript">
 15+mwAddOnloadHook(function(){
 16+ $j('#firefogg_app').firefogg({
 17+ 'encoder_interface' : true,
 18+ 'encode_local' : true
 19+ },function(){
 20+ $j('#loadFogg').hide();
 21+ });
 22+ $j('#doThemeRoller').click(function(){
 23+ if(window.jquitr){
 24+ jquitr.addThemeRoller();
 25+ } else{
 26+ loadExternalJs('http://jqueryui.com/themeroller/developertool/developertool.js.php');
 27+ }
 28+ }).html('custom themes');
 29+});
 30+</script>
 31+</head><body>
 32+<div id="main">
 33+ <h1><a href="http://www.firefogg.org/index.html"><img
 34+src="http://www.firefogg.org/png/firefogg.png" alt="Firefogg"></a><br>
 35+Make Ogg Video</h1>
 36+<br>
 37+ <br>
 38+ <div style="margin-right:auto;margin-left:auto;width:500px;" id="loadFogg">Loading firefogg<blink>...</blink></div>
 39+ <div style="margin-right:auto;margin-left:auto;width:500px;height:250px" id="firefogg_app"></div>
 40+
 41+ <div style="height:250px"></div>
 42+ <center><span style="font:size:80%">Built using <a href="http://firefogg.org">firefogg</a>, <a href="http://www.mediawiki.org/wiki/Media_Projects_Overview#MwEmbed">MwEmbed</a> and <a href="http://jqueryui.com/">jquery.ui</a>. Supports
 43+ <a href="#" id="doThemeRoller">...</a>
 44+ </span>
 45+ </center>
 46+</body></html>
Property changes on: branches/new-upload/phase3/js2/mwEmbed/example_usage/Firefogg_Make_Advanced.html
___________________________________________________________________
Name: svn:mergeinfo
147 + /trunk/phase3/js2/mv_embed/example_usage/Make_Ogg_Advanced.html:46619-47809
Index: branches/new-upload/phase3/js2/mwEmbed/libSequencer/mvPlayList.js
——@@ -381,10 +381,8 @@
382382 //add the playlist controls:
383383 $j('#dc_'+plObj.id).append(
384384 '<div class="videoPlayer" style="position:absolute;top:'+(plObj.height+plObj.pl_layout.title_bar_height+4)+'px">' +
385 - '<div id="mv_embedded_controls_'+plObj.id+'" ' +
386 - 'style="postion:relative;top:'+(plObj.height+plObj.pl_layout.title_bar_height)+'px;' +
387 - 'width:' + ( plObj.width + 2 ) + 'px" ' +
388 - 'class="controls">' +
 385+ '<div id="mv_embedded_controls_'+plObj.id+'" class="ui-widget ui-corner-bottom ui-state-default controls" '+
 386+ 'style="width:' + plObj.width + 'px" >' +
389387 plObj.getControlsHTML() +
390388 '</div>'+
391389 '</div>'

Status & tagging log