aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-03-19 09:05:34 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-03-19 09:05:34 +0000
commit0eb8b3e53cffff43a749cfb6b00f75ce442e0d86 (patch)
tree3f5199d7d39dc4f90bb118554d5e78111225f21d /src
parent7a0bad5619cfefc986a54ab1246559fb7f3c8f54 (diff)
downloadqmmp-0eb8b3e53cffff43a749cfb6b00f75ce442e0d86.tar.gz
qmmp-0eb8b3e53cffff43a749cfb6b00f75ce442e0d86.tar.bz2
qmmp-0eb8b3e53cffff43a749cfb6b00f75ce442e0d86.zip
fixed SRC plugin regression, increased buffer size
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@861 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
-rw-r--r--src/plugins/Effect/srconverter/srconverter.cpp7
-rw-r--r--src/plugins/Effect/srconverter/srconverter.h1
-rw-r--r--src/qmmp/constants.h2
3 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/Effect/srconverter/srconverter.cpp b/src/plugins/Effect/srconverter/srconverter.cpp
index f6523ccd8..ca871e409 100644
--- a/src/plugins/Effect/srconverter/srconverter.cpp
+++ b/src/plugins/Effect/srconverter/srconverter.cpp
@@ -99,7 +99,6 @@ ulong SRConverter::process(char *in_data, const ulong size, char **out_data)
void SRConverter::configure(quint32 freq, int chan, int res)
{
- Effect::configure(freq, chan, res);
freeSRC();
uint rate = freq;
{
@@ -112,11 +111,7 @@ void SRConverter::configure(quint32 freq, int chan, int res)
else
qDebug("SRConverter: src_new(): %s", src_strerror(m_srcError));
}
-}
-
-quint32 SRConverter::sampleRate()
-{
- return m_overSamplingFs;
+ Effect::configure(m_overSamplingFs, chan, res);
}
void SRConverter::freeSRC()
diff --git a/src/plugins/Effect/srconverter/srconverter.h b/src/plugins/Effect/srconverter/srconverter.h
index 2258e6594..e596c693a 100644
--- a/src/plugins/Effect/srconverter/srconverter.h
+++ b/src/plugins/Effect/srconverter/srconverter.h
@@ -41,7 +41,6 @@ public:
ulong process(char *in_data, const ulong size, char **out_data);
void configure(quint32 freq, int chan, int res);
- quint32 sampleRate();
private:
void freeSRC();
diff --git a/src/qmmp/constants.h b/src/qmmp/constants.h
index 494e75f47..fc31b4664 100644
--- a/src/qmmp/constants.h
+++ b/src/qmmp/constants.h
@@ -7,7 +7,7 @@
const unsigned int historySize = 100;
const unsigned int globalBlockSize = 2 * 1024; //2*1024
-const unsigned int globalBufferSize = globalBlockSize * 32;
+const unsigned int globalBufferSize = globalBlockSize * 128;
const unsigned int groupOpenTimeout = 750;
#endif // CONSTANTS_H