Cleaned Phonon vs QtMultimedia config

2014-01-31 21:53:27 +01:00
parent 18383579e9
commit 5d7667dc01
2 changed files with 6 additions and 6 deletions
--- a/JGE/include/JSoundSystem.h
+++ b/JGE/include/JSoundSystem.h
@@ -25,6 +25,10 @@
 #elif defined USE_PHONON
 #include <phonon/AudioOutput>
 #include <phonon/MediaObject>
+#elif defined QT_CONFIG
+#include "QMediaPlayer"
+#include "QMediaPlaylist"
+#include "QSoundEffect"
 #elif defined WIN32
 #include <windows.h>
 #define WITH_FMOD
@@ -41,10 +45,6 @@

 #include "JAudio.h"
 #include "JMP3.h"
-#elif defined QT_CONFIG
-#include "QMediaPlayer"
-#include "QMediaPlaylist"
-#include "QSoundEffect"
 #endif

 #ifdef WITH_FMOD