Add minmax in Qt project, fixed small issue in later qtMultimedia code
This commit is contained in:
@@ -67,7 +67,9 @@ void JMusic::seekAtTheBegining()
|
|||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
JSample::JSample()
|
JSample::JSample()
|
||||||
#ifdef USE_PHONON
|
#ifdef QT_CONFIG
|
||||||
|
: effect(0)
|
||||||
|
#elif (defined USE_PHONON)
|
||||||
: mOutput(0), mMediaObject(0)
|
: mOutput(0), mMediaObject(0)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
@@ -77,9 +79,11 @@ JSample::JSample()
|
|||||||
JSample::~JSample()
|
JSample::~JSample()
|
||||||
{
|
{
|
||||||
#ifdef QT_CONFIG
|
#ifdef QT_CONFIG
|
||||||
if(effect)
|
if(effect) {
|
||||||
delete effect;
|
delete effect;
|
||||||
#elif USE_PHONON
|
effect = 0;
|
||||||
|
}
|
||||||
|
#elif (defined USE_PHONON)
|
||||||
if(mOutput)
|
if(mOutput)
|
||||||
delete mOutput;
|
delete mOutput;
|
||||||
if(mMediaObject)
|
if(mMediaObject)
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ SOURCES += \
|
|||||||
src/AIMomirPlayer.cpp\
|
src/AIMomirPlayer.cpp\
|
||||||
src/AIPlayer.cpp\
|
src/AIPlayer.cpp\
|
||||||
src/AIPlayerBaka.cpp\
|
src/AIPlayerBaka.cpp\
|
||||||
|
src/AIPlayerMinMax.cpp\
|
||||||
src/AIStats.cpp\
|
src/AIStats.cpp\
|
||||||
src/AllAbilities.cpp\
|
src/AllAbilities.cpp\
|
||||||
src/CardDescriptor.cpp\
|
src/CardDescriptor.cpp\
|
||||||
@@ -177,6 +178,7 @@ HEADERS += \
|
|||||||
include/AIHints.h\
|
include/AIHints.h\
|
||||||
include/AIPlayerBaka.h\
|
include/AIPlayerBaka.h\
|
||||||
include/AIPlayerBakaB.h\
|
include/AIPlayerBakaB.h\
|
||||||
|
include/AIPlayerMinMax.h\
|
||||||
include/DeckEditorMenu.h\
|
include/DeckEditorMenu.h\
|
||||||
include/WResourceManagerImpl.h\
|
include/WResourceManagerImpl.h\
|
||||||
include/DeckMenu.h\
|
include/DeckMenu.h\
|
||||||
|
|||||||
Reference in New Issue
Block a user