From: olivier <>
Date: Fri, 12 Dec 2008 18:45:01 +0000 (+0000)
Subject: revert to soundmanager v2.90a.20081028, soundManager.url is broken in v2.91
X-Git-Tag: 1.1~774
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f062b9fc3b25215b94cc5e2a3c6217a8f8fa2534;p=telemeta.git

revert to soundmanager v2.90a.20081028, soundManager.url is broken in v2.91
---

diff --git a/telemeta/htdocs/js/soundmanager2.js b/telemeta/htdocs/js/soundmanager2.js
index 631814fd..216115ce 100644
--- a/telemeta/htdocs/js/soundmanager2.js
+++ b/telemeta/htdocs/js/soundmanager2.js
@@ -7,11 +7,9 @@
    Code licensed under the BSD License:
    http://schillmania.com/projects/soundmanager2/license.txt
 
-   V2.91a.20081205
+   V2.90a.20081028
 */
 
-var soundManager = null;
-
 function SoundManager(smURL,smID) {
  
   this.flashVersion = 8;           // version of flash to require, either 8 or 9. Some API features require Flash 9.
@@ -23,7 +21,7 @@ function SoundManager(smURL,smID) {
   this.allowPolling = true;        // allow flash to poll for status update (required for "while playing", peak, sound spectrum functions to work.)
   this.useMovieStar = false;	   // enable support for Flash 9.0r115+ (codename "MovieStar") MPEG4 audio + video formats (AAC, M4V, FLV, MOV etc.)
   this.useHighPerformance = true;  // flash positioning trick, improves JS/flash callback speed, minimizes delay
-  this.bgColor = '#ffffff';	  	   // movie (.swf) background color, useful if showing on-screen for video etc.
+  this.bgColor = '#ffffff';	   // movie (.swf) background color, useful if showing on-screen for video etc.
 
   this.defaultOptions = {
     'autoLoad': false,             // enable automatic loading (otherwise .load() will be called on demand with .play(), the latter being nicer on bandwidth - if you want to .load yourself, you also can)
@@ -50,25 +48,25 @@ function SoundManager(smURL,smID) {
   };
 
   this.flash9Options = {           // flash 9-only options, merged into defaultOptions if flash 9 is being used
-    'isMovieStar': null,	   	   // "MovieStar" MPEG4 audio/video mode. Null (default) = auto detect MP4, AAC etc. based on URL. true = force on, ignore URL
+    'isMovieStar': null,	   // "MovieStar" MPEG4 audio/video mode. Null (default) = auto detect MP4, AAC etc. based on URL. true = force on, ignore URL
     'usePeakData': false,          // enable left/right channel peak (level) data
     'useWaveformData': false,      // enable sound spectrum (raw waveform data) - WARNING: CPU-INTENSIVE: may set CPUs on fire.
     'useEQData': false             // enable sound EQ (frequency spectrum data) - WARNING: Also CPU-intensive.
   };
 
   this.movieStarOptions = {        // flash 9.0r115+ MPEG4 audio/video options, merged into defaultOptions if flash 9 + movieStar mode is enabled
-    'onmetadata': null,		   	   // callback for when video width/height etc. are received
-    'useVideo': false		   	   // if loading movieStar content, whether to show video
-  };
-
-  // jslint global declarations
-  /*global alert, console, document, navigator, setTimeout, window */
+    'onmetadata': null,		   // callback for when video width/height etc. are received
+    'useVideo': false		   // if loading movieStar content, whether to show video
+  }
 
-  var SMSound = null; // defined later
+  this.flashBlockHelper = {
+    'enabled': false,              // experimental, removed with >v2.80
+    'message': []                  // "nag bar" to show when messaging the user, if SM2 fails on firefox etc.
+  };
 
-  var _s = this;
+  var _s = this; 
   this.version = null;
-  this.versionNumber = 'V2.91a.20081205';
+  this.versionNumber = 'V2.90a.20081028';
   this.movieURL = null;
   this.url = null;
   this.altURL = null;
@@ -77,7 +75,7 @@ function SoundManager(smURL,smID) {
   this.o = null;
   this.id = (smID||'sm2movie');
   this.oMC = null;
-  this.sounds = {};
+  this.sounds = [];
   this.soundIDs = [];
   this.muted = false;
   this.isIE = (navigator.userAgent.match(/MSIE/i));
@@ -93,12 +91,10 @@ function SoundManager(smURL,smID) {
   this._hasConsole = (typeof console != 'undefined' && typeof console.log != 'undefined');
   this._debugLevels = ['log','info','warn','error'];
   this._defaultFlashVersion = 8;
-
   this.filePatterns = {
-    flash8: /.mp3/i,
-    flash9: /.mp3/i
+    flash8: /\.(mp3)/i,
+    flash9: /\.(mp3)/i
   };
-
   this.netStreamTypes = ['aac','flv','mov','mp4','m4v','f4v','m4a','mp4v','3gp','3g2']; // Flash v9.0r115+ "moviestar" formats
   this.netStreamPattern = new RegExp('.('+this.netStreamTypes.join('|')+')','i');
   this.filePattern = null;
@@ -140,7 +136,7 @@ function SoundManager(smURL,smID) {
     _s.filePattern = _s.filePatterns[(_s.flashVersion!=8?'flash9':'flash8')];
     _s.movieURL = (_s.flashVersion==8?'soundmanager2.swf':'soundmanager2_flash9.swf');
     _s.features.peakData = _s.features.waveformData = _s.features.eqData = (_s.flashVersion==9);
-  };
+  }
 
   this._overHTTP = (document.location?document.location.protocol.match(/http/i):null);
   this._waitingforEI = false;
@@ -169,26 +165,24 @@ function SoundManager(smURL,smID) {
     } catch(e) {
       _s._failSafely();
       return true;
-    }
+    };
   };
 
   this.createSound = function(oOptions) {
-    if (!_s._didInit) {
-	  throw new Error('soundManager.createSound(): Not loaded yet - wait for soundManager.onload() before calling sound-related methods');
-	}
-    if (arguments.length == 2) {
+    if (!_s._didInit) throw new Error('soundManager.createSound(): Not loaded yet - wait for soundManager.onload() before calling sound-related methods');
+    if (arguments.length==2) {
       // function overloading in JS! :) ..assume simple createSound(id,url) use case
-      oOptions = {'id':arguments[0],'url':arguments[1]};
-    }
+      var oOptions = {'id':arguments[0],'url':arguments[1]};
+    };
     var thisOptions = _s._mergeObjects(oOptions); // inherit SM2 defaults
     var _tO = thisOptions; // alias
     _s._wD('soundManager.createSound(): '+_tO.id+' ('+_tO.url+')',1);
     if (_s._idCheck(_tO.id,true)) {
       _s._wD('soundManager.createSound(): '+_tO.id+' exists',1);
       return _s.sounds[_tO.id];
-    }
+    };
     if (_s.flashVersion > 8 && _s.useMovieStar) {
-	  if (_tO.isMovieStar === null) {
+	  if (_tO.isMovieStar == null) {
 	    _tO.isMovieStar = (_tO.url.match(_s.netStreamPattern)?true:false);
 	  }
 	  if (_tO.isMovieStar) {
@@ -200,7 +194,7 @@ function SoundManager(smURL,smID) {
 		_tO.useWaveformData = false;
 		_tO.useEQData = false;
 	  }
-    }
+    };
     _s.sounds[_tO.id] = new SMSound(_tO);
     _s.soundIDs[_s.soundIDs.length] = _tO.id;
     // AS2:
@@ -208,7 +202,7 @@ function SoundManager(smURL,smID) {
       _s.o._createSound(_tO.id,_tO.onjustbeforefinishtime);
     } else {
       _s.o._createSound(_tO.id,_tO.url,_tO.onjustbeforefinishtime,_tO.usePeakData,_tO.useWaveformData,_tO.useEQData,_tO.isMovieStar,(_tO.isMovieStar?_tO.useVideo:false));
-    }
+    };
     if (_tO.autoLoad || _tO.autoPlay) {
       window.setTimeout(function() {
         if (_s.sounds[_tO.id]) {
@@ -228,8 +222,8 @@ function SoundManager(smURL,smID) {
 
   this.createVideo = function(oOptions) {
     if (arguments.length==2) {
-      oOptions = {'id':arguments[0],'url':arguments[1]};
-    }
+      var oOptions = {'id':arguments[0],'url':arguments[1]};
+    };
     if (_s.flashVersion >= 9) {
       oOptions.isMovieStar = true;
       oOptions.useVideo = true;
@@ -241,19 +235,17 @@ function SoundManager(smURL,smID) {
       _s._wD('soundManager.createVideo(): MovieStar mode not enabled. Exiting.',2);
     }
     return _s.createSound(oOptions);
-  };
+  }
 
   this.destroySound = function(sID,bFromSound) {
     // explicitly destroy a sound before normal page unload, etc.
-    if (!_s._idCheck(sID)) {
-      return false;
-    }
+    if (!_s._idCheck(sID)) return false;
     for (var i=0; i<_s.soundIDs.length; i++) {
       if (_s.soundIDs[i] == sID) {
 	    _s.soundIDs.splice(i,1);
         continue;
-      }
-    }
+      };
+    };
     // conservative option: avoid crash with ze flash 8
     // calling destroySound() within a sound onload() might crash firefox, certain flavours of winXP + flash 8??
     // if (_s.flashVersion != 8) {
@@ -262,31 +254,25 @@ function SoundManager(smURL,smID) {
     if (!bFromSound) {
       // ignore if being called from SMSound instance
       _s.sounds[sID].destruct();
-    }
+    };
     delete _s.sounds[sID];
   };
 
   this.destroyVideo = this.destroySound;
 
   this.load = function(sID,oOptions) {
-    if (!_s._idCheck(sID)) {
-      return false;
-    }
+    if (!_s._idCheck(sID)) return false;
     _s.sounds[sID].load(oOptions);
   };
 
   this.unload = function(sID) {
-    if (!_s._idCheck(sID)) {
-      return false;
-    }
+    if (!_s._idCheck(sID)) return false;
     _s.sounds[sID].unload();
   };
 
   this.play = function(sID,oOptions) {
     if (!_s._idCheck(sID)) {
-      if (typeof oOptions != 'Object') {
-		oOptions = {url:oOptions}; // overloading use case: play('mySound','/path/to/some.mp3');
-	  }
+      if (typeof oOptions != 'Object') oOptions = {url:oOptions}; // overloading use case: play('mySound','/path/to/some.mp3');
       if (oOptions && oOptions.url) {
         // overloading use case, creation + playing of sound: .play('someID',{url:'/path/to.mp3'});
         _s._wD('soundController.play(): attempting to create "'+sID+'"',1);
@@ -294,24 +280,21 @@ function SoundManager(smURL,smID) {
         _s.createSound(oOptions);
       } else {
         return false;
-      }
-    }
+      };
+    };
     _s.sounds[sID].play(oOptions);
   };
 
   this.start = this.play; // just for convenience
 
   this.setPosition = function(sID,nMsecOffset) {
-    if (!_s._idCheck(sID)) {
-      return false;
-    }
+    if (!_s._idCheck(sID)) return false;
+    nMsecOffset = Math.min((nMsecOffset||0),_s.duration); // don't allow seek past loaded duration
     _s.sounds[sID].setPosition(nMsecOffset);
   };
 
   this.stop = function(sID) {
-    if (!_s._idCheck(sID)) {
-	  return false;
-	}
+    if (!_s._idCheck(sID)) return false;
     _s._wD('soundManager.stop('+sID+')',1);
     _s.sounds[sID].stop(); 
   };
@@ -319,16 +302,12 @@ function SoundManager(smURL,smID) {
   this.stopAll = function() {
     _s._wD('soundManager.stopAll()',1);
     for (var oSound in _s.sounds) {
-      if (_s.sounds[oSound] instanceof SMSound) {
-		_s.sounds[oSound].stop(); // apply only to sound objects
-	  }
-    }
+      if (_s.sounds[oSound] instanceof SMSound) _s.sounds[oSound].stop(); // apply only to sound objects
+    };
   };
 
   this.pause = function(sID) {
-    if (!_s._idCheck(sID)) {
-	  return false;
-	}
+    if (!_s._idCheck(sID)) return false;
     _s.sounds[sID].pause();
   };
 
@@ -339,9 +318,7 @@ function SoundManager(smURL,smID) {
   };
 
   this.resume = function(sID) {
-    if (!_s._idCheck(sID)) {
-	  return false;
-	}
+    if (!_s._idCheck(sID)) return false;
     _s.sounds[sID].resume();
   };
 
@@ -352,40 +329,31 @@ function SoundManager(smURL,smID) {
   };
 
   this.togglePause = function(sID) {
-    if (!_s._idCheck(sID)) {
-	  return false;
-	}
+    if (!_s._idCheck(sID)) return false;
     _s.sounds[sID].togglePause();
   };
 
   this.setPan = function(sID,nPan) {
-    if (!_s._idCheck(sID)) {
-	  return false;
-	}
+    if (!_s._idCheck(sID)) return false;
     _s.sounds[sID].setPan(nPan);
   };
 
   this.setVolume = function(sID,nVol) {
-    if (!_s._idCheck(sID)) {
-	  return false;
-	}
+    if (!_s._idCheck(sID)) return false;
     _s.sounds[sID].setVolume(nVol);
   };
 
   this.mute = function(sID) {
-	if (typeof sID != 'string') {
-	  sID = null;
-	}
+	if (typeof sID != 'string') sID = null;
     if (!sID) {
+      var o = null;
       _s._wD('soundManager.mute(): Muting all sounds');
       for (var i=_s.soundIDs.length; i--;) {
         _s.sounds[_s.soundIDs[i]].mute();
       }
       _s.muted = true;
     } else {
-      if (!_s._idCheck(sID)) {
-	    return false;
-	  }
+      if (!_s._idCheck(sID)) return false;
       _s._wD('soundManager.mute(): Muting "'+sID+'"');
       _s.sounds[sID].mute();
     }
@@ -396,19 +364,16 @@ function SoundManager(smURL,smID) {
   };
 
   this.unmute = function(sID) {
-    if (typeof sID != 'string') {
-	  sID = null;
-	}
+    if (typeof sID != 'string') sID = null;
     if (!sID) {
+      var o = null;
       _s._wD('soundManager.unmute(): Unmuting all sounds');
       for (var i=_s.soundIDs.length; i--;) {
         _s.sounds[_s.soundIDs[i]].unmute();
       }
       _s.muted = false;
     } else {
-      if (!_s._idCheck(sID)) {
-		return false;
-	  }
+      if (!_s._idCheck(sID)) return false;
       _s._wD('soundManager.unmute(): Unmuting "'+sID+'"');
       _s.sounds[sID].unmute();
     }
@@ -419,40 +384,39 @@ function SoundManager(smURL,smID) {
   };
 
   this.setPolling = function(bPolling) {
-    if (!_s.o || !_s.allowPolling) {
-	  return false;
-	}
+    if (!_s.o || !_s.allowPolling) return false;
     // _s._wD('soundManager.setPolling('+bPolling+')');
     _s.o._setPolling(bPolling);
   };
 
   this.disable = function(bUnload) {
     // destroy all functions
-    if (_s._disabled) {
-	  return false;
-	}
+    if (_s._disabled) return false;
     _s._disabled = true;
     _s._wD('soundManager.disable(): Disabling all functions - future calls will return false.',1);
     for (var i=_s.soundIDs.length; i--;) {
       _s._disableObject(_s.sounds[_s.soundIDs[i]]);
-    }
+    };
     _s.initComplete(); // fire "complete", despite fail
     _s._disableObject(_s);
   };
 
+  this.handleFlashBlock = function(bForce) {
+    // experimental, removed with >v2.80.
+    return false;
+  };
+
   this.canPlayURL = function(sURL) {
     return (sURL?(sURL.match(_s.filePattern)?true:false):null);	
   };
 
   this.getSoundById = function(sID,suppressDebug) {
-    if (!sID) {
-	  throw new Error('SoundManager.getSoundById(): sID is null/undefined');
-	}
+    if (!sID) throw new Error('SoundManager.getSoundById(): sID is null/undefined');
     var result = _s.sounds[sID];
     if (!result && !suppressDebug) {
       _s._wD('"'+sID+'" is an invalid sound ID.',2);
       // soundManager._wD('trace: '+arguments.callee.caller);
-    }
+    };
     return result;
   };
 
@@ -470,31 +434,27 @@ function SoundManager(smURL,smID) {
 
   this._idCheck = this.getSoundById;
 
-  var _doNothing = function() {
-    return false;
-  };
-  _doNothing._protected = true;
-
   this._disableObject = function(o) {
     for (var oProp in o) {
-      if (typeof o[oProp] == 'function' && typeof o[oProp]._protected == 'undefined') {
-		o[oProp] = _doNothing;
-	  }
-    }
+      if (typeof o[oProp] == 'function' && typeof o[oProp]._protected == 'undefined') o[oProp] = function(){return false;};
+    };
     oProp = null;
   };
 
   this._failSafely = function() {
     // exception handler for "object doesn't support this property or method" or general failure
+    var fpgssTitle = 'You may need to whitelist this location/domain eg. file:///C:/ or C:/ or mysite.com, or set ALWAYS ALLOW under the Flash Player Global Security Settings page. The latter is probably less-secure.';
+    var flashCPL = '<a href="'+flashCPLink+'" title="'+fpgssTitle+'">view/edit</a>';
+    var FPGSS = '<a href="'+flashCPLink+'" title="Flash Player Global Security Settings">FPGSS</a>';
     if (!_s._disabled) {
       _s._wD('soundManager: Failed to initialise.',2);
       _s.disable();
-    }
+    };
   };
   
   this._normalizeMovieURL = function(smURL) {
     if (smURL) {
-      if (smURL.match(/.swf/)) {
+      if (smURL.match(/\.swf/)) {
         smURL = smURL.substr(0,smURL.lastIndexOf('.swf'));
       }
       if (smURL.lastIndexOf('/') != smURL.length-1) {
@@ -511,12 +471,8 @@ function SoundManager(smURL,smID) {
   this._getDocument._protected = true;
 
   this._createMovie = function(smID,smURL) {
-    if (_s._didAppend && _s._appendSuccess) {
-	  return false; // ignore if already succeeded
-	}
-    if (window.location.href.indexOf('debug=1')+1) {
-	  _s.debugMode = true; // allow force of debug mode via URL
-	}
+    if (_s._didAppend && _s._appendSuccess) return false; // ignore if already succeeded
+    if (window.location.href.indexOf('debug=1')+1) _s.debugMode = true; // allow force of debug mode via URL
     _s._didAppend = true;
 	
     // safety check for legacy (change to Flash 9 URL)
@@ -526,111 +482,18 @@ function SoundManager(smURL,smID) {
     _s.url = _s._normalizeMovieURL(_s._overHTTP?remoteURL:localURL);
     smURL = _s.url;
 
-    var specialCase = null;
-    if (_s.useHighPerformance && navigator.userAgent.match(/firefox\/2/i)) {
-      // no highPerformance for firefox 2. Causes failure on some pages, exact cause unknown at this point.
-      specialCase = 'Warning: disabling highPerformance, incompatible with Firefox 2.x';
-      _s.useHighPerformance = false;
-    }
-
-    if (_s.useHighPerformance && _s.useMovieStar) {
-	  specialCase = 'Warning: disabling highPerformance, not applicable with movieStar mode on';
-	  _s.useHighPerformance = false;
-	}
-
-    var oEmbed = {
-      name: smID,
-      id: smID,
-      src: smURL,
-      width: '100%',
-      height: '100%',
-      quality: 'high',
-      allowScriptAccess: 'always',
-      bgcolor: _s.bgColor,
-      pluginspage: 'http://www.macromedia.com/go/getflashplayer',
-      type: 'application/x-shockwave-flash'
-    };
-
-    var oObject = {
-      id: smID,
-      data: smURL,
-      type: 'application/x-shockwave-flash',
-      width: '100%',
-      height: '100%'
-    };
-
-    var oObjectParams = {
-      movie: smURL,
-      AllowScriptAccess: 'always',
-      quality: 'high',
-      bgcolor: _s.bgColor
-    };
-
-    if (_s.useHighPerformance && !_s.useMovieStar) {
-      oEmbed.wmode = 'transparent';
-      oObjectParams.wmode = 'transparent';
-    }
-
-    var oMovie = null;
-    var tmp = null;
-
-    if (_s.isIE) {
-
-      // IE is "special".
-      oMovie = document.createElement('div');
-      var movieHTML = '<object id="'+smID+'" data="'+smURL+'" type="application/x-shockwave-flash" width="100%" height="100%"><param name="movie" value="'+smURL+'" /><param name="AllowScriptAccess" value="always" /><param name="quality" value="high" />'+(_s.useHighPerformance && !_s.useMovieStar?'<param name="wmode" value="transparent" /> ':'')+'<param name="bgcolor" value="'+_s.bgColor+'" /><!-- --></object>';
-
-    } else {
-
-      oMovie = document.createElement('embed');
-      for (tmp in oEmbed) {
-	    if (oEmbed.hasOwnProperty(tmp)) {
-          oMovie.setAttribute(tmp,oEmbed[tmp]);
-		}
-      }
-    }
-
-    var oD = document.createElement('div');
-    oD.id = _s.debugID+'-toggle';
-    var oToggle = {
-      position: 'fixed',
-      bottom: '0px',
-      right: '0px',
-      width: '1.2em',
-      height: '1.2em',
-      lineHeight: '1.2em',
-      margin: '2px',
-      textAlign: 'center',
-      border: '1px solid #999',
-      cursor: 'pointer',
-      background: '#fff',
-      color: '#333',
-      zIndex: 10001
-    };
-
-    oD.appendChild(document.createTextNode('-'));
-    oD.onclick = _s._toggleDebug;
-    oD.title = 'Toggle SM2 debug console';
-
-    if (navigator.userAgent.match(/msie 6/i)) {
-      oD.style.position = 'absolute';
-      oD.style.cursor = 'hand';
-    }
-
-    for (tmp in oToggle) {
- 	  if (oToggle.hasOwnProperty(tmp)) {
-        oD.style[tmp] = oToggle[tmp];
-	  }
-    }
+    var htmlEmbed = '<embed name="'+smID+'" id="'+smID+'" src="'+smURL+'" width="100%" height="100%" quality="high" allowScriptAccess="always" quality="high" '+(_s.useHighPerformance && !_s.useMovieStar?'wmode="transparent" ':'')+'bgcolor="'+_s.bgColor+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed>';
+    var htmlObject = '<object id="'+smID+'" data="'+smURL+'" type="application/x-shockwave-flash" width="100%" height="100%"><param name="movie" value="'+smURL+'" /><param name="AllowScriptAccess" value="always" /><param name="quality" value="high" />'+(_s.useHighPerformance && !_s.useMovieStar?'<param name="wmode" value="transparent" /> ':'')+'<param name="bgcolor" value="'+_s.bgColor+'" /><!-- --></object>';
+    var html = (!_s.isIE?htmlEmbed:htmlObject);
 
+    var toggleElement = '<div id="'+_s.debugID+'-toggle" style="position:fixed;_position:absolute;right:0px;bottom:0px;_top:0px;width:1.2em;height:1.2em;line-height:1.2em;margin:2px;padding:0px;text-align:center;border:1px solid #999;cursor:pointer;background:#fff;color:#333;z-index:10001" title="Toggle SM2 debug console" onclick="soundManager._toggleDebug()">-</div>';
+    var debugHTML = '<div id="'+_s.debugID+'" style="display:'+(_s.debugMode && ((!_s._hasConsole||!_s.useConsole)||(_s.useConsole && _s._hasConsole && !_s.consoleOnly))?'block':'none')+';opacity:0.85"></div>';
     var appXHTML = 'soundManager._createMovie(): appendChild/innerHTML set failed. May be app/xhtml+xml DOM-related.';
 
     var oTarget = _s._getDocument();
-
     if (oTarget) {
        
       _s.oMC = document.getElementById('sm2-container')?document.getElementById('sm2-container'):document.createElement('div');
-
       if (!_s.oMC.id) {
         _s.oMC.id = 'sm2-container';
         _s.oMC.className = 'movieContainer';
@@ -638,122 +501,95 @@ function SoundManager(smURL,smID) {
         var s = null;
         if (_s.useHighPerformance) {
           s = {
- 	    	position: 'fixed',
-		    width: '8px',
+ 	    position: 'fixed',
+	    width: '8px',
             height: '8px', // must be at least 6px for flash to run fast. odd? yes.
             bottom: '0px',
             left: '0px',
-	    	zIndex:-1 // sit behind everything else
-          };
+	    zIndex:-1 // sit behind everything else
+          }
         } else {
           s = {
             position: 'absolute',
-		    width: '1px',
+	    width: '1px',
             height: '1px',
             bottom: '0px',
             left: '0px'
-          };
+          }
         }
         var x = null;
         for (x in s) {
-		  if (s.hasOwnProperty(x)) {
-            _s.oMC.style[x] = s[x];
-		  }
+          _s.oMC.style[x] = s[x];
         }
         try {
-		  if (!_s.isIE) {
-    	    _s.oMC.appendChild(oMovie);
-		  }
           oTarget.appendChild(_s.oMC);
-		  if (_s.isIE) {
-            _s.oMC.innerHTML = movieHTML;
-          }
+          _s.oMC.innerHTML = html;
           _s._appendSuccess = true;
         } catch(e) {
           throw new Error(appXHTML);
         }
       } else {
         // it's already in the document.
-        _s.oMC.appendChild(oMovie);
-		if (_s.isIE) {
-		  // possibly destructive write
-          _s.oMC.innerHTML = movieHTML;
-        }
+        _s.oMC.innerHTML = html;
         _s._appendSuccess = true;
       }
-
       if (!document.getElementById(_s.debugID) && ((!_s._hasConsole||!_s.useConsole)||(_s.useConsole && _s._hasConsole && !_s.consoleOnly))) {
         var oDebug = document.createElement('div');
         oDebug.id = _s.debugID;
         oDebug.style.display = (_s.debugMode?'block':'none');
         if (_s.debugMode) {
           try {
-            // var oD = document.createElement('div');
+            var oD = document.createElement('div');
             oTarget.appendChild(oD);
-            // oD.innerHTML = toggleElement;
-          } catch(e2) {
+            oD.innerHTML = toggleElement;
+          } catch(e) {
             throw new Error(appXHTML);
-          }
-        }
+          };
+        };
         oTarget.appendChild(oDebug);
-      }
+      };
       oTarget = null;
-    }
-
-    if (specialCase) {
-      _s._wD(specialCase);
-    }
-
-    _s._wD('-- SoundManager 2 '+_s.version+(_s.useMovieStar?', MovieStar mode':'')+(_s.useHighPerformance?', high performance mode':'')+' --',1);
+    };
+    _s._wD('-- SoundManager 2 '+_s.version+(_s.useMovieStar?', MovieStar mode':'')+(_s._wD?', high performance mode':'')+' --',1);
     _s._wD('soundManager._createMovie(): Trying to load '+smURL+(!_s._overHTTP && _s.altURL?'(alternate URL)':''),1);
   };
 
   // aliased to this._wD()
   this._writeDebug = function(sText,sType,bTimestamp) {
-    if (!_s.debugMode) {
-	  return false;
-	}
+    if (!_s.debugMode) return false;
     if (typeof bTimestamp != 'undefined' && bTimestamp) {
       sText = sText + ' | '+new Date().getTime();
-    }
+    };
     if (_s._hasConsole && _s.useConsole) {
       var sMethod = _s._debugLevels[sType];
       if (typeof console[sMethod] != 'undefined') {
         console[sMethod](sText);
       } else {
         console.log(sText);
-      }
-      if (_s.useConsoleOnly) {
-	    return true;
-	  }
-    }
+      };
+      if (_s.useConsoleOnly) return true;
+    };
     var sDID = 'soundmanager-debug';
     try {
       var o = document.getElementById(sDID);
-      if (!o) {
-		return false;
-	  }
+      if (!o) return false;
       var oItem = document.createElement('div');
-      // sText = sText.replace(/\n/g,'<br />');
+      sText = sText.replace(/\n/g,'<br />');
       if (typeof sType == 'undefined') {
-        sType = 0;
+        var sType = 0;
       } else {
-        sType = parseInt(sType,10);
-      }
-      oItem.appendChild(document.createTextNode(sText));
+        sType = parseInt(sType);
+      };
+      oItem.innerHTML = sText;
       if (sType) {
-        if (sType >= 2) {
-		  oItem.style.fontWeight = 'bold';
-		}
-        if (sType == 3) {
-		  oItem.style.color = '#ff3333';
-		}
-      }
+        if (sType >= 2) oItem.style.fontWeight = 'bold';
+        if (sType == 3) oItem.style.color = '#ff3333';
+      };
       // o.appendChild(oItem); // top-to-bottom
       o.insertBefore(oItem,o.firstChild); // bottom-to-top
     } catch(e) {
       // oh well
-    }
+    };
     o = null;
   };
   this._writeDebug._protected = true;
