From: olivier <>
Date: Mon, 13 Apr 2009 14:05:47 +0000 (+0000)
Subject: eztelemeta: namespace js
X-Git-Tag: 1.1~674
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=81500a153d9da8b2f82589bf1ebe14d47a8b9ade;p=telemeta.git

eztelemeta: namespace js
---

diff --git a/tools/eztelemeta/design/standard/javascript/page-player.js b/tools/eztelemeta/design/standard/javascript/page-player.js
index 6ee62570..a247b5c3 100644
--- a/tools/eztelemeta/design/standard/javascript/page-player.js
+++ b/tools/eztelemeta/design/standard/javascript/page-player.js
@@ -14,7 +14,7 @@
 
 */
 
-function PagePlayer(oConfigOverride) {
+function TelemetaPlayer(oConfigOverride) {
   var self = this;
   var pl = this;
   var sm = soundManager; // soundManager instance
@@ -487,7 +487,7 @@ function PagePlayer(oConfigOverride) {
     } else {
       // create sound
       thisSound = sm.createSound({
-        id:'pagePlayerMP3Sound'+(self.soundCount++),
+        id:'telemetaPlayerMP3Sound'+(self.soundCount++),
         url:soundURL,
         onplay:self.events.play,
         onstop:self.events.stop,
@@ -848,13 +848,13 @@ function PagePlayer(oConfigOverride) {
   }
 
   this.init = function() {
-    sm._writeDebug('pagePlayer.init()');
+    sm._writeDebug('TelemetaPlayer.init()');
     var oLinks = document.getElementsByTagName('a');
     // grab all links, look for .mp3
     var foundItems = 0;
     for (var i=0; i<oLinks.length; i++) {
       if ((sm.canPlayURL(oLinks[i].href) && self.hasClass(oLinks[i],'ezt-playable')) && !self.hasClass(oLinks[i],'ezt-exclude')) {
-        oLinks[i].rel = 'pagePlayerMP3Sound'+i;
+        oLinks[i].rel = 'telemetaPlayerMP3Sound'+i;
         self.links[self.links.length] = oLinks[i];
         self.addClass(oLinks[i],self.css.sDefault); // add default CSS decoration
         foundItems++;
@@ -871,7 +871,7 @@ function PagePlayer(oConfigOverride) {
       self.addEventHandler(window,'unload',function(){}); // force page reload when returning here via back button (Opera tries to remember old state, etc.)
     }
     console.log('TestTest');
-    sm._writeDebug('pagePlayer.init(): Found '+foundItems+' relevant items.');
+    sm._writeDebug('TelemetaPlayer.init(): Found '+foundItems+' relevant items.');
     if (self.config.autoStart) {
       pl.handleClick({target:pl.links[0]});
     }
@@ -1007,9 +1007,3 @@ var Metadata = function(oSound) {
 
 }
 
-var pagePlayer = new PagePlayer(typeof PP_CONFIG != 'undefined'?PP_CONFIG:null);
-
-soundManager.onload = function() {
-  // soundManager.createSound() etc. may now be called
-  pagePlayer.initDOM();
-}
diff --git a/tools/eztelemeta/design/standard/templates/eztelemeta_head.tpl b/tools/eztelemeta/design/standard/templates/eztelemeta_head.tpl
index 4aa0a406..c0e39491 100644
--- a/tools/eztelemeta/design/standard/templates/eztelemeta_head.tpl
+++ b/tools/eztelemeta/design/standard/templates/eztelemeta_head.tpl
@@ -4,23 +4,27 @@
   @import url({"stylesheets/page-player.css"|ezdesign});
 </style>
   <script language="JavaScript" type="text/javascript" src={"javascript/soundmanager2.js"|ezdesign}></script>
+  <script language="JavaScript" type="text/javascript" src={"javascript/page-player.js"|ezdesign}></script>
   <script language="JavaScript" type="text/javascript">
     /* SoundManager2 configuration */
     soundManager.debugMode = true;
     soundManager.url = {'swf/'|ezdesign};
 
-    /* SoundManager2 Page Player configuration */
+    /* Player configuration and instantiation */
     {literal}
-    var PP_CONFIG = {
-      flashVersion:     9,
-      usePeakData:      true,
-      useWaveformData:  false,
-      useEQData:        false,
-      useFavIcon:       false,
-      useMovieStar:     false,
-      updatePageTitle:  false
+    var telemetaPlayer = new TelemetaPlayer({
+        flashVersion:     9,
+        usePeakData:      true,
+        useWaveformData:  false,
+        useEQData:        false,
+        useFavIcon:       false,
+        useMovieStar:     false,
+        updatePageTitle:  false
+    });
+
+    soundManager.onload = function() {
+        telemetaPlayer.initDOM();
     }
     {/literal}
   </script>
-  <script language="JavaScript" type="text/javascript" src={"javascript/page-player.js"|ezdesign}></script>
 {/if}