summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2011-12-14 01:43:24 +0200
committerLaszlo Papp <ext-laszlo.papp@nokia.com>2011-12-14 01:43:24 +0200
commit3a36ac4486aa1e2db6e4aceac2c5cfcfea871ed8 (patch)
tree245391e644aabee6c806b6ec6b64fe2d475159a0
parent77b64f231144c0a93a9714dfdeca99dce029302a (diff)
Rename the variable from qalSndAudioDecoder to qalSndFileAudioDecoder
-rw-r--r--src/qalcontext.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qalcontext.cpp b/src/qalcontext.cpp
index 7520783..04209c5 100644
--- a/src/qalcontext.cpp
+++ b/src/qalcontext.cpp
@@ -183,16 +183,16 @@ QALContext::cacheBuffer(const QString& filename)
{
ALuint buffer = d->loadedBuffers.value(filename, 0);
if (!buffer) {
- QALSndFileAudioDecoder qalSndAudioDecoder;
- if (qalSndAudioDecoder.open(filename) == false)
+ QALSndFileAudioDecoder qalSndFileAudioDecoder;
+ if (qalSndFileAudioDecoder.open(filename) == false)
return 0;
QByteArray decodedData;
QByteArray tmpData;
- int maxlen = qalSndAudioDecoder.channels() * qalSndAudioDecoder.sampleRate() * qalSndAudioDecoder.sampleSize() / 8;
+ int maxlen = qalSndFileAudioDecoder.channels() * qalSndFileAudioDecoder.sampleRate() * qalSndFileAudioDecoder.sampleSize() / 8;
forever {
- tmpData = qalSndAudioDecoder.decode(maxlen);
+ tmpData = qalSndFileAudioDecoder.decode(maxlen);
decodedData.append(tmpData);
if (tmpData.size() != maxlen)
break;
@@ -210,8 +210,8 @@ QALContext::cacheBuffer(const QString& filename)
return 0;
};
- int channels = qalSndAudioDecoder.channels();
- int sampleSize = qalSndAudioDecoder.sampleSize();
+ int channels = qalSndFileAudioDecoder.channels();
+ int sampleSize = qalSndFileAudioDecoder.sampleSize();
ALenum format;
if (channels == 1) {
@@ -226,7 +226,7 @@ QALContext::cacheBuffer(const QString& filename)
format = AL_FORMAT_STEREO16;
}
- alBufferData(buffer, format, reinterpret_cast<const ALvoid*>(decodedData.constData()), decodedData.size(), qalSndAudioDecoder.sampleRate());
+ alBufferData(buffer, format, reinterpret_cast<const ALvoid*>(decodedData.constData()), decodedData.size(), qalSndFileAudioDecoder.sampleRate());
if ((error = alGetError()) != AL_NO_ERROR) {
qWarning() << Q_FUNC_INFO << "Failed to fill the buffer with audio data:" << alGetString(error);