@@ -763,14 +599,12 @@ function SoundManager(smURL,smID) {
 
   if (window.location.href.indexOf('debug=alert')+1 && _s.debugMode) {
     _s._wD = _s._wDAlert;
-  }
+  };
 
   this._toggleDebug = function() {
     var o = document.getElementById(_s.debugID);
     var oT = document.getElementById(_s.debugID+'-toggle');
-    if (!o) {
-	  return false;
-	}
+    if (!o) return false;
     if (_s._debugOpen) {
       // minimize
       oT.innerHTML = '+';
@@ -778,7 +612,7 @@ function SoundManager(smURL,smID) {
     } else {
       oT.innerHTML = '-';
       o.style.display = 'block';
-    }
+    };
     _s._debugOpen = !_s._debugOpen;
   };
 
@@ -788,30 +622,24 @@ function SoundManager(smURL,smID) {
     _s._wD('--- soundManager._debug(): Current sound objects ---',1);
     for (var i=0,j=_s.soundIDs.length; i<j; i++) {
       _s.sounds[_s.soundIDs[i]]._debug();
-    }
+    };
   };
 
   this._mergeObjects = function(oMain,oAdd) {
     // non-destructive merge
     var o1 = {}; // clone o1
     for (var i in oMain) {
-	  if (oMain.hasOwnProperty(i)) {
-        o1[i] = oMain[i];
-	  }
+      o1[i] = oMain[i];
     }
     var o2 = (typeof oAdd == 'undefined'?_s.defaultOptions:oAdd);
     for (var o in o2) {
-      if (o2.hasOwnProperty(o) && typeof o1[o] == 'undefined') {
-		o1[o] = o2[o];
-	  }
-    }
+      if (typeof o1[o] == 'undefined') o1[o] = o2[o];
+    };
     return o1;
   };
 
   this.createMovie = function(sURL) {
-    if (sURL) {
-	  _s.url = sURL;
-	}
+    if (sURL) _s.url = sURL;
     _s._initMovie();
   };
 
