Skip to content

Commit

Permalink
added lastFM [mozilla#307]
Browse files Browse the repository at this point in the history
  • Loading branch information
annasob committed Feb 7, 2011
1 parent 92826d7 commit 0b981bd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions demos/semantic_video/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<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="../../parsers/parserXML/popcorn.parseXML.js"></script>
Expand Down Expand Up @@ -503,11 +503,11 @@ <h3><img src="images/logo_google_news.png" alt="Google News" width="74" height="
</h3>
<div id="googlenewsdiv"><div class="overlay"></div><div class="inactive"></div></div>
</section>
<!--<section>
<section>
<h3><img src="images/logo_lastfm.png" alt="Lastfm" width="80" height="24" /></h3>
<a href="#" class="collapse"><span>Collapse</span></a>
<div class="content" id="lastfmdiv"><div class="overlay"></div><div class="inactive"></div></div>
</section>-->
</section>
</div>
<!-- End Column B -->
<h1><span>This video's copyright information</span></h1>
Expand Down
2 changes: 1 addition & 1 deletion demos/semantic_video/xml/webMadeMovies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<twitter in="00:04:19:06" out="00:04:24:01" title="Celine Celines" src="from:celinecelines" target="personaltwitter" width="238" height="120"/>
<tagthisperson target="inthisvideo" in="00:04:19:06" out="00:04:24:01" person="Celine Celines" />
<flickr in="00:04:19:06" out="00:04:24:01" target="personalflickr" userid="13072070@N00" numberofimages="8" padding="4px"/>
<!--<lastfm in="00:40:00" out="01:24:00" artist="yacht" target="lastfmdiv"/>-->
<lastfm in="00:40:00" out="01:24:00" artist="yacht" target="lastfmdiv" apikey="30ac38340e8be75f9268727cb4526b3d"/>

</resources>

Expand Down

0 comments on commit 0b981bd

Please sign in to comment.