Skip to content

Commit

Permalink
Popcorn.js v1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher De Cairos committed Nov 2, 2011
2 parents ce66d47 + 7dda833 commit bd50431
Show file tree
Hide file tree
Showing 66 changed files with 3,047 additions and 3,048 deletions.
1 change: 1 addition & 0 deletions Makefile
Expand Up @@ -81,6 +81,7 @@ MODULES_UNIT := $(shell find $(MODULES_DIR) -name 'popcorn.*.unit.js' -print)
# popcorn + plugins
POPCORN_COMPLETE_LIST := --js ${POPCORN_SRC} \
$(shell for js in ${MODULES_SRC} ; do echo --js $$js ; done) \
$(shell for js in ${EFFECTS_SRC} ; do echo --js $$js ; done) \
$(shell for js in ${PLUGINS_SRC} ; do echo --js $$js ; done) \
$(shell for js in ${PARSERS_SRC} ; do echo --js $$js ; done) \
$(shell for js in ${PLAYERS_SRC} ; do echo --js $$js ; done)
Expand Down
7 changes: 1 addition & 6 deletions demos/semantic_video/index.html
Expand Up @@ -11,12 +11,12 @@
<script src="../../plugins/footnote/popcorn.footnote.js"></script>
<script src="../../plugins/twitter/popcorn.twitter.js"></script>
<script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
<script src="../../plugins/googlenews/popcorn.googlenews.js"></script>
<script src="../../plugins/tagthisperson/popcorn.tagthisperson.js"></script>
<script src="../../plugins/wikipedia/popcorn.wikipedia.js"></script>
<script src="../../plugins/flickr/popcorn.flickr.js"></script>
<script src="../../plugins/attribution/popcorn.attribution.js"></script>
<script src="../../plugins/lastfm/popcorn.lastfm.js"></script>
<script src="../../modules/timeline-sources/popcorn.timeline-sources.js"></script>
<script src="popcorn.applyclass.js"></script>

<script src="../../parsers/parserXML/popcorn.parserXML.js"></script>
Expand Down Expand Up @@ -214,11 +214,6 @@ <h3><img src="images/logo_twitter.png" alt="Twitter" width="80" height="19" /></
<h3><img src="images/logo_wiki.png" alt="Wikipedia" width="92" height="13" /></h3>
<a href="#" class="collapse"><span>Collapse</span></a>
<div class="content" id="wikidiv"><div class="overlay"></div><div class="inactive"></div></div>
</section>
<section>
<h3><img src="images/logo_google_news.png" alt="Google News" width="74" height="33" />
</h3>
<div id="googlenewsdiv"><div class="overlay"></div><div class="inactive"></div></div>
</section>
<section>
<h3><img src="images/logo_lastfm.png" alt="Lastfm" width="80" height="24" /></h3>
Expand Down
9 changes: 0 additions & 9 deletions demos/semantic_video/xml/webMadeMovies.xml
Expand Up @@ -93,28 +93,23 @@
<twitter in="00:00:05:02" out="00:00:10:07" title="Steve Song" src="@stevesong" target="personaltwitter" width="238" height="120"/>
<wikipedia in="00:00:05:02" out="00:00:10:07" resourceid="villagetelco" numberofwords="200" lang="en" 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" src="#oilspill" target="twitter" width="238" height="120"/>
<googlenews in="00:00:10:07" out="00:00:18:04" target="googlenewsdiv" topic="Oil Spill"/>
<attribution in="00:00:10:07" out="00:00:18:04" target="container5">Grassroots Mapping, Tungsten Monkey</attribution>

<tagthisperson target="inthisvideo" in="00:00:18:04" out="00:00:25:02" person="Keyboard Cat"/>
<twitter in="00:00:18:04" out="00:00:25:02" title="Keyboard Cat" src="#keyboardcat" target="twitter" width="238" height="120"/>
<attribution in="00:00:18:04" out="00:00:25:02" target="container5">KeyBoard Cat, Charlie Schmidt</attribution>
<googlenews in="00:00:18:04" out="00:00:25:02" target="googlenewsdiv" topic="Keyboard Cat"/>