@@ -819,58 +647,50 @@ function SoundManager(smURL,smID) {
 
   this._initMovie = function() {
     // attempt to get, or create, movie
-    if (_s.o) {
-	  return false; // pre-init may have fired this function before window.onload(), may already exist
-	}
+    if (_s.o) return false; // pre-init may have fired this function before window.onload(), may already exist
     _s.o = _s.getMovie(_s.id); // try to get flash movie (inline markup)
     if (!_s.o) {
       // try to create
       _s._createMovie(_s.id,_s.url);
       _s.o = _s.getMovie(_s.id);
-    }
+    };
     if (_s.o) {
       _s._wD('soundManager._initMovie(): Got '+_s.o.nodeName+' element ('+(_s._didAppend?'created via JS':'static HTML')+')',1);
       _s._wD('soundManager._initMovie(): Waiting for ExternalInterface call from Flash..');
-    }
+    };
   };
 
   this.waitForExternalInterface = function() {
-    if (_s._waitingForEI) {
-	  return false;
-	}
+    if (_s._waitingForEI) return false;
     _s._waitingForEI = true;
     if (_s._tryInitOnFocus && !_s._isFocused) {
       _s._wD('soundManager: Special case: Flash may not have started due to non-focused tab (Safari is lame), and/or focus cannot be detected. Waiting for focus-related event..');
       return false;
-    }
+    };
     if (!_s._didInit) {
       _s._wD('soundManager: Getting impatient, still waiting for Flash.. ;)');
-    }
+    };
     setTimeout(function() {
       if (!_s._didInit) {
         _s._wD('soundManager: No Flash response within reasonable time after document load.\nPossible causes: Flash version under 8, no support, or Flash security denying JS-Flash communication.',2);
         if (!_s._overHTTP) {
           _s._wD('soundManager: Loading this page from local/network file system (not over HTTP?) Flash security likely restricting JS-Flash access. Consider adding current URL to "trusted locations" in the Flash player security settings manager at '+flashCPLink+', or simply serve this content over HTTP.',2);
-        }
-      }
+        };
+      };
       // if still not initialized and no other options, give up
