From 7f4352dd9796ace45eaaee3b065bfaeb285eb363 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sun, 20 Jun 2010 11:43:54 +0000
Subject: fixed conflicts with audio effects, fixed build (Closes issue 335)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1782 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/CMakeLists.txt | 4 ++--
 src/qmmp/qmmpaudioengine.cpp     | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/plugins/Input/CMakeLists.txt b/src/plugins/Input/CMakeLists.txt
index 2d2ca0a49..fee5e2e32 100644
--- a/src/plugins/Input/CMakeLists.txt
+++ b/src/plugins/Input/CMakeLists.txt
@@ -47,9 +47,9 @@ IF(USE_MODPLUG)
 add_subdirectory(modplug)
 ENDIF(USE_MODPLUG)
 
-IF(USE_AAC)
+IF(USE_AAC AND TAGLIB_FOUND)
 add_subdirectory(aac)
-ENDIF(USE_AAC)
+ENDIF(USE_AAC AND TAGLIB_FOUND)
 
 IF(USE_CUE)
 add_subdirectory(cue)
diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index ea84f7f75..bc5f91466 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -175,6 +175,15 @@ void QmmpAudioEngine::setEQEnabled(bool on)
 
 void QmmpAudioEngine::addEffect(EffectFactory *factory)
 {
+    foreach(Effect *effect, m_effects)
+    {
+        if(effect->factory() == factory)
+        {
+            qWarning("QmmpAudioEngine: effect %s already exists",
+                     qPrintable(factory->properties().shortName));
+            return;
+        }
+    }
     if(m_output && m_output->isRunning())
     {
         Effect *effect = factory->create();
-- 
cgit v1.2.3-13-gbd6f