<tagthisperson target="inthisvideo" in="00:00:28:09" out="00:00:29:07" person="Jeffrey Warren" />
<attribution in="00:00:28:09" out="00:00:29:07" target="container5">Grassroots Mapping, Tungsten Monkey</attribution>
<tagthisperson target="inthisvideo" in="00:00:29:08" out="00:00:31:00" person="Village Telco Guy" />

<wikipedia in="00:00:32:00" out="00:00:41:00" resourceid="theinternet" numberofwords="200" target="wikidiv"/>
<googlenews in="00:00:32:00" out="00:00:41:00" target="googlenewsdiv" topic="the internet"/>

<tagthisperson target="inthisvideo" in="00:00:41:00" out="00:01:07:09" person="Jeffrey Warren" />
<flickr in="00:00:41:00" out="00:01:07:09" target="personalflickr" userid="35034346917@N01" numberofimages="8" padding="4px"/>
<twitter in="00:00:41:00" out="00:01:07:09" title="Oil Spill" src="#oilspill" target="twitter" width="238" height="120"/>
<googlenews in="00:00:41:00" out="00:01:07:09" target="googlenewsdiv" topic="Oil Spill"/>
<googlemap resourceid="grandislewiki" in="00:00:41:00" out="00:01:07:09" lat="29.2720" lng="-90.0233 " target="container2" zoom="8"/>
<wikipedia in="00:00:41:00" out="00:01:07:09" resourceid="oilspill" numberofwords="200" target="wikidiv"/>
<footnote in="00:00:41:00" out="00:01:07:09" target="footnotediv">Learn more about Grass Roots mapping at www.grassrootsmapping.org</footnote>
Expand Down Expand Up @@ -153,12 +148,8 @@
<wikipedia in="00:02:57:01" out="00:03:03:00" resourceid="timbernerslee" numberofwords="200" target="wikidiv"/>
<twitter in="00:02:57:01" out="00:03:03:00" title="Tim Berners-Lee" src="@timberners_lee" target="twitter" width="238" height="120"/>

<googlenews in="00:02:57:01" out="00:03:03:00" target="googlenewsdiv" topic="Tim Berners-Lee"/>

<wikipedia in="00:03:03:01" out="00:03:28:00" resourceid="worldwideweb" numberofwords="200" target="wikidiv"/>
<googlenews in="00:03:03:01" out="00:03:28:00" target="googlenewsdiv" topic="World Wide Web"/>

<googlenews in="00:03:28:00" out="00:03:32:00" target="googlenewsdiv" topic="Wikipedia"/>
<wikipedia in="00:03:28:01" out="00:03:32:00" resourceid="wikipedia" numberofwords="200" target="wikidiv"/>

