1 files changed, 11 insertions, 5 deletions
diff --git a/Swift/QtUI/QtSoundPlayer.cpp b/Swift/QtUI/QtSoundPlayer.cpp
index 387c6f3..3f3782d 100644
--- a/Swift/QtUI/QtSoundPlayer.cpp
+++ b/Swift/QtUI/QtSoundPlayer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2013 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -9,17 +9,20 @@
 #include <QSound>
 #include <iostream>
 
-#include "SwifTools/Application/ApplicationPathProvider.h"
+#include <SwifTools/Application/ApplicationPathProvider.h>
+#include <QtSwiftUtil.h>
+#include <Swiften/Base/Path.h>
 
 namespace Swift {
 	
 QtSoundPlayer::QtSoundPlayer(ApplicationPathProvider* applicationPathProvider) : applicationPathProvider(applicationPathProvider) {
 }
 
-void QtSoundPlayer::playSound(SoundEffect sound) {
+void QtSoundPlayer::playSound(SoundEffect sound, const std::string& soundResource) {
+
 	switch (sound) {
 		case MessageReceived:
-			playSound("/sounds/message-received.wav");
+			playSound(soundResource.empty() ? "/sounds/message-received.wav" : soundResource);
 			break;
 	}
 }
@@ -27,7 +30,10 @@ void QtSoundPlayer::playSound(SoundEffect sound) {
 void QtSoundPlayer::playSound(const std::string& soundResource) {
 	boost::filesystem::path resourcePath = applicationPathProvider->getResourcePath(soundResource);
 	if (boost::filesystem::exists(resourcePath)) {
-		QSound::play(resourcePath.string().c_str());
+		QSound::play(P2QSTRING(pathToString(resourcePath)));
+	}
+	else if (boost::filesystem::exists(soundResource)) {
+		QSound::play(P2QSTRING(soundResource));
 	}
 	else {
 		std::cerr << "Unable to find sound: " << soundResource << std::endl;