eztelemeta: namespace js

diff --git a/tools/eztelemeta/design/standard/javascript/page-player.js b/tools/eztelemeta/design/standard/javascript/page-player.js
index 6ee625707d6e3dcb61f403d997e5665e578631a6..a247b5c3c719dd232d61b11d603df17dbb4a9886 100644 (file)
--- a/tools/eztelemeta/design/standard/javascript/page-player.js
+++ b/tools/eztelemeta/design/standard/javascript/page-player.js
@@ -14,7 +14,7 @@
 \r
 */\r
 \r
-function PagePlayer(oConfigOverride) {\r
+function TelemetaPlayer(oConfigOverride) {\r
   var self = this;\r
   var pl = this;\r
   var sm = soundManager; // soundManager instance\r
@@ -487,7 +487,7 @@ function PagePlayer(oConfigOverride) {
     } else {\r
       // create sound\r
       thisSound = sm.createSound({\r
-        id:'pagePlayerMP3Sound'+(self.soundCount++),\r
+        id:'telemetaPlayerMP3Sound'+(self.soundCount++),\r
         url:soundURL,\r
         onplay:self.events.play,\r
         onstop:self.events.stop,\r
@@ -848,13 +848,13 @@ function PagePlayer(oConfigOverride) {
   }\r
 \r
   this.init = function() {\r
-    sm._writeDebug('pagePlayer.init()');\r
+    sm._writeDebug('TelemetaPlayer.init()');\r
     var oLinks = document.getElementsByTagName('a');\r
     // grab all links, look for .mp3\r
     var foundItems = 0;\r
     for (var i=0; i<oLinks.length; i++) {\r
       if ((sm.canPlayURL(oLinks[i].href) && self.hasClass(oLinks[i],'ezt-playable')) && !self.hasClass(oLinks[i],'ezt-exclude')) {\r
-        oLinks[i].rel = 'pagePlayerMP3Sound'+i;\r
+        oLinks[i].rel = 'telemetaPlayerMP3Sound'+i;\r
         self.links[self.links.length] = oLinks[i];\r
         self.addClass(oLinks[i],self.css.sDefault); // add default CSS decoration\r
         foundItems++;\r
@@ -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.)\r
     }\r
     console.log('TestTest');\r
-    sm._writeDebug('pagePlayer.init(): Found '+foundItems+' relevant items.');\r
+    sm._writeDebug('TelemetaPlayer.init(): Found '+foundItems+' relevant items.');\r
     if (self.config.autoStart) {\r
       pl.handleClick({target:pl.links[0]});\r
     }\r
@@ -1007,9 +1007,3 @@ var Metadata = function(oSound) {
 \r
 }\r
 \r
-var pagePlayer = new PagePlayer(typeof PP_CONFIG != 'undefined'?PP_CONFIG:null);\r
-\r
-soundManager.onload = function() {\r
-  // soundManager.createSound() etc. may now be called\r
-  pagePlayer.initDOM();\r
-}\r

diff --git a/tools/eztelemeta/design/standard/templates/eztelemeta_head.tpl b/tools/eztelemeta/design/standard/templates/eztelemeta_head.tpl
index 4aa0a4063209f876fa8f08ffa8a99b50aeca2d9d..c0e39491bd4c396af44a67fdbef8c51f2ffa1723 100644 (file)
--- 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}