Add minmax in Qt project, fixed small issue in later qtMultimedia code

This commit is contained in:
xawotihs
2014-08-08 18:08:13 +02:00
parent 656ab78cf5
commit 33760f4066
2 changed files with 9 additions and 3 deletions

View File

@@ -67,7 +67,9 @@ void JMusic::seekAtTheBegining()
//////////////////////////////////////////////////////////////////////////
JSample::JSample()
#ifdef USE_PHONON
#ifdef QT_CONFIG
: effect(0)
#elif (defined USE_PHONON)
: mOutput(0), mMediaObject(0)
#endif
{
@@ -77,9 +79,11 @@ JSample::JSample()
JSample::~JSample()
{
#ifdef QT_CONFIG
if(effect)
if(effect) {
delete effect;
#elif USE_PHONON
effect = 0;
}
#elif (defined USE_PHONON)
if(mOutput)
delete mOutput;
if(mMediaObject)

View File

@@ -59,6 +59,7 @@ SOURCES += \
src/AIMomirPlayer.cpp\
src/AIPlayer.cpp\
src/AIPlayerBaka.cpp\
src/AIPlayerMinMax.cpp\
src/AIStats.cpp\
src/AllAbilities.cpp\
src/CardDescriptor.cpp\
@@ -177,6 +178,7 @@ HEADERS += \
include/AIHints.h\
include/AIPlayerBaka.h\
include/AIPlayerBakaB.h\
include/AIPlayerMinMax.h\
include/DeckEditorMenu.h\
include/WResourceManagerImpl.h\
include/DeckMenu.h\