-      if (!_s._didInit && _s._okToDisable) {
-		_s._failSafely();
-	  }
+      if (!_s._didInit && _s._okToDisable) _s._failSafely();
     },750);
   };
 
   this.handleFocus = function() {
-    if (_s._isFocused || !_s._tryInitOnFocus) {
-	  return true;
-	}
+    if (_s._isFocused || !_s._tryInitOnFocus) return true;
     _s._okToDisable = true;
     _s._isFocused = true;
     _s._wD('soundManager.handleFocus()');
     if (_s._tryInitOnFocus) {
       // giant Safari 3.1 hack - assume window in focus if mouse is moving, since document.hasFocus() not currently implemented.
       window.removeEventListener('mousemove',_s.handleFocus,false);
-    }
+    };
     // allow init to restart
     _s._waitingForEI = false;
     setTimeout(_s.waitForExternalInterface,500);
@@ -879,40 +699,47 @@ function SoundManager(smURL,smID) {
       window.removeEventListener('focus',_s.handleFocus,false);
     } else if (window.detachEvent) {
       window.detachEvent('onfocus',_s.handleFocus);
-    }
+    };
   };
 
   this.initComplete = function() {
-    if (_s._didInit) {
-	  return false;
-	}
+    if (_s._didInit) return false;
     _s._didInit = true;
     _s._wD('-- SoundManager 2 '+(_s._disabled?'failed to load':'loaded')+' ('+(_s._disabled?'security/load error':'OK')+') --',1);
     if (_s._disabled) {
       _s._wD('soundManager.initComplete(): calling soundManager.onerror()',1);
       _s.onerror.apply(window);
       return false;
-    }
+    };
     if (_s.waitForWindowLoad && !_s._windowLoaded) {
       _s._wD('soundManager: Waiting for window.onload()');
       if (window.addEventListener) {
         window.addEventListener('load',_s.initUserOnload,false);
       } else if (window.attachEvent) {
         window.attachEvent('onload',_s.initUserOnload);
-      }
+      };
       return false;
     } else {
       if (_s.waitForWindowLoad && _s._windowLoaded) {
         _s._wD('soundManager: Document already loaded');
-      }
+      };
       _s.initUserOnload();
