Skip to content
This repository has been archived by the owner on Jun 29, 2018. It is now read-only.

Commit

Permalink
Merge branch 'rework2' of github.com:ScottDowne/popcorn-js into rework
Browse files Browse the repository at this point in the history 
Conflicts:
	demos/semantic_video/index.html
  • Loading branch information
@ScottDowne
ScottDowne committed Sep 1, 2010
2 parents fe795ae + e812d5b commit 6245f7a
Show file tree
Hide file tree
Showing 3 changed files with 156 additions and 180 deletions.
69 changes: 46 additions & 23 deletions demos/semantic_video/index.html
View file
Expand Up @@ -114,29 +114,52 @@
</div>

<video width="530px" height="299px" data-timeline-sources="xml/webMadeMovies.xml" controls>
<source src="http://webmademovies.etherworks.ca/popcorndemo/wmmjuly6.ogv" type='video/ogg; codecs="theora, vorbis"'>
<source src="http://webmademovies.etherworks.ca/popcorndemo/wmmjuly6.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'>
<source src="http://webmademovies.etherworks.ca/popcorndemo/wmmjuly6.ogv" type='video/ogg; codecs="theora, vorbis"'>
<source src="http://webmademovies.etherworks.ca/popcorndemo/wmmjuly6.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"'>
</video>

<!-- Start Video Info -->
<div class="video-info">
<!-- Start Choose Language -->
<div class="choose-language">
<h2>Choose your language</h2>
<select id="language">
<option val="zh">Chinese</option>
<option val="en" selected="selected">English</option>
<option val="fr">French</option>
<option val="de">German</option>
<option val="it">Italian</option>
<option val="ja">Japanese</option>
<option val="ko">Korean</option>
<option val="fa">Persian</option>
<option val="pl">Polish</option>
<option val="pt">Portuguese</option>
<option val="es">Spanish</option>
</select>
<div id="credit">
<div id="overlaydiv" style="position:absolute;top:1px;left:1px"></div>
<script>
overlayDiv = document.getElementById("overlaydiv");
var createImage = function(src) {
var image = document.createElement('img');
image.setAttribute('src', src);
image.setAttribute('style', "display:none");
overlayDiv.appendChild(image);
return image;
};
Popcorn.VideoManager.prototype.loaded = function() {
for (var i in this.commandObjects) {
if (this.commandObjects[i].name === 'flickr' || this.commandObjects[i].name === 'footnote' || this.commandObjects[i].name === 'location' || this.commandObjects[i].name === 'twitter' || this.commandObjects[i].name === 'wiki') {
this.commandObjects[i].extension.image = createImage("images/overlay/" + this.commandObjects[i].name + ".png");
this.commandObjects[i].extension.onIn = function() {
this.image.setAttribute('style', "display:inline");
};
this.commandObjects[i].extension.onOut = function() {
this.image.setAttribute('style', "display:none");
};
}
}
};
</script>
<!-- Start Video Info -->
<div class="video-info">
<!-- Start Choose Language -->
<div class="choose-language">
<h2>Choose your language</h2>
<select id="language">
<option value="zh">Chinese</option>
<option value="en" selected="selected">English</option>
<option value="fr">French</option>
<option value="de">German</option>
<option value="it">Italian</option>
<option value="ja">Japanese</option>
<option value="ko">Korean</option>
<option value="fa">Persian</option>
<option value="pl">Polish</option>
<option value="pt">Portuguese</option>
<option value="es">Spanish</option>
</select>
<div id="credit">
with help from
<br />
<a href="http://google.com/translate">Google Translate</a> and <a href="http://jquery.com">
Expand Down Expand Up @@ -267,4 +290,4 @@ <h1>Info about this page</h1>

</body>
</html>


8 changes: 4 additions & 4 deletions demos/semantic_video/xml/webMadeMovies.xml
View file
Expand Up @@ -90,9 +90,9 @@
<footnote in="00:00:00" out="00:15:00" target="footnotediv">This video made exclusively for drumbeat.org </footnote>
<videotag target="inthisvideo" in="00:00:05:02" out="00:00:10:07">Steve Song</videotag>
<attribution in="00:00:05:02" out="00:00:10:07" target="container5" resourceid="villagetelcoattrib"></attribution>
<twitter in="00:00:05:02" out="00:00:10:07" title="Steve Song" source="from:stevesong" target="personaltwitter" width="238" height="120" overlay="images/overlay/twitter.png" />
<wiki in="00:00:05:02" out="00:00:10:07" resourceid="villagetelco" numberOfWords="200" target="wikidiv" overlay="images/overlay/wiki.png"/>
<flickr in="00:00:05:02" out="00:00:10:07" target="personalflickr" userid="78868639@N00" numberofimages="8" padding="4px" overlay="images/overlay/flickr.png"/>
<twitter in="00:00:05:02" out="00:00:10:07" title="Steve Song" source="from:stevesong" target="personaltwitter" width="238" height="120"/>
<wiki in="00:00:05:02" out="00:00:10:07" resourceid="villagetelco" numberOfWords="200" target="wikidiv"/>
<flickr in="00:00:05:02" out="00:00:10:07" target="personalflickr" userid="78868639@N00" numberofimages="8" padding="4px"/>
<googlenews in="00:00:05:02" out="00:00:10:07" target="googlenewsdiv" topic="Village Telco"/>

<twitter in="00:00:10:07" out="00:00:18:04" title="Oil Spill" source="#oilspill" target="twitter" width="238" height="120"/>
Expand Down Expand Up @@ -193,7 +193,7 @@
<location resourceid="montrealwiki" in="00:04:19:06" out="00:04:24:01" lat="45.5089" long="-73.5542 " target="container2" zoom="8"/>
</map>

<subtitles>
<subtitles languagesrc="language" accessibilitysrc="accessibility">
<subtitles language="en" align="center">
<subtitle in="00:00:00:03" out="00:00:01:06">All right let's take a look and show me some</subtitle>
<subtitle in="00:00:01:06" out="00:00:03:00">of the neat things you can do on the Internet</subtitle>
Expand Down

0 comments on commit 6245f7a

Please sign in to comment.