soundmanager-rails 0.1.4 → 0.1.5

data/vendor/assets/javascripts/soundmanager2.js

@@ -8,11 +8,11 @@
  * Code provided under the BSD License:
  * http://schillmania.com/projects/soundmanager2/license.txt
  *
- * V2.97a.20130101
+ * V2.97a.20130512
  */
 
 /*global window, SM2_DEFER, sm2Debugger, console, document, navigator, setTimeout, setInterval, clearInterval, Audio, opera */
-/*jslint regexp: true, sloppy: true, white: true, nomen: true, plusplus: true */
+/*jslint regexp: true, sloppy: true, white: true, nomen: true, plusplus: true, todo: true */
 
 /**
  * About this file
@@ -74,7 +74,8 @@ function SoundManager(smURL, smID) {
     'useHTML5Audio': true,              // use HTML5 Audio() where API is supported (most Safari, Chrome versions), Firefox (no MP3/MP4.) Ideally, transparent vs. Flash API where possible.
     'html5Test': /^(probably|maybe)$/i, // HTML5 Audio() format support test. Use /^probably$/i; if you want to be more conservative.
     'preferFlash': true,                // overrides useHTML5audio. if true and flash support present, will try to use flash for MP3/MP4 as needed since HTML5 audio support is still quirky in browsers.
-    'noSWFCache': false                 // if true, appends ?ts={date} to break aggressive SWF caching.
+    'noSWFCache': false,                // if true, appends ?ts={date} to break aggressive SWF caching.
+    'idPrefix': 'sound'                 // if an id is not provided to createSound(), this prefix is used for generated IDs - 'sound0', 'sound1' etc.
 
   };
 
@@ -166,6 +167,11 @@ function SoundManager(smURL, smID) {
       'required': false
     },
 
+    'opus': {
+      'type': ['audio/ogg; codecs=opus', 'audio/opus'],
+      'required': false
+    },
+
     'wav': {
       'type': ['audio/wav; codecs="1"', 'audio/wav', 'audio/wave', 'audio/x-wav'],
       'required': false
@@ -183,7 +189,7 @@ function SoundManager(smURL, smID) {
 
   // dynamic attributes
 
-  this.versionNumber = 'V2.97a.20130101';
+  this.versionNumber = 'V2.97a.20130512';
   this.version = null;
   this.movieURL = null;
   this.altURL = null;
@@ -260,11 +266,11 @@ function SoundManager(smURL, smID) {
 
   var SMSound,
   sm2 = this, globalHTML5Audio = null, flash = null, sm = 'soundManager', smc = sm + ': ', h5 = 'HTML5::', id, ua = navigator.userAgent, wl = window.location.href.toString(), doc = document, doNothing, setProperties, init, fV, on_queue = [], debugOpen = true, debugTS, didAppend = false, appendSuccess = false, didInit = false, disabled = false, windowLoaded = false, _wDS, wdCount = 0, initComplete, mixin, assign, extraOptions, addOnEvent, processOnEvents, initUserOnload, delayWaitForEI, waitForEI, setVersionInfo, handleFocus, strings, initMovie, preInit, domContentLoaded, winOnLoad, didDCLoaded, getDocument, createMovie, catchError, setPolling, initDebug, debugLevels = ['log', 'info', 'warn', 'error'], defaultFlashVersion = 8, disableObject, failSafely, normalizeMovieURL, oRemoved = null, oRemovedHTML = null, str, flashBlockHandler, getSWFCSS, swfCSS, toggleDebug, loopFix, policyFix, complain, idCheck, waitingForEI = false, initPending = false, startTimer, stopTimer, timerExecute, h5TimerCount = 0, h5IntervalTimer = null, parseURL, messages = [],
-  needsFlash = null, featureCheck, html5OK, html5CanPlay, html5Ext, html5Unload, domContentLoadedIE, testHTML5, event, slice = Array.prototype.slice, useGlobalHTML5Audio = false, lastGlobalHTML5URL, hasFlash, detectFlash, badSafariFix, html5_events, showSupport, flushMessages,
-  is_iDevice = ua.match(/(ipad|iphone|ipod)/i), isAndroid = ua.match(/android/i), isIE = ua.match(/msie/i), isWebkit = ua.match(/webkit/i), isSafari = (ua.match(/safari/i) && !ua.match(/chrome/i)), isOpera = (ua.match(/opera/i)), 
+  canIgnoreFlash, needsFlash = null, featureCheck, html5OK, html5CanPlay, html5Ext, html5Unload, domContentLoadedIE, testHTML5, event, slice = Array.prototype.slice, useGlobalHTML5Audio = false, lastGlobalHTML5URL, hasFlash, detectFlash, badSafariFix, html5_events, showSupport, flushMessages, wrapCallback, idCounter = 0,
+  is_iDevice = ua.match(/(ipad|iphone|ipod)/i), isAndroid = ua.match(/android/i), isIE = ua.match(/msie/i), isWebkit = ua.match(/webkit/i), isSafari = (ua.match(/safari/i) && !ua.match(/chrome/i)), isOpera = (ua.match(/opera/i)), isFirefox = (ua.match(/firefox/i)),
   mobileHTML5 = (ua.match(/(mobile|pre\/|xoom)/i) || is_iDevice || isAndroid),
   isBadSafari = (!wl.match(/usehtml5audio/i) && !wl.match(/sm2\-ignorebadua/i) && isSafari && !ua.match(/silk/i) && ua.match(/OS X 10_6_([3-7])/i)), // Safari 4 and 5 (excluding Kindle Fire, "Silk") occasionally fail to load/play HTML5 audio on Snow Leopard 10.6.3 through 10.6.7 due to bug(s) in QuickTime X and/or other underlying frameworks. :/ Confirmed bug. https://bugs.webkit.org/show_bug.cgi?id=32159
-  hasConsole = (window.console !== _undefined && console.log !== _undefined), isFocused = (doc.hasFocus !== _undefined?doc.hasFocus():null), tryInitOnFocus = (isSafari && (doc.hasFocus === _undefined || !doc.hasFocus())), okToDisable = !tryInitOnFocus, flashMIME = /(mp3|mp4|mpa|m4a|m4b)/i,
+  hasConsole = (window.console !== _undefined && console.log !== _undefined), isFocused = (doc.hasFocus !== _undefined?doc.hasFocus():null), tryInitOnFocus = (isSafari && (doc.hasFocus === _undefined || !doc.hasFocus())), okToDisable = !tryInitOnFocus, flashMIME = /(mp3|mp4|mpa|m4a|m4b)/i, msecScale = 1000,
   emptyURL = 'about:blank', // safe URL to unload, or load nothing from (flash 8 + most HTML5 UAs)
   overHTTP = (doc.location?doc.location.protocol.match(/http/i):null),
   http = (!overHTTP ? 'http:/'+'/' : ''),
@@ -336,14 +342,18 @@ function SoundManager(smURL, smID) {
 
     // special case 1: "Late setup". SM2 loaded normally, but user didn't assign flash URL eg., setup({url:...}) before SM2 init. Treat as delayed init.
 
-    if (noURL && didDCLoaded && options.url !== _undefined) {
-      sm2.beginDelayedInit();
-    }
+    if (options) {
 
-    // special case 2: If lazy-loading SM2 (DOMContentLoaded has already happened) and user calls setup() with url: parameter, try to init ASAP.
+      if (noURL && didDCLoaded && options.url !== _undefined) {
+        sm2.beginDelayedInit();
+      }
+
+      // special case 2: If lazy-loading SM2 (DOMContentLoaded has already happened) and user calls setup() with url: parameter, try to init ASAP.
+
+      if (!didDCLoaded && options.url !== _undefined && doc.readyState === 'complete') {
+        setTimeout(domContentLoaded, 1);
+      }
 
-    if (!didDCLoaded && options.url !== _undefined && doc.readyState === 'complete') {
-      setTimeout(domContentLoaded, 1);
     }
 
     return sm2;
@@ -352,7 +362,7 @@ function SoundManager(smURL, smID) {
 
   this.ok = function() {
 
-    return (needsFlash?(didInit && !disabled):(sm2.useHTML5Audio && sm2.hasHTML5));
+    return (needsFlash ? (didInit && !disabled) : (sm2.useHTML5Audio && sm2.hasHTML5));
 
   };
 
@@ -387,7 +397,7 @@ function SoundManager(smURL, smID) {
     }
 
     if (_url !== _undefined) {
-      // function overloading in JS! :) ..assume simple createSound(id,url) use case
+      // function overloading in JS! :) ..assume simple createSound(id, url) use case
       oOptions = {
         'id': oOptions,
         'url': _url
@@ -399,12 +409,17 @@ function SoundManager(smURL, smID) {
 
     options.url = parseURL(options.url);
 
+    // generate an id, if needed.
+    if (options.id === undefined) {
+      options.id = sm2.setupOptions.idPrefix + (idCounter++);
+    }
+
     // <d>
     if (options.id.toString().charAt(0).match(/^[0-9]$/)) {
       sm2._wD(cs + str('badID', options.id), 2);
     }
 
-    sm2._wD(cs + options.id + ' (' + options.url + ')', 1);
+    sm2._wD(cs + options.id + (options.url ? ' (' + options.url + ')' : ''), 1);
     // </d>
 
     if (idCheck(options.id, true)) {
@@ -429,10 +444,23 @@ function SoundManager(smURL, smID) {
 
     } else {
 
+      if (sm2.html5Only) {
+        sm2._wD(options.id + ': No HTML5 support for this sound, and no Flash. Exiting.');
+        return make();
+      }
+
+      // TODO: Move HTML5/flash checks into generic URL parsing/handling function.
+
+      if (sm2.html5.usingFlash && options.url && options.url.match(/data\:/i)) {
+        // data: URIs not supported by Flash, either.
+        sm2._wD(options.id + ': data: URIs not supported via Flash. Exiting.');
+        return make();
+      }
+
       if (fV > 8) {
         if (options.isMovieStar === null) {
           // attempt to detect MPEG-4 formats
-          options.isMovieStar = !!(options.serverURL || (options.type ? options.type.match(netStreamMimeTypes) : false) || options.url.match(netStreamPattern));
+          options.isMovieStar = !!(options.serverURL || (options.type ? options.type.match(netStreamMimeTypes) : false) || (options.url && options.url.match(netStreamPattern)));
         }
         // <d>
         if (options.isMovieStar) {
@@ -598,30 +626,50 @@ function SoundManager(smURL, smID) {
 
   this.play = function(sID, oOptions) {
 
-    var result = false;
+    var result = null,
+        // legacy function-overloading use case: play('mySound', '/path/to/some.mp3');
+        overloaded = (oOptions && !(oOptions instanceof Object));
 
     if (!didInit || !sm2.ok()) {
       complain(sm + '.play(): ' + str(!didInit?'notReady':'notOK'));
-      return result;
+      return false;
     }
 
-    if (!idCheck(sID)) {
-      if (!(oOptions instanceof Object)) {
-        // overloading use case: play('mySound','/path/to/some.mp3');
+    if (!idCheck(sID, overloaded)) {
+
+      if (!overloaded) {
+        // no sound found for the given ID. Bail.
+        return false;
+      }
+
+      if (overloaded) {
         oOptions = {
           url: oOptions
         };
       }
+
       if (oOptions && oOptions.url) {
-        // overloading use case, create+play: .play('someID',{url:'/path/to.mp3'});
-        sm2._wD(sm + '.play(): attempting to create "' + sID + '"', 1);
+        // overloading use case, create+play: .play('someID', {url:'/path/to.mp3'});
+        sm2._wD(sm + '.play(): Attempting to create "' + sID + '"', 1);
         oOptions.id = sID;
         result = sm2.createSound(oOptions).play();
       }
-      return result;
+
+    } else if (overloaded) {
+
+      // existing sound object case
+      oOptions = {
+        url: oOptions
+      };
+
     }
 
-    return sm2.sounds[sID].play(oOptions);
+    if (result === null) {
+      // default case
+      result = sm2.sounds[sID].play(oOptions);
+    }
+
+    return result;
 
   };
 
@@ -1020,14 +1068,14 @@ function SoundManager(smURL, smID) {
   this.getSoundById = function(sID, _suppressDebug) {
 
     if (!sID) {
-      throw new Error(sm + '.getSoundById(): sID is null/_undefined');
+      return null;
     }
 
     var result = sm2.sounds[sID];
 
     // <d>
     if (!result && !_suppressDebug) {
-      sm2._wD('"' + sID + '" is an invalid sound ID.', 2);
+      sm2._wD(sm + '.getSoundById(): Sound "' + sID + '" not found.', 2);
     }
     // </d>
 
@@ -1118,10 +1166,10 @@ function SoundManager(smURL, smID) {
    * Applies when debugMode = true
    *
    * @param {string} sText The console message
-   * @param {object} sType Optional string: Log type of 'info', 'warn' or 'error', or object (to be dumped)
+   * @param {object} nType Optional log level (number), or object. Number case: Log type/style where 0 = 'info', 1 = 'warn', 2 = 'error'. Object case: Object to be dumped.
    */
 