-    }
+    };
   };
 
   this.initUserOnload = function() {
     _s._wD('soundManager.initComplete(): calling soundManager.onload()',1);
     // call user-defined "onload", scoped to window
-    _s.onload.apply(window);
+    //try {
+      _s.onload.apply(window);
+      /*
+    } catch(e) {
+      // something broke (likely JS error in user function)
+      _s._wD('soundManager.onload() threw an exception: '+e.message,2);
+      setTimeout(function(){throw new Error(e)},20);
+      return false;
+    };
+    */
     _s._wD('soundManager.onload() complete',1);
   };
 
@@ -923,30 +750,28 @@ function SoundManager(smURL,smID) {
     if (_s._didInit) {
       _s._wD('soundManager.init(): Already called?');
       return false;
-    }
+    };
     // event cleanup
     if (window.removeEventListener) {
       window.removeEventListener('load',_s.beginDelayedInit,false);
     } else if (window.detachEvent) {
       window.detachEvent('onload',_s.beginDelayedInit);
-    }
+    };
     try {
-      _s._wD('Attempting to call Flash from JS..');
+      _s._wD('Attempting to call JS -&gt; Flash..');
       _s.o._externalInterfaceTest(false); // attempt to talk to Flash
       // _s._wD('Flash ExternalInterface call (JS-Flash) OK',1);
       if (!_s.allowPolling) {
 	    _s._wD('Polling (whileloading/whileplaying support) is disabled.',1);
 	  }
       _s.setPolling(true);
-	  if (!_s.debugMode) {
-		_s.o._disableDebug();
-	  }
+	  if (!_s.debugMode) _s.o._disableDebug();
       _s.enabled = true;
     } catch(e) {
       _s._failSafely();
       _s.initComplete();
       return false;
-    }
+    };
     _s.initComplete();
   };
 
