From 53fdcca36650970568f14b81814eb627cbabea43 Mon Sep 17 00:00:00 2001 From: Mithra Pattison Date: Tue, 10 Jul 2012 13:26:48 +1000 Subject: Delete obsolete class methods and update related code Delete obsolete methods from QAudioFormat and QAudioDeviceInfo and update code that relied on the obsolete methods. Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc Reviewed-by: Michael Goddard --- src/plugins/pulseaudio/qaudiooutput_pulse.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/pulseaudio/qaudiooutput_pulse.cpp') diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp index 30b454156..38d729b38 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -274,7 +274,7 @@ bool QPulseAudioOutput::open() QPulseAudioEngine *pulseEngine = QPulseAudioEngine::instance(); pa_threaded_mainloop_lock(pulseEngine->mainloop()); - qint64 bytesPerSecond = m_format.sampleRate() * m_format.channels() * m_format.sampleSize() / 8; + qint64 bytesPerSecond = m_format.sampleRate() * m_format.channelCount() * m_format.sampleSize() / 8; pa_proplist *propList = pa_proplist_new(); if (m_category.isNull()) { @@ -503,8 +503,8 @@ int QPulseAudioOutput::notifyInterval() const qint64 QPulseAudioOutput::processedUSecs() const { qint64 result = qint64(1000000) * m_totalTimeValue / - (m_format.channels() * (m_format.sampleSize() / 8)) / - m_format.frequency(); + (m_format.channelCount() * (m_format.sampleSize() / 8)) / + m_format.sampleRate(); return result; } -- cgit v1.2.3