Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed console with Qtmultimedia

Browse Source
This commit is contained in:
xawotihs
2014-08-03 12:20:45 +02:00
parent 7560db571c
commit d7628b3eb2
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
JGE/include/JSoundSystem.h
View File

@@ -25,7 +25,7 @@
#elif defined USE_PHONON #elif defined USE_PHONON
#include <phonon/AudioOutput> #include <phonon/AudioOutput>
#include <phonon/MediaObject> #include <phonon/MediaObject>
#elif defined QT_CONFIG #elif (defined QT_CONFIG)
#include "QMediaPlayer" #include "QMediaPlayer"
#include "QMediaPlaylist" #include "QMediaPlaylist"
#include "QSoundEffect" #include "QSoundEffect"
@@ -86,7 +86,7 @@ public slots:
SLPlayItf playInterface; SLPlayItf playInterface;
SLSeekItf seekInterface; SLSeekItf seekInterface;
SLVolumeItf musicVolumeInterface; SLVolumeItf musicVolumeInterface;
#elif defined QT_CONFIG #elif (defined QT_CONFIG)
QMediaPlaylist* playlist; QMediaPlaylist* playlist;
QMediaPlayer* player; QMediaPlayer* player;
string fullpath; string fullpath;
@@ -105,7 +105,7 @@ public:
~JSample(); ~JSample();
unsigned long fileSize(); unsigned long fileSize();
#ifdef QT_CONFIG #if (defined QT_CONFIG)
QMediaPlayer* effect; QMediaPlayer* effect;
// QSoundEffect effect; // QSoundEffect effect;
void* mSample; void* mSample;

3
projects/mtg/wagic-qt.pro
View File

@@ -5,7 +5,7 @@ addExclusiveBuilds(graphics, Graphics, console, Console)
INCLUDEPATH += ../../JGE/include/qt INCLUDEPATH += ../../JGE/include/qt
CONFIG(console, graphics|console){ CONFIG(console, graphics|console){
QT += core network QT += core network multimedia
QT -= gui QT -= gui
DEFINES += CONSOLE_CONFIG DEFINES += CONSOLE_CONFIG
@@ -55,6 +55,7 @@ else:CONFIG(console, graphics|console){
SOURCES += \ SOURCES += \
../../JGE/src/OutputCapturer.cpp\ ../../JGE/src/OutputCapturer.cpp\
../../JGE/src/pc/JSfx.cpp\
../../JGE/src/JGfx-fake.cpp\ ../../JGE/src/JGfx-fake.cpp\
../../JGE/src/Qtconsole.cpp\ ../../JGE/src/Qtconsole.cpp\
} }