@@ -958,9 +783,7 @@ function SoundManager(smURL,smID) {
   };
 
   this.beginInit = function() {
-    if (_s._initPending) {
-	  return false;
-	}
+    if (_s._initPending) return false;
     _s.createMovie(); // ensure creation if not already done
     _s._initMovie();
     _s._initPending = true;
@@ -969,17 +792,13 @@ function SoundManager(smURL,smID) {
 
   this.domContentLoaded = function() {
     _s._wD('soundManager.domContentLoaded()');
-    if (document.removeEventListener) {
-	  document.removeEventListener('DOMContentLoaded',_s.domContentLoaded,false);
-	}
+    if (document.removeEventListener) document.removeEventListener('DOMContentLoaded',_s.domContentLoaded,false);
     _s.go();
   };
 
   this._externalInterfaceOK = function() {
     // callback from flash for confirming that movie loaded, EI is working etc.
-    if (_s.swfLoaded) {
-	  return false;
-	}
+    if (_s.swfLoaded) return false;
     _s._wD('soundManager._externalInterfaceOK()');
     _s.swfLoaded = true;
     _s._tryInitOnFocus = false;
@@ -988,7 +807,7 @@ function SoundManager(smURL,smID) {
       setTimeout(_s.init,100);
     } else {
       _s.init();
-    }
+    };
   };
 
   this._setSandboxType = function(sandboxType) {
@@ -1006,7 +825,7 @@ function SoundManager(smURL,smID) {
     } else if (sb.type == 'localTrusted') {
       sb.noRemote = false;
       sb.noLocal = false;
-    }
+    };
   };
 
   this.destruct = function() {
@@ -1016,7 +835,7 @@ function SoundManager(smURL,smID) {
   
   // SMSound (sound object)
   
-  SMSound = function (oOptions) {
+  function SMSound(oOptions) {
   var _t = this;
   this.sID = oOptions.id;
   this.url = oOptions.url;
@@ -1032,7 +851,7 @@ function SoundManager(smURL,smID) {
     var sfBracket = null;
     var maxLength = 64; // # of characters of function code to show before truncating
     for (stuff in _t.options) {
-      if (_t.options[stuff] !== null) {
+      if (_t.options[stuff] != null) {
         if (_t.options[stuff] instanceof Function) {
 	      // handle functions specially
 	      sF = _t.options[stuff].toString();
@@ -1041,11 +860,11 @@ function SoundManager(smURL,smID) {
 	      msg[msg.length] = ' '+stuff+': {'+sF.substr(sfBracket+1,(Math.min(Math.max(sF.indexOf('\n')-1,maxLength),maxLength))).replace(/\n/g,'')+'... }';
 	    } else {
 	      msg[msg.length] = ' '+stuff+': '+_t.options[stuff];
-	    }
-      }
-    }
+	    };
+      };
+    };
     _s._wD('SMSound() merged options: {\n'+msg.join(', \n')+'\n}');
-    }
+    };
   };
 
   this._debug();
@@ -1090,15 +909,13 @@ function SoundManager(smURL,smID) {
       _t._iO = _s._mergeObjects(oOptions);
       _t.instanceOptions = _t._iO;
     } else {
-      oOptions = _t.options;
+      var oOptions = _t.options;
       _t._iO = oOptions;
       _t.instanceOptions = _t._iO;
     } 
-    if (typeof _t._iO.url == 'undefined') {
-	  _t._iO.url = _t.url;
-	}
+    if (typeof _t._iO.url == 'undefined') _t._iO.url = _t.url;
     _s._wD('soundManager.load(): '+_t._iO.url,1);
-    if (_t._iO.url == _t.url && _t.readyState !== 0 && _t.readyState != 2) {
+    if (_t._iO.url == _t.url && _t.readyState != 0 && _t.readyState != 2) {
       _s._wD('soundManager.load(): current URL already assigned.',1);
       return false;
     }
@@ -1114,18 +931,18 @@ function SoundManager(smURL,smID) {
           // special case: MPEG4 content must start playing to load, then pause to prevent playing.
           _t.pause();
         }
-      }
+      };
     } catch(e) {
       _s._wD('SMSound.load(): Exception: JS-Flash communication failed, or JS error.',2);
       _s.onerror();
       _s.disable();
-    }
+    };
   };
 
   this.unload = function() {
     // Flash 8/AS2 can't "close" a stream - fake it by loading an empty MP3
     // Flash 9/AS3: Close stream, preventing further load
-    if (_t.readyState !== 0) {
+    if (_t.readyState != 0) {
       _s._wD('SMSound.unload(): "'+_t.sID+'"');
       if (_t.readyState != 2) { // reset if not error
         _t.setPosition(0); // reset current sound positioning
@@ -1141,12 +958,10 @@ function SoundManager(smURL,smID) {
     _s._wD('SMSound.destruct(): "'+_t.sID+'"');
     _s.o._destroySound(_t.sID);
     _s.destroySound(_t.sID,true); // ensure deletion from controller
-  };
+  }
 
   this.play = function(oOptions) {
-    if (!oOptions) {
-	  oOptions = {};
-	}
+    if (!oOptions) oOptions = {};
     _t._iO = _s._mergeObjects(oOptions,_t._iO);
     _t._iO = _s._mergeObjects(_t._iO,_t.options);
     _t.instanceOptions = _t._iO;
@@ -1157,10 +972,10 @@ function SoundManager(smURL,smID) {
         return false;
       } else {
         _s._wD('SMSound.play(): "'+_t.sID+'" already playing (multi-shot)',1);
-      }
-    }
+      };
+    };
     if (!_t.loaded) {
-      if (_t.readyState === 0) {
+      if (_t.readyState == 0) {
         _s._wD('SMSound.play(): Attempting to load "'+_t.sID+'"',1);
         // try to get this sound playing ASAP
         _t._iO.stream = true;
@@ -1173,25 +988,21 @@ function SoundManager(smURL,smID) {
         return false;
       } else {
         _s._wD('SMSound.play(): "'+_t.sID+'" is loading - attempting to play..',1);
-      }
+      };
     } else {
       _s._wD('SMSound.play(): "'+_t.sID+'"');
-    }
+    };
     if (_t.paused) {
       _t.resume();
     } else {
       _t.playState = 1;
-      if (!_t.instanceCount || _s.flashVersion == 9) {
-		_t.instanceCount++;
-	  }
+      if (!_t.instanceCount || _s.flashVersion == 9) _t.instanceCount++;
       _t.position = (typeof _t._iO.position != 'undefined' && !isNaN(_t._iO.position)?_t._iO.position:0);
-      if (_t._iO.onplay) {
-		_t._iO.onplay.apply(_t);
-	  }
+      if (_t._iO.onplay) _t._iO.onplay.apply(_t);
       _t.setVolume(_t._iO.volume);
       _t.setPan(_t._iO.pan);
       _s.o._start(_t.sID,_t._iO.loop||1,(_s.flashVersion==9?_t.position:_t.position/1000));
-    }
+    };
   };
 
   this.start = this.play; // just for convenience
