diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-10-06 07:50:56 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-10-06 07:50:56 +0000 |
| commit | 76f436c36cdec74e73c12cea8d81051a7d75ec96 (patch) | |
| tree | 03fe155b5311f6dccbf0dfb2a9cb0954484a138c /src/plugins/Effect | |
| parent | 67e825df80708f31daf7a4f4cd6045ecf010efa6 (diff) | |
| download | qmmp-76f436c36cdec74e73c12cea8d81051a7d75ec96.tar.gz qmmp-76f436c36cdec74e73c12cea8d81051a7d75ec96.tar.bz2 qmmp-76f436c36cdec74e73c12cea8d81051a7d75ec96.zip | |
added multichannel support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4530 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Effect')
| -rw-r--r-- | src/plugins/Effect/Effect.pro | 6 | ||||
| -rw-r--r-- | src/plugins/Effect/srconverter/srconverter.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/Effect/srconverter/srconverter.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/Effect/Effect.pro b/src/plugins/Effect/Effect.pro index 336647a4b..b073f08f3 100644 --- a/src/plugins/Effect/Effect.pro +++ b/src/plugins/Effect/Effect.pro @@ -1,15 +1,15 @@ include (../../../qmmp.pri) TEMPLATE = subdirs -SUBDIRS += crossfade stereo +#SUBDIRS += crossfade stereo contains(CONFIG, BS2B_PLUGIN){ -SUBDIRS += bs2b +#SUBDIRS += bs2b } unix { SUBDIRS += srconverter contains(CONFIG, LADSPA_PLUGIN){ - SUBDIRS += ladspa +# SUBDIRS += ladspa } } diff --git a/src/plugins/Effect/srconverter/srconverter.cpp b/src/plugins/Effect/srconverter/srconverter.cpp index fcd77bc04..324dbb051 100644 --- a/src/plugins/Effect/srconverter/srconverter.cpp +++ b/src/plugins/Effect/srconverter/srconverter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2013 by Ilya Kotov * + * Copyright (C) 2007-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -115,12 +115,12 @@ void SRConverter::applyEffect(Buffer *b) } } -void SRConverter::configure(quint32 freq, int chan, Qmmp::AudioFormat format) +void SRConverter::configure(quint32 freq, ChannelMap map, Qmmp::AudioFormat format) { freeSRC(); if(freq != m_overSamplingFs && format != Qmmp::PCM_S8) { - m_src_state = src_new(m_converter_type, chan, &m_srcError); + m_src_state = src_new(m_converter_type, map.count(), &m_srcError); if (m_src_state) { m_src_data.src_ratio = (float)m_overSamplingFs/(float)freq; @@ -129,7 +129,7 @@ void SRConverter::configure(quint32 freq, int chan, Qmmp::AudioFormat format) else qDebug("SRConverter: src_new(): %s", src_strerror(m_srcError)); } - Effect::configure(m_overSamplingFs, chan, format); + Effect::configure(m_overSamplingFs, map, format); m_sz = audioParameters().sampleSize(); } diff --git a/src/plugins/Effect/srconverter/srconverter.h b/src/plugins/Effect/srconverter/srconverter.h index f25ebc491..b214c866f 100644 --- a/src/plugins/Effect/srconverter/srconverter.h +++ b/src/plugins/Effect/srconverter/srconverter.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2013 by Ilya Kotov * + * Copyright (C) 2007-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -34,7 +34,7 @@ public: virtual ~SRConverter(); void applyEffect(Buffer *b); - void configure(quint32 freq, int chan, Qmmp::AudioFormat format); + void configure(quint32 freq, ChannelMap map, Qmmp::AudioFormat format); private: void freeSRC(); |