From 40d35626023f12d8ebea3a53672968b1b80f5974 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Thu, 6 Aug 2009 19:00:54 +0000
Subject: Conditional includes to get the QtSoundPlayer to compile on Ubuntu.


diff --git a/Swift/QtUI/QtSoundPlayer.cpp b/Swift/QtUI/QtSoundPlayer.cpp
index 5dd3db3..4aa6b8e 100644
--- a/Swift/QtUI/QtSoundPlayer.cpp
+++ b/Swift/QtUI/QtSoundPlayer.cpp
@@ -1,8 +1,12 @@
 #include "QtSoundPlayer.h"
 
+#ifdef Q_WS_X11
+#include "mediaobject.h"
+#include "audiooutput.h"
+#else
 #include <phonon/MediaObject>
 #include <phonon/AudioOutput>
-
+#endif
 
 namespace Swift{
 	
@@ -33,4 +37,4 @@ void QtSoundPlayer::handleFinished() {
 	messageReceived_->stop();
 }
 
-}
\ No newline at end of file
+}
-- 
cgit v0.10.2-6-g49f6