@@ -1201,48 +1012,34 @@ function SoundManager(smURL,smID) {
       _t.playState = 0;
       _t.paused = false;
       // if (_s.defaultOptions.onstop) _s.defaultOptions.onstop.apply(_s);
-      if (_t._iO.onstop) {
-		_t._iO.onstop.apply(_t);
-	  }
+      if (_t._iO.onstop) _t._iO.onstop.apply(_t);
       _s.o._stop(_t.sID,bAll);
       _t.instanceCount = 0;
       _t._iO = {};
       // _t.instanceOptions = _t._iO;
-    }
+    };
   };
 
   this.setPosition = function(nMsecOffset) {
-    if (typeof nMsecOffset == 'undefined') {
-      nMsecOffset = 0;
-    }
-    // var offset = Math.min((nMsecOffset||0),_t.duration); // don't allow seek past loaded duration
     _t._iO.position = nMsecOffset;
     _s._wD('SMSound.setPosition('+nMsecOffset+')');
     _s.o._setPosition(_t.sID,(_s.flashVersion==9?_t._iO.position:_t._iO.position/1000),(_t.paused||!_t.playState)); // if paused or not playing, will not resume (by playing)
   };
 
   this.pause = function() {
-    if (_t.paused || _t.playState === 0) {
-	  return false;
-	}
+    if (_t.paused || _t.playState == 0) return false;
     _s._wD('SMSound.pause()');
     _t.paused = true;
     _s.o._pause(_t.sID);
-    if (_t._iO.onpause) {
-	  _t._iO.onpause.apply(_t);
-	}
+    if (_t._iO.onpause) _t._iO.onpause.apply(_t);
   };
 
   this.resume = function() {
-    if (!_t.paused || _t.playState === 0) {
-	  return false;
-	}
+    if (!_t.paused || _t.playState == 0) return false;
     _s._wD('SMSound.resume()');
     _t.paused = false;
     _s.o._pause(_t.sID); // flash method is toggle-based (pause/resume)
-    if (_t._iO.onresume) {
-	  _t._iO.onresume.apply(_t);
-	}
+    if (_t._iO.onresume) _t._iO.onresume.apply(_t);
   };
 
   this.togglePause = function() {
@@ -1250,26 +1047,22 @@ function SoundManager(smURL,smID) {
     if (!_t.playState) {
       _t.play({position:(_s.flashVersion==9?_t.position:_t.position/1000)});
       return false;
-    }
+    };
     if (_t.paused) {
       _t.resume();
     } else {
       _t.pause();
-    }
+    };
   };
 
   this.setPan = function(nPan) {
-    if (typeof nPan == 'undefined') {
-	  nPan = 0;
-	}
+    if (typeof nPan == 'undefined') nPan = 0;
     _s.o._setPan(_t.sID,nPan);
     _t._iO.pan = nPan;
   };
 
   this.setVolume = function(nVol) {
-    if (typeof nVol == 'undefined') {
-	  nVol = 100;
-	}
+    if (typeof nVol == 'undefined') nVol = 100;
     _s.o._setVolume(_t.sID,(_s.muted&&!_t.muted)||_t.muted?0:nVol);
     _t._iO.volume = nVol;
   };
@@ -1291,18 +1084,14 @@ function SoundManager(smURL,smID) {
       _t.bytesLoaded = nBytesLoaded;
       _t.bytesTotal = nBytesTotal;
       _t.duration = Math.floor(nDuration);
-      _t.durationEstimate = parseInt((_t.bytesTotal/_t.bytesLoaded)*_t.duration,10); // estimate total time (will only be accurate with CBR MP3s.)
-      if (_t.readyState != 3 && _t._iO.whileloading) {
-		_t._iO.whileloading.apply(_t);
-	  }
+      _t.durationEstimate = parseInt((_t.bytesTotal/_t.bytesLoaded)*_t.duration); // estimate total time (will only be accurate with CBR MP3s.)
+      if (_t.readyState != 3 && _t._iO.whileloading) _t._iO.whileloading.apply(_t);
     } else {
       _t.bytesLoaded = nBytesLoaded;
       _t.bytesTotal = nBytesTotal;
       _t.duration = Math.floor(nDuration);
       _t.durationEstimate = _t.duration;
-      if (_t.readyState != 3 && _t._iO.whileloading) {
-		_t._iO.whileloading.apply(_t);
-	  }
+      if (_t.readyState != 3 && _t._iO.whileloading) _t._iO.whileloading.apply(_t);
     }
   };
 
