Fixed console with Qtmultimedia
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
#elif defined USE_PHONON
|
||||
#include <phonon/AudioOutput>
|
||||
#include <phonon/MediaObject>
|
||||
#elif defined QT_CONFIG
|
||||
#elif (defined QT_CONFIG)
|
||||
#include "QMediaPlayer"
|
||||
#include "QMediaPlaylist"
|
||||
#include "QSoundEffect"
|
||||
@@ -86,7 +86,7 @@ public slots:
|
||||
SLPlayItf playInterface;
|
||||
SLSeekItf seekInterface;
|
||||
SLVolumeItf musicVolumeInterface;
|
||||
#elif defined QT_CONFIG
|
||||
#elif (defined QT_CONFIG)
|
||||
QMediaPlaylist* playlist;
|
||||
QMediaPlayer* player;
|
||||
string fullpath;
|
||||
@@ -105,7 +105,7 @@ public:
|
||||
~JSample();
|
||||
|
||||
unsigned long fileSize();
|
||||
#ifdef QT_CONFIG
|
||||
#if (defined QT_CONFIG)
|
||||
QMediaPlayer* effect;
|
||||
// QSoundEffect effect;
|
||||
void* mSample;
|
||||
|
||||
@@ -5,7 +5,7 @@ addExclusiveBuilds(graphics, Graphics, console, Console)
|
||||
|
||||
INCLUDEPATH += ../../JGE/include/qt
|
||||
CONFIG(console, graphics|console){
|
||||
QT += core network
|
||||
QT += core network multimedia
|
||||
QT -= gui
|
||||
|
||||
DEFINES += CONSOLE_CONFIG
|
||||
@@ -55,6 +55,7 @@ else:CONFIG(console, graphics|console){
|
||||
|
||||
SOURCES += \
|
||||
../../JGE/src/OutputCapturer.cpp\
|
||||
../../JGE/src/pc/JSfx.cpp\
|
||||
../../JGE/src/JGfx-fake.cpp\
|
||||
../../JGE/src/Qtconsole.cpp\
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user