<wikipedia in="00:03:36:00" out="00:03:43:00" resourceid="openstandards" numberofwords="200" target="wikidiv"/>
Expand Down
8 changes: 4 additions & 4 deletions demos/twittervideo/twitterVideo.html
Expand Up @@ -43,11 +43,11 @@
// and displaying the video accordingly, displays error message if the
// video type is incompatable
if( document.getElementById( 'vidUrl' ).value.search( "youtube" ) != -1 ){
popcorn = Popcorn( Popcorn.youtube( 'video', document.getElementById( 'vidUrl' ).value ) );
popcorn = Popcorn.youtube( '#video', document.getElementById( 'vidUrl' ).value );
ok = true;
}
else if( document.getElementById( 'vidUrl' ).value.search( "vimeo" ) != -1 ){
popcorn = Popcorn( Popcorn.vimeo( 'video', document.getElementById( 'vidUrl' ).value ) );
popcorn = Popcorn.vimeo( '#video', document.getElementById( 'vidUrl' ).value );
ok = true;
}
else if( document.getElementById( 'vidUrl' ).value.search( "ogv" ) != -1 ){
Expand Down Expand Up @@ -84,7 +84,7 @@

if(ok){
// Add twitter widget with associated parameters
popcorn = popcorn
popcorn
.twitter({
start: 0, // seconds
end: 45, // seconds
Expand All @@ -107,7 +107,7 @@ <h3>Twitter Hashtag video demo</h3>
<p>Twitter Hashtag:</p>
<input id="hashtag" size="20" value="#seneca"/>
<button class="start" id="srtBtn">Play</button><br />
<div id="video" width="360" height="300" ></div><br />
<div id="video" style="width: 360px; height: 300px;" ></div><br />
<div id="twitterdiv" style="position:relative;float:left;width:400px;height:600px"></div>
</div>
</body>
Expand Down
Expand Up @@ -38,6 +38,6 @@ <h2 id="qunit-userAgent"></h2>

<p>Your user agent does not support the HTML5 Video element.</p>

</video> 
</video>
</body>
</html>
88 changes: 44 additions & 44 deletions parsers/parserJSON/popcorn.parserJSON.html
@@ -1,47 +1,47 @@
<!DOCTYPE html>
<html>
<head>
<title>Popcorn 0.3 JSON parser Plug-in Demo</title>
<script src="../../popcorn.js"></script>
<script src="../../test/jquery.js"></script>
<script src="../../plugins/webpage/popcorn.webpage.js"></script>
<script src="../../plugins/footnote/popcorn.footnote.js"></script>
<script src="../../plugins/googlemap/popcorn.googlemap.js"></script>
<script src="../../parsers/parserJSON/popcorn.parserJSON.js"></script>

</head>
<body>
<h1 id="qunit-header">Popcorn 0.3 JSON parser Plug-in Demo</h1>
<p></p>
<div>
<video id='video' data-timeline-sources="data/data.json"
controls
width= '250px'
poster="../../test/poster.png">

<source id='mp4'
src="../../test/trailer.mp4"
type='video/mp4; codecs="avc1, mp4a"'>

<source id='ogv'
src="../../test/trailer.ogv"
type='video/ogg; codecs="theora, vorbis"'>

<p>Your user agent does not support the HTML5 Video element.</p>

</video>
</div>
<style>
.displays {
width: 300px;
height: 300px;
}
</style>
<div class="displays" id="iframe-container"></div>
<div class="displays" id="map-container"></div>
<div class="displays" id="footnote-container"></div>

</body>
<head>
<title>Popcorn 1.0 JSON parser Plug-in Demo</title>

<script src="../../popcorn.js"></script>
<script src="../../modules/timeline-sources/popcorn.timeline-sources.js"></script>
<script src="../../plugins/webpage/popcorn.webpage.js"></script>
<script src="../../plugins/footnote/popcorn.footnote.js"></script>
<script src="../../plugins/googlemap/popcorn.googlemap.js"></script>
<script src="../../parsers/parserJSON/popcorn.parserJSON.js"></script>

</head>
<body>
<h1 id="qunit-header">Popcorn 1.0 JSON parser Plug-in Demo</h1>
<p></p>
<div>
<video id="video" data-timeline-sources="data/data.json"
controls
width= "250px"
poster="../../test/poster.png">

<source id="mp4"
src="../../test/trailer.mp4"
type='video/mp4; codecs="avc1, mp4a"'>

<source id="ogv"
src="../../test/trailer.ogv"
type='video/ogg; codecs="theora, vorbis"'>

<p>Your user agent does not support the HTML5 Video element.</p>

</video>
</div>

<style>
.displays {
width: 300px;
height: 300px;
}
</style>
<div class="displays" id="iframe-container"></div>
<div class="displays" id="map-container"></div>
<div class="displays" id="footnote-container"></div>

</body>
</html>
2 changes: 1 addition & 1 deletion parsers/parserJSON/popcorn.parserJSON.unit.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Popcorn 0.3 JSON parser Plug-in Tes</title>
<title>Popcorn JSON parser Plug-in Test</title>
<link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
<script src="../../test/qunit/qunit.js"></script>
<!--
Expand Down
90 changes: 45 additions & 45 deletions parsers/parserSBV/popcorn.parserSBV.html
@@ -1,48 +1,48 @@
<!DOCTYPE html>
<html>
<head>
<title>Popcorn 0.3 SBV parser Plug-in Demo</title>
<script src="../../popcorn.js"></script>
<script src="../../test/jquery.js"></script>
<script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
<script src="popcorn.parserSBV.js"></script>

<script>
document.addEventListener( 'DOMContentLoaded', function () {
var p = Popcorn( '#video' )
.volume( 0 )
.play();
}, false);
</script>
</head>
<body>
<h1 id="qunit-header">Popcorn 0.3 SBV parser Plug-in Demo</h1>
<p>From 2.4 to 7.2 seconds, "Senator, we're making our final approach into Coruscant." is shown
<br />From 9.712 to 13.399 seconds, "Very good, Lieutenant." is shown
<br />From 15.042 to 18.042 seconds, "It's a trap!" is shown</p>
<div>
<div>
<video id='video'
controls
width= '250px'
data-timeline-sources="data/data.sbv"
poster="../../test/poster.png">

<source id='mp4'
src="../../test/trailer.mp4"
type='video/mp4; codecs="avc1, mp4a"'>

<source id='ogv'
src="../../test/trailer.ogv"
type='video/ogg; codecs="theora, vorbis"'>

<p>Your user agent does not support the HTML5 Video element.</p>

</video>
</div>
<h4>Subtitle Source<h4>
<iframe id="srcDisplay" src="data/data.sbv"></iframe>
</body>
<head>
<title>Popcorn 1.0 SBV parser Plug-in Demo</title>

<script src="../../popcorn.js"></script>
<script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
<script src="popcorn.parserSBV.js"></script>

<script>
document.addEventListener( "DOMContentLoaded", function () {
var p = Popcorn( "#video" )
.parseSBV( "data/data.sbv" )
.volume( 0 )
.play();
}, false);
</script>
</head>
<body>
<h1 id="qunit-header">Popcorn 1.0 SBV parser Plug-in Demo</h1>

<p>From 2.4 to 7.2 seconds, "Senator, we're making our final approach into Coruscant." is shown
<br />From 9.712 to 13.399 seconds, "Very good, Lieutenant." is shown
<br />From 15.042 to 18.042 seconds, "It's a trap!" is shown</p>

<div>
<video id="video"
controls
width= "250px"
poster="../../test/poster.png">

<source id="mp4"
src="../../test/trailer.mp4"
type='video/mp4; codecs="avc1, mp4a"'>

<source id="ogv"
src="../../test/trailer.ogv"
type='video/ogg; codecs="theora, vorbis"'>

<p>Your user agent does not support the HTML5 Video element.</p>

</video>
</div>

<h4>Subtitle Source<h4>
<iframe id="srcDisplay" src="data/data.sbv"></iframe>
</body>
</html>
22 changes: 11 additions & 11 deletions parsers/parserSBV/popcorn.parserSBV.unit.html
@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<title>Popcorn 0.3 SBV parser Plug-in Test</title>
<title>Popcorn SBV parser Plug-in Test</title>
<link rel="stylesheet" href="../../test/qunit/qunit.css" type="text/css" media="screen">
<script src="../../test/qunit/qunit.js"></script>
<!--
do not move - this must be called immediately prior to
<!--
do not move - this must be called immediately prior to
popcorn-api-draft.js
-->

<script src="../../popcorn.js"></script>

<script src="../../plugins/subtitle/popcorn.subtitle.js"></script>
Expand All @@ -22,25 +22,25 @@ <h2 id="qunit-banner"></h2>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>
<div id="qunit-fixture"> </div>
<video id='video'

<video id='video'
controls
width= '250px'
poster="../../test/poster.png">
poster="../../test/poster.png">

<source id='mp4'
src="../../test/trailer.mp4"
type='video/mp4; codecs="avc1, mp4a"'>
type='video/mp4; codecs="avc1, mp4a"'>

<source id='ogv'
src="../../test/trailer.ogv"
type='video/ogg; codecs="theora, vorbis"'>
type='video/ogg; codecs="theora, vorbis"'>

<source id='webm'
src="../../test/trailer.webm"
type='video/webm; codecs="vp8, vorbis"'>

<p>Your user agent does not support the HTML5 Video element.</p>
<p>Your user agent does not support the HTML5 Video element.</p>

</video>
</body>
Expand Down

0 comments on commit bd50431

Please sign in to comment.