@@ -1314,24 +1103,20 @@ function SoundManager(smURL,smID) {
     for (var i=0,j=oID3PropNames.length; i<j; i++) {
       oData[oID3PropNames[i]] = oID3Data[i];
       // _s._wD(oID3PropNames[i]+': '+oID3Data[i]);
-    }
+    };
     _t.id3 = _s._mergeObjects(_t.id3,oData);
-    if (_t._iO.onid3) {
-	  _t._iO.onid3.apply(_t);
-	}
+    if (_t._iO.onid3) _t._iO.onid3.apply(_t);
   };
 
   this._whileplaying = function(nPosition,oPeakData,oWaveformData,oEQData) {
-    if (isNaN(nPosition) || nPosition === null) {
-	  return false; // Flash may return NaN at times
-	}
+    if (isNaN(nPosition) || nPosition == null) return false; // Flash may return NaN at times
     _t.position = nPosition;
 	if (_t._iO.usePeakData && typeof oPeakData != 'undefined' && oPeakData) {
 	  _t.peakData = {
 	   left: oPeakData.leftPeak,
 	   right: oPeakData.rightPeak
 	  };
-	}
+	};
 	if (_t._iO.useWaveformData && typeof oWaveformData != 'undefined' && oWaveformData) {
 	  _t.waveformData = oWaveformData;
 	  /*
@@ -1340,37 +1125,37 @@ function SoundManager(smURL,smID) {
 	   right: oSpectrumData.right.split(',')
 	  }
 	  */
-	}
+	};
 	if (_t._iO.useEQData && typeof oEQData != 'undefined' && oEQData) {
 	  _t.eqData = oEQData;
-	}
+	};
     if (_t.playState == 1) {
       if (_t._iO.whileplaying) {
 	    _t._iO.whileplaying.apply(_t); // flash may call after actual finish
-	}
+	  };
       if (_t.loaded && _t._iO.onbeforefinish && _t._iO.onbeforefinishtime && !_t.didBeforeFinish && _t.duration-_t.position <= _t._iO.onbeforefinishtime) {
         _s._wD('duration-position &lt;= onbeforefinishtime: '+_t.duration+' - '+_t.position+' &lt= '+_t._iO.onbeforefinishtime+' ('+(_t.duration-_t.position)+')');
         _t._onbeforefinish();
-      }
-    }
+      };
+    };
   };
 
   this._onload = function(bSuccess) {
     bSuccess = (bSuccess==1?true:false);
     _s._wD('SMSound._onload(): "'+_t.sID+'"'+(bSuccess?' loaded.':' failed to load? - '+_t.url));
     if (!bSuccess) {
-      if (_s.sandbox.noRemote === true) {
+      if (_s.sandbox.noRemote == true) {
         _s._wD('SMSound._onload(): Reminder: Flash security is denying network/internet access',1);
-      }
-      if (_s.sandbox.noLocal === true) {
+      };
+      if (_s.sandbox.noLocal == true) {
         _s._wD('SMSound._onload(): Reminder: Flash security is denying local access',1);
-      }
-    }
+      };
+    };
     _t.loaded = bSuccess;
     _t.readyState = bSuccess?3:2;
     if (_t._iO.onload) {
       _t._iO.onload.apply(_t);
-    }
+    };
   };
 
   this._onbeforefinish = function() {
@@ -1380,7 +1165,7 @@ function SoundManager(smURL,smID) {
         _s._wD('SMSound._onbeforefinish(): "'+_t.sID+'"');
         _t._iO.onbeforefinish.apply(_t);
       }
-    }
+    };
   };
 
   this._onjustbeforefinish = function(msOffset) {
@@ -1391,7 +1176,7 @@ function SoundManager(smURL,smID) {
         _s._wD('SMSound._onjustbeforefinish(): "'+_t.sID+'"');
         _t._iO.onjustbeforefinish.apply(_t);
       }
-    }
+    };
   };
 
   this._onfinish = function() {
@@ -1402,22 +1187,18 @@ function SoundManager(smURL,smID) {
       _s._wD('SMSound._onfinish(): "'+_t.sID+'"');
       _t._iO.onfinish.apply(_t);
     }
-    if (_t._iO.onbeforefinishcomplete) {
-	  _t._iO.onbeforefinishcomplete.apply(_t);
-	}
+    if (_t._iO.onbeforefinishcomplete) _t._iO.onbeforefinishcomplete.apply(_t);
     // reset some state items
+    _t.setPosition(0);
     _t.didBeforeFinish = false;
     _t.didJustBeforeFinish = false;
     if (_t.instanceCount) {
       _t.instanceCount--;
       if (!_t.instanceCount) {
         // reset instance options
-        _t.setPosition(0);
         _t.instanceCount = 0;
         _t.instanceOptions = {};
       }
-    } else {
-      _t.setPosition(0);
     }
   };
 
@@ -1430,7 +1211,7 @@ function SoundManager(smURL,smID) {
 	  _s._wD('No width/height given, assuming defaults');
 	  oMetaData.width = 320;
 	  oMetaData.height = 240;
-    }
+    };
     _t.metadata = oMetaData; // potentially-large object from flash
     _t.width = oMetaData.width;
     _t.height = oMetaData.height;
@@ -1448,9 +1229,7 @@ function SoundManager(smURL,smID) {
     window.addEventListener('focus',_s.handleFocus,false);
     window.addEventListener('load',_s.beginDelayedInit,false);
     window.addEventListener('unload',_s.destruct,false);
-    if (_s._tryInitOnFocus) {
-	  window.addEventListener('mousemove',_s.handleFocus,false); // massive Safari focus hack
-	}
+    if (_s._tryInitOnFocus) window.addEventListener('mousemove',_s.handleFocus,false); // massive Safari focus hack
   } else if (window.attachEvent) {
     window.attachEvent('onfocus',_s.handleFocus);
     window.attachEvent('onload',_s.beginDelayedInit);
@@ -1459,13 +1238,10 @@ function SoundManager(smURL,smID) {
     // no add/attachevent support - safe to assume no JS -> Flash either.
     soundManager.onerror();
     soundManager.disable();
-  }
-
-  if (document.addEventListener) {
-	document.addEventListener('DOMContentLoaded',_s.domContentLoaded,false);
-  }
+  };
 
-} // SoundManager()
+  if (document.addEventListener) document.addEventListener('DOMContentLoaded',_s.domContentLoaded,false);
 
-soundManager = new SoundManager();
+}; // SoundManager()
 
+var soundManager = new SoundManager();
diff --git a/telemeta/htdocs/swf/soundmanager2.swf b/telemeta/htdocs/swf/soundmanager2.swf
index e78fafae..98ed98d5 100644
Binary files a/telemeta/htdocs/swf/soundmanager2.swf and b/telemeta/htdocs/swf/soundmanager2.swf differ
diff --git a/telemeta/htdocs/swf/soundmanager2_flash9.swf b/telemeta/htdocs/swf/soundmanager2_flash9.swf
index d10a9e5e..14e45788 100644
Binary files a/telemeta/htdocs/swf/soundmanager2_flash9.swf and b/telemeta/htdocs/swf/soundmanager2_flash9.swf differ