load sounds on demand, refactored sounds

public/src/modules/sounds.js

@@ -1,103 +1,72 @@
 "use strict";
-/* global define, socket */
+/* global define, socket, config */
 
 define(['buzz'], function(buzz) {
 	var	Sounds = {};
 
-	Sounds.initialised = false;
+	var loadedSounds = {};
-	Sounds.loaded = {};
+	var eventSoundMapping = {};
-	Sounds.mapping = {};
+	var files = {};
-
-	Sounds.init = function(callback) {
-		var	ready = false,
-			onComplete = function() {
-				Sounds.initialised = true;
-				if (typeof callback === 'function') {
-					callback();
-				}
-			};
-
-		loadFiles(function() {
-			if (ready) {
-				onComplete();
-			} else {
-				ready = true;
-			}
-		});
 
-		loadMapping(function() {
+	loadFiles();
-			if (ready) {
-				onComplete();
-			} else {
-				ready = true;
-			}
-		});
 
-		// Listen for reload message
+	loadMapping();
-		socket.on('event:sounds.reloadMapping', function() {
+
-			loadMapping();
+	socket.on('event:sounds.reloadMapping', loadMapping);
-		});
-	};
 
-	var	loadFiles = function(callback) {
+	function loadFiles() {
 		socket.emit('modules.sounds.getSounds', function(err, sounds) {
 			if (err) {
 				return console.log('[sounds] Could not initialise!');
 			}
 
-			for(var name in sounds) {
+			files = sounds;
-				if (sounds.hasOwnProperty(name)) {
-					var	path = sounds[name];
-
-					Sounds.loaded[name] = new buzz.sound(path);
-				}
-			}
-
-			callback();
 		});
-	};
+	}
 
-	var	loadMapping = function(callback) {
+	function loadMapping() {
 		socket.emit('modules.sounds.getMapping', function(err, mapping) {
-			Sounds.mapping = mapping;
+			if (err) {
-			if (typeof callback === 'function') {
+				return console.log('[sounds] Could not load sound mapping!');
-				callback();
 			}
+			eventSoundMapping = mapping;
 		});
-	};
+	}
+
+	function isSoundLoaded(fileName) {
+		return loadedSounds[fileName];
+	}
+
+	function loadFile(fileName, callback) {
+		if (isSoundLoaded(fileName)) {
+			return callback();
+		}
+
+		loadedSounds[fileName] = new buzz.sound(files[fileName]);
+		callback();
+	}
 
 	Sounds.play = function(name) {
 		if (!config.notificationSounds) {
 			return;
 		}
-		var	ready = function() {
+
-				if (Sounds.mapping[name] && Sounds.loaded[Sounds.mapping[name]]) {
+		Sounds.playFile(eventSoundMapping[name]);
-					Sounds.loaded[Sounds.mapping[name]].play();
-				} else {
-					console.log('[sounds] Not found:', name);
-				}
-			};
-
-		if (!this.initialised) {
-			this.init(ready);
-		} else {
-			ready();
-		}
 	};
 
 	Sounds.playFile = function(fileName) {
-		var	ready = function() {
+		function play() {
-				if (Sounds.loaded[fileName]) {
+			if (loadedSounds[fileName]) {
-					Sounds.loaded[fileName].play();
+				loadedSounds[fileName].play();
-				} else {
+			} else {
-					console.log('[sounds] Not found:', name);
+				console.log('[sounds] Not found:', fileName);
-				}
+			}
-			};
+		}
-
+
-		if (!this.initialised) {
+		if (isSoundLoaded(fileName)) {
-			this.init(ready);
+			play();
 		} else {
-			ready();
+			loadFile(fileName, play);
 		}
 	};