-  this._writeDebug = function(sText, sType) {
+  this._writeDebug = function(sText, sTypeOrObject) {
 
     // pseudo-private console.log()-style output
     // <d>
@@ -1133,11 +1181,11 @@ function SoundManager(smURL, smID) {
     }
 
     if (hasConsole && sm2.useConsole) {
-      if (sType && typeof sType === 'object') {
+      if (sTypeOrObject && typeof sTypeOrObject === 'object') {
         // object passed; dump to console.
-        console.log(sText, sType);
-      } else if (debugLevels[sType] !== _undefined) {
-        console[debugLevels[sType]](sText);
+        console.log(sText, sTypeOrObject);
+      } else if (debugLevels[sTypeOrObject] !== _undefined) {
+        console[debugLevels[sTypeOrObject]](sText);
       } else {
         console.log(sText);
       }
@@ -1158,19 +1206,19 @@ function SoundManager(smURL, smID) {
       oItem.className = 'sm2-alt';
     }
 
-    if (sType === _undefined) {
-      sType = 0;
+    if (sTypeOrObject === _undefined) {
+      sTypeOrObject = 0;
     } else {
-      sType = parseInt(sType, 10);
+      sTypeOrObject = parseInt(sTypeOrObject, 10);
     }
 
     oItem.appendChild(doc.createTextNode(sText));
 
-    if (sType) {
-      if (sType >= 2) {
+    if (sTypeOrObject) {
+      if (sTypeOrObject >= 2) {
         oItem.style.fontWeight = 'bold';
       }
-      if (sType === 3) {
+      if (sTypeOrObject === 3) {
         oItem.style.color = '#ff3333';
       }
     }
@@ -1231,7 +1279,7 @@ function SoundManager(smURL, smID) {
 
     // <d>
     if (sm2.soundIDs.length) {
-      sm2._wD('Destroying ' + sm2.soundIDs.length + ' SMSound objects...');
+      sm2._wD('Destroying ' + sm2.soundIDs.length + ' SMSound object' + (sm2.soundIDs.length !== 1 ? 's' : '') + '...');
     }
     // </d>
 
@@ -1241,7 +1289,7 @@ function SoundManager(smURL, smID) {
       sm2.sounds[sm2.soundIDs[i]].destruct();
     }
 
-    // trash ze flash
+    // trash ze flash (remove from the DOM)
 
     if (flash) {
 
@@ -1253,8 +1301,6 @@ function SoundManager(smURL, smID) {
 
         oRemoved = flash.parentNode.removeChild(flash);
 
-        _wDS('flRemoved');
-
       } catch(e) {
 
         // Remove failed? May be due to flash blockers silently removing the SWF object/embed node from the DOM. Warn and continue.
@@ -1274,6 +1320,8 @@ function SoundManager(smURL, smID) {
     sm2.soundIDs = [];
     sm2.sounds = {};
 
+    idCounter = 0;
+
     if (!resetEvents) {
       // reset callbacks for onready, ontimeout etc. so that they will fire again on re-init
       for (i in on_queue) {
@@ -1404,7 +1452,7 @@ function SoundManager(smURL, smID) {
 
   SMSound = function(oOptions) {
 
-    var s = this, resetProperties, add_html5_events, remove_html5_events, stop_html5_timer, start_html5_timer, attachOnPosition, onplay_called = false, onPositionItems = [], onPositionFired = 0, detachOnPosition, applyFromTo, lastURL = null, lastHTML5State;
+    var s = this, resetProperties, add_html5_events, remove_html5_events, stop_html5_timer, start_html5_timer, attachOnPosition, onplay_called = false, onPositionItems = [], onPositionFired = 0, detachOnPosition, applyFromTo, lastURL = null, lastHTML5State, urlOmitted;
 
     lastHTML5State = {
       // tracks duration + position (time)
@@ -1436,6 +1484,9 @@ function SoundManager(smURL, smID) {
     // internal HTML5 Audio() object reference
     this._a = null;
 
+    // for flash 8 special-case createSound() without url, followed by load/play with url case
+    urlOmitted = (this.url ? false : true);
+
     /**
      * SMSound() public methods
      * ------------------------
@@ -1492,12 +1543,26 @@ function SoundManager(smURL, smID) {
 
       sm2._wD(s.id + ': load (' + instanceOptions.url + ')');
 
+      if (!instanceOptions.url && !s.url) {
+        sm2._wD(s.id + ': load(): url is unassigned. Exiting.', 2);
+        return s;
+      }
+
+      // <d>
+      if (!s.isHTML5 && fV === 8 && !s.url && !instanceOptions.autoPlay) {
+        // flash 8 load() -> play() won't work before onload has fired.
+        sm2._wD(s.id + ': Flash 8 load() limitation: Wait for onload() before calling play().', 1);
+      }
+      // </d>
+
       if (instanceOptions.url === s.url && s.readyState !== 0 && s.readyState !== 2) {
         _wDS('onURL', 1);
         // if loaded and an onload() exists, fire immediately.
         if (s.readyState === 3 && instanceOptions.onload) {
           // assume success based on truthy duration.
-          instanceOptions.onload.apply(s, [(!!s.duration)]);
+          wrapCallback(s, function() {
+            instanceOptions.onload.apply(s, [(!!s.duration)]);
+          });
         }
         return s;
       }
@@ -1541,7 +1606,8 @@ function SoundManager(smURL, smID) {
           // early HTML5 implementation (non-standard)
           s._a.autobuffer = 'auto';
 
-          // standard
+          // standard property, values: none / metadata / auto
+          // reference: http://msdn.microsoft.com/en-us/library/ie/ff974759%28v=vs.85%29.aspx
           s._a.preload = 'auto';
 
           s._a._called_load = true;
@@ -1558,6 +1624,17 @@ function SoundManager(smURL, smID) {
 
       } else {
 
+        if (sm2.html5Only) {
+          sm2._wD(s.id + ': No flash support. Exiting.');
+          return s;
+        }
+
+        if (s._iO.url && s._iO.url.match(/data\:/i)) {
+          // data: URIs not supported by Flash, either.
+          sm2._wD(s.id + ': data: URIs not supported via Flash. Exiting.');
+          return s;
+        }
+
         try {
           s.isHTML5 = false;
           s._iO = policyFix(loopFix(instanceOptions));
@@ -1614,10 +1691,9 @@ function SoundManager(smURL, smID) {
           if (s._a) {
 
             s._a.pause();
-            html5Unload(s._a, emptyURL);
 
             // update empty URL, too
-            lastURL = emptyURL;
+            lastURL = html5Unload(s._a);
 
           }
 
@@ -1667,7 +1743,6 @@ function SoundManager(smURL, smID) {
       if (!_bFromSM) {
         // ensure deletion from controller
         sm2.destroySound(s.id, true);
-
       }
 
     };
@@ -1681,7 +1756,9 @@ function SoundManager(smURL, smID) {
 
     this.play = function(oOptions, _updatePlayState) {
 
-      var fN, allowMulti, a, onready, startOK = true,
+      var fN, allowMulti, a, onready,
+          audioClone, onended, oncanplay,
+          startOK = true,
           exit = null;
 
       // <d>
@@ -1711,7 +1788,7 @@ function SoundManager(smURL, smID) {
       s.instanceOptions = s._iO;
 
       // RTMP-only
-      if (s._iO.serverURL && !s.connected) {
+      if (!s.isHTML5 && s._iO.serverURL && !s.connected) {
         if (!s.getAutoPlay()) {
           sm2._wD(fN +' Netstream not connected yet - setting autoPlay');
           s.setAutoPlay(true);
@@ -1729,6 +1806,10 @@ function SoundManager(smURL, smID) {
         allowMulti = s._iO.multiShot;
         if (!allowMulti) {
           sm2._wD(fN + 'Already playing (one-shot)', 1);
+          if (s.isHTML5) {
+            // go back to original position.
+            s.setPosition(s._iO.position);
+          }
           exit = s;
         } else {
           sm2._wD(fN + 'Already playing (multi-shot)', 1);
@@ -1741,8 +1822,19 @@ function SoundManager(smURL, smID) {
 
       // edge case: play() with explicit URL parameter
       if (oOptions.url && oOptions.url !== s.url) {
-        // load using merged options
-        s.load(s._iO);
+
+        // special case for createSound() followed by load() / play() with url; avoid double-load case.
+        if (!s.readyState && !s.isHTML5 && fV === 8 && urlOmitted) {
+
+          urlOmitted = false;
+
+        } else {
+
+          // load using merged options
+          s.load(s._iO);
+
+        }
+
       }
 
       if (!s.loaded) {
@@ -1752,13 +1844,22 @@ function SoundManager(smURL, smID) {
           sm2._wD(fN + 'Attempting to load');
 
           // try to get this sound playing ASAP
-          if (!s.isHTML5) {
-            // assign directly because setAutoPlay() increments the instanceCount
+          if (!s.isHTML5 && !sm2.html5Only) {
+
+            // flash: assign directly because setAutoPlay() increments the instanceCount
             s._iO.autoPlay = true;
             s.load(s._iO);
-          } else {
+
+          } else if (s.isHTML5) {
+
             // iOS needs this when recycling sounds, loading a new URL on an existing object.
             s.load(s._iO);
+
+          } else {
+
+            sm2._wD(fN + 'Unsupported type. Exiting.');
+            exit = s;
+
           }
 
           // HTML5 hack - re-set instanceOptions?
@@ -1777,7 +1878,8 @@ function SoundManager(smURL, smID) {
 
       } else {
 
-        sm2._wD(fN);
+        // "play()"
+        sm2._wD(fN.substr(0, fN.lastIndexOf(':')));
 
       }
 
@@ -1857,9 +1959,10 @@ function SoundManager(smURL, smID) {
 
         }
 
-        sm2._wD(fN + 'Starting to play');
+        // sm2._wD(fN + 'Starting to play');
 
-        if (!s.instanceCount || s._iO.multiShotEvents || (!s.isHTML5 && fV > 8 && !s.getAutoPlay())) {
+        // increment instance counter, where enabled + supported
+        if (!s.instanceCount || s._iO.multiShotEvents || (s.isHTML5 && s._iO.multiShot && !useGlobalHTML5Audio) || (!s.isHTML5 && fV > 8 && !s.getAutoPlay())) {
           s.instanceCount++;
         }
 
@@ -1887,13 +1990,13 @@ function SoundManager(smURL, smID) {
 
         if (!s.isHTML5) {
 
-          startOK = flash._start(s.id, s._iO.loops || 1, (fV === 9 ? s._iO.position : s._iO.position / 1000), s._iO.multiShot);
+          startOK = flash._start(s.id, s._iO.loops || 1, (fV === 9 ? s.position : s.position / msecScale), s._iO.multiShot || false);
 
           if (fV === 9 && !startOK) {
             // edge case: no sound hardware, or 32-channel flash ceiling hit.
             // applies only to Flash 9, non-NetStream/MovieStar sounds.
             // http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/flash/media/Sound.html#play%28%29
-            sm2._wD(fN + 'No sound hardware, or 32-sound ceiling hit');
+            sm2._wD(fN + 'No sound hardware, or 32-sound ceiling hit', 2);
             if (s._iO.onplayerror) {
               s._iO.onplayerror.apply(s);
             }
@@ -1902,13 +2005,56 @@ function SoundManager(smURL, smID) {
 
         } else {
 
-          start_html5_timer();
+          if (s.instanceCount < 2) {
+
+            // HTML5 single-instance case
+
+            start_html5_timer();
+
+            a = s._setup_html5();
+
+            s.setPosition(s._iO.position);
+
+            a.play();
+
+          } else {
 
-          a = s._setup_html5();
+            // HTML5 multi-shot case
 
-          s.setPosition(s._iO.position);
+            sm2._wD(s.id + ': Cloning Audio() for instance #' + s.instanceCount + '...');
 
-          a.play();
+            audioClone = new Audio(s._iO.url);
+
+            onended = function() {
+              event.remove(audioClone, 'onended', onended);
+              s._onfinish(s);
+              // cleanup
+              html5Unload(audioClone);
+              audioClone = null;
+            };
+
+            oncanplay = function() {
+              event.remove(audioClone, 'canplay', oncanplay);
+              try {
+                audioClone.currentTime = s._iO.position/msecScale;
+              } catch(err) {
+                complain(s.id + ': multiShot play() failed to apply position of ' + (s._iO.position/msecScale));
+              }
+              audioClone.play();
+            };
+
+            event.add(audioClone, 'ended', onended);
+
+            if (s._iO.position) {
+              // HTML5 audio can't seek before onplay() event has fired.
+              // wait for canplay, then seek to position and start playback.
+              event.add(audioClone, 'canplay', oncanplay);
+            } else {
+              // begin playback at currentTime: 0
+              audioClone.play();
+            }
+
+          }
 
         }
 
@@ -2051,21 +2197,20 @@ function SoundManager(smURL, smID) {
         nMsecOffset = 0;
       }
 
-      var original_pos,
-          position, position1K,
+      var position, position1K,
           // Use the duration from the instance options, if we don't have a track duration yet.
           // position >= 0 and <= current available (loaded) duration
           offset = (s.isHTML5 ? Math.max(nMsecOffset, 0) : Math.min(s.duration || s._iO.duration, Math.max(nMsecOffset, 0)));
 
-      original_pos = s.position;
       s.position = offset;
-      position1K = s.position/1000;
+      position1K = s.position/msecScale;
       s._resetOnPosition(s.position);
       s._iO.position = offset;
 
       if (!s.isHTML5) {
 
         position = (fV === 9 ? s.position : position1K);
+
         if (s.readyState && s.readyState !== 2) {
           // if paused or not playing, will not resume (by playing)
           flash._setPosition(s.id, position, (s.paused || !s.playState), s._iO.multiShot);
@@ -2075,13 +2220,16 @@ function SoundManager(smURL, smID) {
 
         // Set the position in the canplay handler if the sound is not ready yet
         if (s._html5_canplay) {
+
           if (s._a.currentTime !== position1K) {
+
             /**
              * DOM/JS errors/exceptions to watch out for:
              * if seek is beyond (loaded?) position, "DOM exception 11"
              * "INDEX_SIZE_ERR": DOM exception 1
              */
             sm2._wD(s.id + ': setPosition('+position1K+')');
+
             try {
               s._a.currentTime = position1K;
               if (s.playState === 0 || s.paused) {
@@ -2091,19 +2239,25 @@ function SoundManager(smURL, smID) {
             } catch(e) {
               sm2._wD(s.id + ': setPosition(' + position1K + ') failed: ' + e.message, 2);
             }
+
           }
-        } else {
-          sm2._wD(s.id + ': setPosition(' + position1K + '): Cannot seek yet, sound not ready');
-        }
 
-      }
+        } else if (position1K) {
+
+          // warn on non-zero seek attempts
+          sm2._wD(s.id + ': setPosition(' + position1K + '): Cannot seek yet, sound not ready', 2);
+          return s;
+
+        }
 
-      if (s.isHTML5) {
         if (s.paused) {
+
           // if paused, refresh UI right away
           // force update
           s._onTimer(true);
+
         }
+
       }
 
       return s;
@@ -2203,7 +2357,7 @@ function SoundManager(smURL, smID) {
 
       if (s.playState === 0) {
         s.play({
-          position: (fV === 9 && !s.isHTML5 ? s.position : s.position / 1000)
+          position: (fV === 9 && !s.isHTML5 ? s.position : s.position / msecScale)
         });
         return s;
       }
@@ -2647,7 +2801,7 @@ function SoundManager(smURL, smID) {
           // TODO: investigate why this goes wack if not set/re-set each time.
           s.durationEstimate = s.duration;
 
-          time = (s._a.currentTime * 1000 || 0);
+          time = (s._a.currentTime * msecScale || 0);
 
           if (time !== lastHTML5State.time) {
 
@@ -2680,7 +2834,7 @@ function SoundManager(smURL, smID) {
 
       var instanceOptions = s._iO,
           // if audio object exists, use its duration - else, instance option duration (if provided - it's a hack, really, and should be retired) OR null
-          d = (s._a && s._a.duration ? s._a.duration*1000 : (instanceOptions && instanceOptions.duration ? instanceOptions.duration : null)),
+          d = (s._a && s._a.duration ? s._a.duration*msecScale : (instanceOptions && instanceOptions.duration ? instanceOptions.duration : null)),
           result = (d && !isNaN(d) && d !== Infinity ? d : null);
 
       return result;
@@ -2706,9 +2860,9 @@ function SoundManager(smURL, smID) {
 
     this._setup_html5 = function(oOptions) {
 
-      var instanceOptions = mixin(s._iO, oOptions), d = decodeURI,
-          a = useGlobalHTML5Audio ? globalHTML5Audio  : s._a,
-          dURL = d(instanceOptions.url),
+      var instanceOptions = mixin(s._iO, oOptions),
+          a = useGlobalHTML5Audio ? globalHTML5Audio : s._a,
+          dURL = decodeURI(instanceOptions.url),
           sameURL;
 
       /**
@@ -2719,12 +2873,12 @@ function SoundManager(smURL, smID) {
 
       if (useGlobalHTML5Audio) {
 
-        if (dURL === lastGlobalHTML5URL) {
+        if (dURL === decodeURI(lastGlobalHTML5URL)) {
           // global HTML5 audio: re-use of URL
           sameURL = true;
         }
 
-      } else if (dURL === lastURL) {
+      } else if (dURL === decodeURI(lastURL)) {
 
         // options URL is the same as the "last" URL, and we used (loaded) it
         sameURL = true;
@@ -2744,7 +2898,7 @@ function SoundManager(smURL, smID) {
 
             }
 
-          } else if (!useGlobalHTML5Audio && dURL === d(lastURL)) {
+          } else if (!useGlobalHTML5Audio && dURL === decodeURI(lastURL)) {
 
             // non-global HTML5 reuse case: same url, ignore request
             s._apply_loop(a, instanceOptions.loops);
@@ -2889,7 +3043,7 @@ function SoundManager(smURL, smID) {
 
       // <d>
       fN = s.id + ': ';
-      sm2._wD(fN + (loadOK ? 'onload()' : 'Failed to load? - ' + s.url), (loadOK ? 1 : 2));
+      sm2._wD(fN + (loadOK ? 'onload()' : 'Failed to load / invalid sound?' + (!s.duration ? ' Zero-length duration reported.' : ' -') + ' (' + s.url + ')'), (loadOK ? 1 : 2));
       if (!loadOK && !s.isHTML5) {
         if (sm2.sandbox.noRemote === true) {
           sm2._wD(fN + str('noNet'), 1);
@@ -2905,7 +3059,9 @@ function SoundManager(smURL, smID) {
       s._onbufferchange(0);
 
       if (s._iO.onload) {
-        s._iO.onload.apply(s, [loadOK]);
+        wrapCallback(s, function() {
+          s._iO.onload.apply(s, [loadOK]);
+        });
       }
 
       return true;
@@ -3004,7 +3160,9 @@ function SoundManager(smURL, smID) {
           // fire onfinish for last, or every instance
           if (io_onfinish) {
             sm2._wD(s.id + ': onfinish()');
-            io_onfinish.apply(s);
+            wrapCallback(s, function() {
+              io_onfinish.apply(s);
+            });
           }
         }
 
@@ -3278,6 +3436,23 @@ function SoundManager(smURL, smID) {
 
   };
 
+  wrapCallback = function(oSound, callback) {
+
+    /**
+     * 03/03/2013: Fix for Flash Player 11.6.602.171 + Flash 8 (flashVersion = 8) SWF issue
+     * setTimeout() fix for certain SMSound callbacks like onload() and onfinish(), where subsequent calls like play() and load() fail when Flash Player 11.6.602.171 is installed, and using soundManager with flashVersion = 8 (which is the default).
+     * Not sure of exact cause. Suspect race condition and/or invalid (NaN-style) position argument trickling down to the next JS -> Flash _start() call, in the play() case.
+     * Fix: setTimeout() to yield, plus safer null / NaN checking on position argument provided to Flash.
+     * https://getsatisfaction.com/schillmania/topics/recent_chrome_update_seems_to_have_broken_my_sm2_audio_player
+     */
+    if (!oSound.isHTML5 && fV === 8) {
+      window.setTimeout(callback, 0);
+    } else {
+      callback();
+    }
+
+  };
+
   // additional soundManager properties that soundManager.setup() will accept
 
   extraOptions = {
@@ -3562,7 +3737,7 @@ function SoundManager(smURL, smID) {
       s._onbufferchange(0);
 
       // position according to instance options
-      position1K = (s._iO.position !== _undefined && !isNaN(s._iO.position)?s._iO.position/1000:null);
+      position1K = (s._iO.position !== _undefined && !isNaN(s._iO.position)?s._iO.position/msecScale:null);
 
       // set the position if position was set before the sound loaded
       if (s.position && this.currentTime !== position1K) {
@@ -3615,6 +3790,14 @@ function SoundManager(smURL, smID) {
     error: html5_event(function() {
 
       sm2._wD(this._s.id + ': HTML5 error, code ' + this.error.code);
+      /**
+       * HTML5 error codes, per W3C
+       * Error 1: Client aborted download at user's request.
+       * Error 2: Network error after load started.
+       * Error 3: Decoding issue.
+       * Error 4: Media (audio file) not supported.
+       * Reference: http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#error-codes
+       */
       // call load with error state?
       this._s._onload(false);
 
@@ -3649,7 +3832,7 @@ function SoundManager(smURL, smID) {
 
     play: html5_event(function() {
 
-      sm2._wD(this._s.id + ': play()');
+      // sm2._wD(this._s.id + ': play()');
       // once play starts, no buffering
       this._s._onbufferchange(0);
 
@@ -3673,9 +3856,7 @@ function SoundManager(smURL, smID) {
           ranges = e.target.buffered,
           // firefox 3.6 implements e.loaded/total (bytes)
           loaded = (e.loaded||0),
-          total = (e.total||1),
-          // HTML5 returns msec. SM2 API uses seconds for setPosition() etc., whether Flash or HTML5.
-          scale = 1000;
+          total = (e.total||1);
 
       // reset the "buffered" (loaded byte ranges) array
       s.buffered = [];
@@ -3686,25 +3867,26 @@ function SoundManager(smURL, smID) {
         // https://developer.mozilla.org/en/DOM/TimeRanges
 
         // re-build "buffered" array
+        // HTML5 returns seconds. SM2 API uses msec for setPosition() etc., whether Flash or HTML5.
         for (i=0, j=ranges.length; i<j; i++) {
           s.buffered.push({
-            'start': ranges.start(i) * scale,
-            'end': ranges.end(i) * scale
+            'start': ranges.start(i) * msecScale,
+            'end': ranges.end(i) * msecScale
           });
         }
 
         // use the last value locally
-        buffered = (ranges.end(0) - ranges.start(0)) * scale;
+        buffered = (ranges.end(0) - ranges.start(0)) * msecScale;
 
         // linear case, buffer sum; does not account for seeking and HTTP partials / byte ranges
-        loaded = buffered/(e.target.duration*scale);
+        loaded = Math.min(1, buffered/(e.target.duration*msecScale));
 
         // <d>
         if (isProgress && ranges.length > 1) {
           str = [];
           j = ranges.length;
           for (i=0; i<j; i++) {
-            str.push(e.target.buffered.start(i)*scale +'-'+ e.target.buffered.end(i)*scale);
+            str.push(e.target.buffered.start(i)*msecScale +'-'+ e.target.buffered.end(i)*msecScale);
           }
           sm2._wD(this._s.id + ': progress, timeRanges: ' + str.join(', '));
         }
@@ -3780,15 +3962,20 @@ function SoundManager(smURL, smID) {
 
     var result;
 
-    if (iO.serverURL || (iO.type && preferFlashCheck(iO.type))) {
+    if (!iO || (!iO.type && !iO.url && !iO.serverURL)) {
+
+      // nothing to check
+      result = false;
+
+    } else if (iO.serverURL || (iO.type && preferFlashCheck(iO.type))) {
 
       // RTMP, or preferring flash
       result = false;
 
     } else {
 
-      // Use type, if specified. If HTML5-only mode, no other options, so just give 'er
-      result = ((iO.type ? html5CanPlay({type:iO.type}) : html5CanPlay({url:iO.url}) || sm2.html5Only));
+      // Use type, if specified. Pass data: URIs to HTML5. If HTML5-only mode, no other options, so just give 'er
+      result = ((iO.type ? html5CanPlay({type:iO.type}) : html5CanPlay({url:iO.url}) || sm2.html5Only || iO.url.match(/data\:/i)));
 
     }
 
@@ -3796,7 +3983,7 @@ function SoundManager(smURL, smID) {
 
   };
 
-  html5Unload = function(oAudio, url) {
+  html5Unload = function(oAudio) {
 
     /**
      * Internal method: Unload media, and cancel any current/pending network requests.
@@ -3806,13 +3993,19 @@ function SoundManager(smURL, smID) {
      * Other UA behaviour is unclear, so everyone else gets an about:blank-style URL.
      */
 
+    var url;
+
     if (oAudio) {
 
-      // Firefox likes '' for unload (used to work?) - however, may request hosting page URL (bad.) Most other UAs dislike '' and fail to unload.
+      // Firefox likes '' for unload (used to work, but no longer?) - however, may request hosting page URL (bad.) Most other UAs dislike '' and fail to unload.
+      url = (isSafari && !is_iDevice ? null : (isFirefox ? emptyURL : null));
+
       oAudio.src = url;
 
       // reset some state, too
-      oAudio._called_load = false;
+      if (oAudio._called_unload !== undefined) {
+        oAudio._called_load = false;
+      }
 
     }
 
@@ -3823,6 +4016,8 @@ function SoundManager(smURL, smID) {
 
     }
 
+    return url;
+
   };
 
   html5CanPlay = function(o) {
@@ -3906,6 +4101,9 @@ function SoundManager(smURL, smID) {
      */
 
     if (!sm2.useHTML5Audio || !sm2.hasHTML5) {
+      // without HTML5, we need Flash.
+      sm2.html5.usingFlash = true;
+      needsFlash = true;
       return false;
     }
 
@@ -3993,6 +4191,9 @@ function SoundManager(smURL, smID) {
     support.canPlayType = (a?cp:null);
     sm2.html5 = mixin(sm2.html5, support);
 
+    sm2.html5.usingFlash = featureCheck();
+    needsFlash = sm2.html5.usingFlash;
+
     return true;
 
   };
@@ -4012,7 +4213,7 @@ function SoundManager(smURL, smID) {
     waitForever: smc + 'Waiting indefinitely for Flash (will recover if unblocked)...',
     waitSWF: smc + 'Waiting for 100% SWF load...',
     needFunction: smc + 'Function object expected for %s',
-    badID: 'Warning: Sound ID "%s" should be a string, starting with a non-numeric character',
+    badID: 'Sound ID "%s" should be a string, starting with a non-numeric character',
     currentObj: smc + '_debug(): Current sound objects',
     waitOnload: smc + 'Waiting for window.onload()',
     docLoaded: smc + 'Document already loaded',
@@ -4026,7 +4227,6 @@ function SoundManager(smURL, smID) {
     smError: 'SMSound.load(): Exception: JS-Flash communication failed, or JS error.',
     fbTimeout: 'No flash response, applying .'+swfCSS.swfTimedout+' CSS...',
     fbLoaded: 'Flash loaded',
-    flRemoved: smc + 'Flash movie removed.',
     fbHandler: smc + 'flashBlockHandler()',
     manURL: 'SMSound.load(): Using manually-assigned URL',
     onURL: sm + '.load(): current URL already assigned.',
@@ -4101,7 +4301,7 @@ function SoundManager(smURL, smID) {
   complain = function(sMsg) {
 
     // <d>
-    if (console !== _undefined && console.warn !== _undefined) {
+    if (hasConsole && console.warn !== _undefined) {
       console.warn(sMsg);
     } else {
       sm2._wD(sMsg);
@@ -4231,11 +4431,11 @@ function SoundManager(smURL, smID) {
     // starts debug mode, creating output <div> for UAs without console object
 
     // allow force of debug mode via URL
+    // <d>
     if (sm2.debugURLParam.test(wl)) {
       sm2.debugMode = true;
     }
 
-    // <d>
     if (id(sm2.debugID)) {
       return false;
     }
@@ -4339,6 +4539,7 @@ function SoundManager(smURL, smID) {
         sm2Debugger.handleEvent(sEventType, bSuccess, sMessage);
       } catch(e) {
         // oh well
+        return false;
       }
     }
 
@@ -4377,6 +4578,7 @@ function SoundManager(smURL, smID) {
         error = {type:'FLASHBLOCK'};
 
     if (sm2.html5Only) {
+      // no flash, or unused
       return false;
     }
 
@@ -4535,6 +4737,7 @@ function SoundManager(smURL, smID) {
         obj = new AX('ShockwaveFlash.ShockwaveFlash');
       } catch(e) {
         // oh well
+        obj = null;
       }
       hasPlugin = (!!obj);
       // cleanup, because it is ActiveX after all
@@ -4549,9 +4752,8 @@ function SoundManager(smURL, smID) {
 
   featureCheck = function() {
 
-    var needsFlash,
+    var flashNeeded,
         item,
-        result = true,
         formats = sm2.audioFormats,
         // iPhone <= 3.1 has broken HTML5 audio(), but firmware 3.2 (original iPad) + iOS4 works.
         isSpecial = (is_iDevice && !!(ua.match(/os (1|2|3_0|3_1)/i)));
@@ -4564,12 +4766,11 @@ function SoundManager(smURL, smID) {
       // ignore flash case, however
       sm2.html5Only = true;
 
+      // hide the SWF, if present
       if (sm2.oMC) {
         sm2.oMC.style.display = 'none';
       }
 
-      result = false;
-
     } else {
 
       if (sm2.useHTML5Audio) {
@@ -4591,11 +4792,22 @@ function SoundManager(smURL, smID) {
 
     if (sm2.useHTML5Audio && sm2.hasHTML5) {
 
+      // sort out whether flash is optional, required or can be ignored.
+
+      // innocent until proven guilty.
+      canIgnoreFlash = true;
+
       for (item in formats) {
         if (formats.hasOwnProperty(item)) {
-          if ((formats[item].required && !sm2.html5.canPlayType(formats[item].type)) || (sm2.preferFlash && (sm2.flash[item] || sm2.flash[formats[item].type]))) {
-            // flash may be required, or preferred for this format
-            needsFlash = true;
+          if (formats[item].required) {
+            if (!sm2.html5.canPlayType(formats[item].type)) {
+              // 100% HTML5 mode is not possible.
+              canIgnoreFlash = false;
+              flashNeeded = true;
+            } else if (sm2.preferFlash && (sm2.flash[item] || sm2.flash[formats[item].type])) {
+              // flash may be required, or preferred for this format.
+              flashNeeded = true;
+            }
           }
         }
       }
@@ -4604,10 +4816,11 @@ function SoundManager(smURL, smID) {
 
     // sanity check...
     if (sm2.ignoreFlash) {
-      needsFlash = false;
+      flashNeeded = false;
+      canIgnoreFlash = true;
     }
 
-    sm2.html5Only = (sm2.hasHTML5 && sm2.useHTML5Audio && !needsFlash);
+    sm2.html5Only = (sm2.hasHTML5 && sm2.useHTML5Audio && !flashNeeded);
 
     return (!sm2.html5Only);
 
@@ -4675,7 +4888,7 @@ function SoundManager(smURL, smID) {
 
         if (h5IntervalTimer === null && h5TimerCount === 0) {
 
-          h5IntervalTimer = window.setInterval(timerExecute, sm2.html5PollingInterval);
+          h5IntervalTimer = setInterval(timerExecute, sm2.html5PollingInterval);
    
         }
 
@@ -4721,7 +4934,7 @@ function SoundManager(smURL, smID) {
 
       // no active timers, stop polling interval.
 
-      window.clearInterval(h5IntervalTimer);
+      clearInterval(h5IntervalTimer);
 
       h5IntervalTimer = null;
 
@@ -4818,10 +5031,9 @@ function SoundManager(smURL, smID) {
 
   };
 
-  this._externalInterfaceOK = function(flashDate, swfVersion) {
+  this._externalInterfaceOK = function(swfVersion) {
 
     // flash callback confirming flash loaded, EI working etc.
-    // flashDate = approx. timing/delay info for JS/flash bridge
     // swfVersion: SWF build string
 
     if (sm2.swfLoaded) {
@@ -4856,7 +5068,7 @@ function SoundManager(smURL, smID) {
     }
     // </d>
 
-    // slight delay before init
+    // IE needs a larger timeout
     setTimeout(init, isIE ? 100 : 1);
 
   };
@@ -5254,26 +5466,69 @@ function SoundManager(smURL, smID) {
       // give up / time-out, depending
 
       if (!didInit && okToDisable) {
+
         if (p === null) {
+
           // SWF failed. Maybe blocked.
+
           if (sm2.useFlashBlock || sm2.flashLoadTimeout === 0) {
+
             if (sm2.useFlashBlock) {
+
               flashBlockHandler();
+
             }
+
             _wDS('waitForever');
+
           } else {
+
             // no custom flash block handling, but SWF has timed out. Will recover if user unblocks / allows SWF load.
-            _wDS('waitForever');
-            // fire any regular registered ontimeout() listeners.
-            processOnEvents({type:'ontimeout', ignoreInit: true});
+
+            if (!sm2.useFlashBlock && canIgnoreFlash) {
+
+              // special case: try for a reboot with preferFlash: false, if 100% HTML5 mode is possible and useFlashBlock is not enabled.
+
+              window.setTimeout(function() {
+
+                complain(smc + 'useFlashBlock is false, 100% HTML5 mode is possible. Rebooting with preferFlash: false...');
+
+                sm2.setup({
+                  preferFlash: false
+                }).reboot();
+
+                // if for some reason you want to detect this case, use an ontimeout() callback and look for html5Only and didFlashBlock == true.
+                sm2.didFlashBlock = true;
+  
+                sm2.beginDelayedInit();
+
+              }, 1);
+
+            } else {
+
+              _wDS('waitForever');
+
+              // fire any regular registered ontimeout() listeners.
+              processOnEvents({type:'ontimeout', ignoreInit: true});
+
+            }
+
           }
+
         } else {
+
           // flash loaded? Shouldn't be a blocking issue, then.
+
           if (sm2.flashLoadTimeout === 0) {
-             _wDS('waitForever');
+
+            _wDS('waitForever');
+
           } else {
+
             failSafely(true);
+
           }
+
         }
       }
 
@@ -5333,7 +5588,7 @@ function SoundManager(smURL, smID) {
     if (sm2.useHTML5Audio && sm2.hasHTML5) {
       for (item in sm2.audioFormats) {
         if (sm2.audioFormats.hasOwnProperty(item)) {
-          tests.push(item + ' = ' + sm2.html5[item] + (!sm2.html5[item] && hasFlash && sm2.flash[item] ? ' (using flash)' : (sm2.preferFlash && sm2.flash[item] && hasFlash ? ' (preferring flash)': (!sm2.html5[item] ? ' (' + (sm2.audioFormats[item].required ? 'required, ':'') + 'and no flash support)' : ''))));
+          tests.push(item + ' = ' + sm2.html5[item] + (!sm2.html5[item] && needsFlash && sm2.flash[item] ? ' (using flash)' : (sm2.preferFlash && sm2.flash[item] && needsFlash ? ' (preferring flash)': (!sm2.html5[item] ? ' (' + (sm2.audioFormats[item].required ? 'required, ':'') + 'and no flash support)' : ''))));
         }
       }
       sm2._wD('SoundManager 2 HTML5 support: ' + tests.join(', '), 1);
@@ -5530,12 +5785,11 @@ function SoundManager(smURL, smID) {
           a2 = 'sm2-preferflash=',
           b = null, 
           b2 = null,
-          hasCon = (window.console !== _undefined && typeof console.log === 'function'),
           l = wl.toLowerCase();
 
       if (l.indexOf(a) !== -1) {
         b = (l.charAt(l.indexOf(a)+a.length) === '1');
-        if (hasCon) {
+        if (hasConsole) {
           console.log((b?'Enabling ':'Disabling ')+'useHTML5Audio via URL parameter');
         }
         sm2.setup({
@@ -5545,7 +5799,7 @@ function SoundManager(smURL, smID) {
 
       if (l.indexOf(a2) !== -1) {
         b2 = (l.charAt(l.indexOf(a2)+a2.length) === '1');
-        if (hasCon) {
+        if (hasConsole) {
           console.log((b2?'Enabling ':'Disabling ')+'preferFlash via URL parameter');
         }
         sm2.setup({
@@ -5567,8 +5821,6 @@ function SoundManager(smURL, smID) {
     }
 
     testHTML5();
-    sm2.html5.usingFlash = featureCheck();
-    needsFlash = sm2.html5.usingFlash;
 
     if (!hasFlash && needsFlash) {
       messages.push(strings.needFlash);