From 3b4cf06be15e92cf3addc2298469f590d0e624d1 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 2 Jan 2010 11:49:15 +0000
Subject: fixed segfault with 6-channel files

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1470 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/qmmp/qmmpaudioengine.cpp | 2 +-
 src/ui/mainvisual.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index 1f3b8b2f8..aa99cea58 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -318,7 +318,7 @@ qint64 QmmpAudioEngine::produceSound(char *data, qint64 size, quint32 brate, int
             init_iir();
             m_eqInited = TRUE;
         }
-        iir((void*) data, sz, chan);
+        iir((void*) data, sz, chan > 2 ? 2 : chan);
     }
     char *out_data = data;
     char *prev_data = data;
diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp
index a0a64982b..77c1f3acc 100644
--- a/src/ui/mainvisual.cpp
+++ b/src/ui/mainvisual.cpp
@@ -110,7 +110,7 @@ void MainVisual::add (Buffer *b, unsigned long w, int c, int p)
         len = 512;
     cnt = len;
 
-    if (c == 2)
+    if (c >= 2)
     {
         l = new short[len];
         r = new short[len];
-- 
cgit v1.2.3-13-gbd6f