> now not allowed at end of urls

[irc/quakenet/qwebirc.git] / js / sound.js

diff --git a/js/sound.js b/js/sound.js
index b23762da6a2b2acd9da124def88cef10197fb2a8..08316ae731bdb6cd549724bd8602b7d6e4f8aa64 100644 (file)
--- a/js/sound.js
+++ b/js/sound.js
@@ -28,15 +28,12 @@ qwebirc.sound.SoundPlayer = new Class({
       return;
     }
     
-    qwebirc.util.importJS("/js/soundmanager2.js", "soundManager", function() {
-      soundManager.url = "/sound/";
+    var debugMode = false;
+    qwebirc.util.importJS(qwebirc.global.staticBaseURL + "js/" + (debugMode?"soundmanager2":"soundmanager2-nodebug-jsmin") + ".js", "soundManager", function() {
+      soundManager.url = qwebirc.global.staticBaseURL + "sound/";
       
-      /* Fixes Firefox z-index Flash bug */
-      if(Browser.Engine.gecko)
-        soundManager.useHighPerformance = false;
-        
-      soundManager.debugMode = false;
-      soundManager.useConsole = false;
+      soundManager.debugMode = debugMode;
+      soundManager.useConsole = debugMode;
       soundManager.onload = function() {
         this.loadedSWF = true;
         this.fireEvent("ready");
@@ -45,14 +42,22 @@ qwebirc.sound.SoundPlayer = new Class({
     }.bind(this));
   },
   createSound: function(name, src) {
-    soundManager.createSound(name, src);
+    try {
+      soundManager.createSound(name, src);
+    } catch(e) {
+      /* ignore... flashblock triggers this */
+    }
   },
   playSound: function(name) {
-    soundManager.play(name);
+    try {
+      soundManager.play(name);
+    } catch(e) {
+      /* ignore... */
+    }
   },
   beep: function() {
     if(!this.beepLoaded) {
-      this.createSound("beep", "/sound/beep.mp3");
+      this.createSound("beep", qwebirc.global.staticBaseURL + "sound/beep3.mp3");
       this.beepLoaded = true;
     }
     this.playSound("beep");