From bded6e41c24835a0cb75d09e1e3fcfc5e96056b3 Mon Sep 17 00:00:00 2001
From: chee <chee@snaek.org>
Date: Sat, 17 Aug 2013 18:24:32 +0100
Subject: [PATCH] replace mediaelement with soundmanager2

---
 app/scripts/main.js | 8 ++++++--
 bower.json          | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/scripts/main.js b/app/scripts/main.js
index 7966bf4..64aae9e 100644
--- a/app/scripts/main.js
+++ b/app/scripts/main.js
@@ -7,8 +7,9 @@ require.config({
 		es5shim: "bower_components/es5-shim/es5-shim",
 		lodash: "bower_components/lodash/lodash",
 		text: "bower_components/requirejs-text/text",
-//		soundmanager: "bower_components/soundmanager/soundmanager2",
+		soundmanager: "bower_components/soundmanager/script/soundmanager2",
 		app: "scripts/app",
+		flight: "bower_components/flight/lib/index"
 	},
 	map: {
 		"*": {
@@ -17,12 +18,15 @@ require.config({
 		
 	},
 	shim: {
-		"bower_components/flight/lib/index": {
+		flight: {
 			deps: [ "jquery", "es5shim" ]
 		},
 		app: {
 			deps: [ "bower_components/flight/lib/index" ]
 		},
+		mediaelement: {
+			deps: [ "jquery" ]
+		}
 	}
 
 });
diff --git a/bower.json b/bower.json
index 20f4ff7..6c0c5d5 100644
--- a/bower.json
+++ b/bower.json
@@ -11,7 +11,7 @@
     "lodash": "~1.3.1",
     "requirejs-text": "~2.0.10",
     "soundcloud": "~0.1.0",
-    "mediaelement": "~2.13.1"
+    "soundmanager": "*"
   },
   "devDependencies": {}
 }