summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2009-08-06 19:00:54 (GMT)
committerKevin Smith <git@kismith.co.uk>2009-08-06 19:00:54 (GMT)
commit40d35626023f12d8ebea3a53672968b1b80f5974 (patch)
tree932eb41f5f6c642d2ade8be331190af7b7645704 /Swift/QtUI
parent15e67b8dc1d2ddcbbf84eb5a50681c68012e3250 (diff)
downloadswift-contrib-40d35626023f12d8ebea3a53672968b1b80f5974.zip
swift-contrib-40d35626023f12d8ebea3a53672968b1b80f5974.tar.bz2
Conditional includes to get the QtSoundPlayer to compile on Ubuntu.
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtSoundPlayer.cpp8
1 files changed, 6 insertions, 2 deletions
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
+}