Merge pull request #201 from mjtko/feature/updated-mention-sound

Updated mention sound - now works cross-browser
kandanapp · Mar 9, 2013 · 374e568 · 374e568
2 parents 7530273 + f2240b0
commit 374e568
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/app/assets/javascripts/backbone/plugins/music_player.js.coffee b/app/assets/javascripts/backbone/plugins/music_player.js.coffee
@@ -9,7 +9,7 @@ class Kandan.Plugins.MusicPlayer
   @localSongData: false
   @sounds: {
     channel: 'ding.wav'
-    attention: 'gong.mp3'
+    attention: 'threetone-alert.wav'
   }
 
   @playTemplate:   _.template('<strong><a class="audio-play">playing</a> <a target="_blank" href="<%- url %>"><%- url %></a></strong>')
@@ -117,10 +117,8 @@ class Kandan.Plugins.MusicPlayer
 
   @localSounds: (name) ->
     sounds = {
-      'claps'  : @localFileUrl('golfclap.mp3')
-      'cheers' : @localFileUrl('cheers.mp3')
-      'ding'   : @localFileUrl('ding.wav')
-      'gong'   : @localFileUrl('gong.mp3')
+      'threetone-alert'  : @localFileUrl('threetone-alert.wav')
+      'ding'             : @localFileUrl('ding.wav')
       }
 
     sounds[name]
@@ -174,6 +172,7 @@ class Kandan.Plugins.MusicPlayer
       @unmute(channelId)
 
   @playAudioNotice: (type)->
+    console.log "told to play for: #{type}"
     sound  = @sounds[type] || 'ding.wav'
     url    = @localFileUrl(sound)
     player = $('.audio_private')[0]

diff --git a/public/sounds/cheers.mp3 b/public/sounds/cheers.mp3
diff --git a/public/sounds/golfclap.mp3 b/public/sounds/golfclap.mp3
diff --git a/public/sounds/gong.mp3 b/public/sounds/gong.mp3
diff --git a/public/sounds/threetone-alert.wav b/public/sounds/threetone-alert.wav