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/multimedia/audio/qaudio_mac.cpp | 8 ++-- src/multimedia/audio/qaudiodeviceinfo.cpp | 50 ++++++-------------- src/multimedia/audio/qaudiodeviceinfo.h | 2 - src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 37 ++++++++------- src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | 2 +- src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 34 +++++++------- src/multimedia/audio/qaudiodeviceinfo_win32_p.h | 2 +- src/multimedia/audio/qaudioformat.cpp | 56 ++++------------------- src/multimedia/audio/qaudioformat.h | 4 -- src/multimedia/audio/qaudioinput_alsa_p.cpp | 10 ++-- src/multimedia/audio/qaudioinput_mac_p.cpp | 2 +- src/multimedia/audio/qaudioinput_win32_p.cpp | 14 +++--- src/multimedia/audio/qaudiooutput_alsa_p.cpp | 8 ++-- src/multimedia/audio/qaudiooutput_mac_p.cpp | 6 +-- src/multimedia/audio/qaudiooutput_win32_p.cpp | 34 +++++++------- src/multimedia/audio/qsoundeffect_pulse_p.cpp | 4 +- src/multimedia/audio/qwavedecoder_p.cpp | 10 ++-- 17 files changed, 108 insertions(+), 175 deletions(-) (limited to 'src/multimedia/audio') diff --git a/src/multimedia/audio/qaudio_mac.cpp b/src/multimedia/audio/qaudio_mac.cpp index 9acefcb8d..30e6a3a20 100644 --- a/src/multimedia/audio/qaudio_mac.cpp +++ b/src/multimedia/audio/qaudio_mac.cpp @@ -49,8 +49,8 @@ QAudioFormat toQAudioFormat(AudioStreamBasicDescription const& sf) { QAudioFormat audioFormat; - audioFormat.setFrequency(sf.mSampleRate); - audioFormat.setChannels(sf.mChannelsPerFrame); + audioFormat.setSampleRate(sf.mSampleRate); + audioFormat.setChannelCount(sf.mChannelsPerFrame); audioFormat.setSampleSize(sf.mBitsPerChannel); audioFormat.setCodec(QString::fromLatin1("audio/pcm")); audioFormat.setByteOrder((sf.mFormatFlags & kAudioFormatFlagIsBigEndian) != 0 ? QAudioFormat::BigEndian : QAudioFormat::LittleEndian); @@ -69,9 +69,9 @@ AudioStreamBasicDescription toAudioStreamBasicDescription(QAudioFormat const& au AudioStreamBasicDescription sf; sf.mFormatFlags = kAudioFormatFlagIsPacked; - sf.mSampleRate = audioFormat.frequency(); + sf.mSampleRate = audioFormat.sampleRate(); sf.mFramesPerPacket = 1; - sf.mChannelsPerFrame = audioFormat.channels(); + sf.mChannelsPerFrame = audioFormat.channelCount(); sf.mBitsPerChannel = audioFormat.sampleSize(); sf.mBytesPerFrame = sf.mChannelsPerFrame * (sf.mBitsPerChannel / 8); sf.mBytesPerPacket = sf.mFramesPerPacket * sf.mBytesPerFrame; diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp index 96ffefe7c..78c6f1f9b 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo.cpp @@ -279,12 +279,12 @@ QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const QAudioFormat nearest = settings; QList testCodecs = supportedCodecs(); - QList testChannels = supportedChannels(); + QList testChannels = supportedChannelCounts(); QList testByteOrders = supportedByteOrders(); QList testSampleTypes; QList sampleTypesAvailable = supportedSampleTypes(); - QMap testFrequencies; - QList frequenciesAvailable = supportedFrequencies(); + QMap testSampleRates; + QList sampleRatesAvailable = supportedSampleRates(); QMap testSampleSizes; QList sampleSizesAvailable = supportedSampleSizes(); @@ -293,8 +293,8 @@ QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const testCodecs.removeAll(settings.codec()); testCodecs.insert(0, settings.codec()); } - testChannels.removeAll(settings.channels()); - testChannels.insert(0, settings.channels()); + testChannels.removeAll(settings.channelCount()); + testChannels.insert(0, settings.channelCount()); testByteOrders.removeAll(settings.byteOrder()); testByteOrders.insert(0, settings.byteOrder()); @@ -317,15 +317,15 @@ QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const int diff = larger - smaller; testSampleSizes.insert((isMultiple ? diff : diff+100000), size); } - if (frequenciesAvailable.contains(settings.frequency())) - testFrequencies.insert(0,settings.frequency()); - frequenciesAvailable.removeAll(settings.frequency()); - foreach (int frequency, frequenciesAvailable) { - int larger = (frequency > settings.frequency()) ? frequency : settings.frequency(); - int smaller = (frequency > settings.frequency()) ? settings.frequency() : frequency; + if (sampleRatesAvailable.contains(settings.sampleRate())) + testSampleRates.insert(0,settings.sampleRate()); + sampleRatesAvailable.removeAll(settings.sampleRate()); + foreach (int sampleRate, sampleRatesAvailable) { + int larger = (sampleRate > settings.sampleRate()) ? sampleRate : settings.sampleRate(); + int smaller = (sampleRate > settings.sampleRate()) ? settings.sampleRate() : sampleRate; bool isMultiple = ( 0 == (larger % smaller)); int diff = larger - smaller; - testFrequencies.insert((isMultiple ? diff : diff+100000), frequency); + testSampleRates.insert((isMultiple ? diff : diff+100000), sampleRate); } // Try to find nearest @@ -340,11 +340,11 @@ QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const sz.next(); nearest.setSampleSize(sz.value()); foreach (int channel, testChannels) { - nearest.setChannels(channel); - QMapIterator i(testFrequencies); + nearest.setChannelCount(channel); + QMapIterator i(testSampleRates); while (i.hasNext()) { i.next(); - nearest.setFrequency(i.value()); + nearest.setSampleRate(i.value()); if (isFormatSupported(nearest)) return nearest; } @@ -378,16 +378,6 @@ QStringList QAudioDeviceInfo::supportedCodecs() const */ QList QAudioDeviceInfo::supportedSampleRates() const -{ - return supportedFrequencies(); -} - -/*! - \obsolete - - Use supportedSampleRates() instead. -*/ -QList QAudioDeviceInfo::supportedFrequencies() const { return isNull() ? QList() : d->info->supportedSampleRates(); } @@ -399,16 +389,6 @@ QList QAudioDeviceInfo::supportedFrequencies() const */ QList QAudioDeviceInfo::supportedChannelCounts() const -{ - return supportedChannels(); -} - -/*! - \obsolete - - Use supportedChannelCount() instead. -*/ -QList QAudioDeviceInfo::supportedChannels() const { return isNull() ? QList() : d->info->supportedChannelCounts(); } diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h index d9f5b9c6b..3150a1df7 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.h +++ b/src/multimedia/audio/qaudiodeviceinfo.h @@ -88,9 +88,7 @@ public: QAudioFormat nearestFormat(const QAudioFormat &format) const; QStringList supportedCodecs() const; - QList supportedFrequencies() const; QList supportedSampleRates() const; - QList supportedChannels() const; QList supportedChannelCounts() const; QList supportedSampleSizes() const; QList supportedByteOrders() const; diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp index 0558e44e6..0c2fe49b6 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp @@ -80,20 +80,20 @@ QAudioFormat QAudioDeviceInfoInternal::preferredFormat() const { QAudioFormat nearest; if(mode == QAudio::AudioOutput) { - nearest.setFrequency(44100); - nearest.setChannels(2); + nearest.setSampleRate(44100); + nearest.setChannelCount(2); nearest.setByteOrder(QAudioFormat::LittleEndian); nearest.setSampleType(QAudioFormat::SignedInt); nearest.setSampleSize(16); nearest.setCodec(QLatin1String("audio/pcm")); } else { - nearest.setFrequency(8000); - nearest.setChannels(1); + nearest.setSampleRate(8000); + nearest.setChannelCount(1); nearest.setSampleType(QAudioFormat::UnSignedInt); nearest.setSampleSize(8); nearest.setCodec(QLatin1String("audio/pcm")); if(!testSettings(nearest)) { - nearest.setChannels(2); + nearest.setChannelCount(2); nearest.setSampleSize(16); nearest.setSampleType(QAudioFormat::SignedInt); } @@ -115,7 +115,7 @@ QStringList QAudioDeviceInfoInternal::supportedCodecs() QList QAudioDeviceInfoInternal::supportedSampleRates() { updateLists(); - return freqz; + return sampleRatez; } QList QAudioDeviceInfoInternal::supportedChannelCounts() @@ -239,7 +239,7 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const bool testChannel = false; bool testCodec = false; - bool testFreq = false; + bool testSampleRate = false; bool testType = false; bool testSize = false; @@ -250,8 +250,8 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const snd_pcm_hw_params_any( handle, params ); // set the values! - snd_pcm_hw_params_set_channels(handle,params,format.channels()); - snd_pcm_hw_params_set_rate(handle,params,format.frequency(),dir); + snd_pcm_hw_params_set_channels(handle,params,format.channelCount()); + snd_pcm_hw_params_set_rate(handle,params,format.sampleRate(),dir); err = -1; @@ -295,20 +295,20 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const } else testCodec = true; - if(err>=0 && format.channels() != -1) { - err = snd_pcm_hw_params_test_channels(handle,params,format.channels()); + if (err>=0 && format.channelCount() != -1) { + err = snd_pcm_hw_params_test_channels(handle,params,format.channelCount()); if(err>=0) - err = snd_pcm_hw_params_set_channels(handle,params,format.channels()); + err = snd_pcm_hw_params_set_channels(handle,params,format.channelCount()); if(err>=0) testChannel = true; } - if(err>=0 && format.frequency() != -1) { - err = snd_pcm_hw_params_test_rate(handle,params,format.frequency(),0); + if (err>=0 && format.sampleRate() != -1) { + err = snd_pcm_hw_params_test_rate(handle,params,format.sampleRate(),0); if(err>=0) - err = snd_pcm_hw_params_set_rate(handle,params,format.frequency(),dir); + err = snd_pcm_hw_params_set_rate(handle,params,format.sampleRate(),dir); if(err>=0) - testFreq = true; + testSampleRate = true; } if((err>=0 && format.sampleSize() != -1) && @@ -370,7 +370,7 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const void QAudioDeviceInfoInternal::updateLists() { // redo all lists based on current settings - freqz.clear(); + sampleRatez.clear(); channelz.clear(); sizez.clear(); byteOrderz.clear(); @@ -385,7 +385,7 @@ void QAudioDeviceInfoInternal::updateLists() for(int i=0; i<(int)MAX_SAMPLE_RATES; i++) { //if(snd_pcm_hw_params_test_rate(handle, params, SAMPLE_RATES[i], dir) == 0) - freqz.append(SAMPLE_RATES[i]); + sampleRatez.append(SAMPLE_RATES[i]); } channelz.append(1); channelz.append(2); @@ -493,7 +493,6 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice() void QAudioDeviceInfoInternal::checkSurround() { - QList devices; surround40 = false; surround51 = false; surround71 = false; diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h index e99185569..073cc81e7 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h +++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h @@ -110,7 +110,7 @@ private: QString device; QAudio::Mode mode; QAudioFormat nearest; - QList freqz; + QList sampleRatez; QList channelz; QList sizez; QList byteOrderz; diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp index b4174a5af..0e1c4698f 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp @@ -126,15 +126,15 @@ bool QAudioDeviceInfoInternal::isFormatSupported(const QAudioFormat& format) con QAudioFormat QAudioDeviceInfoInternal::preferredFormat() const { QAudioFormat nearest; - if(mode == QAudio::AudioOutput) { - nearest.setFrequency(44100); + if (mode == QAudio::AudioOutput) { + nearest.setSampleRate(44100); nearest.setChannelCount(2); nearest.setByteOrder(QAudioFormat::LittleEndian); nearest.setSampleType(QAudioFormat::SignedInt); nearest.setSampleSize(16); nearest.setCodec(QLatin1String("audio/pcm")); } else { - nearest.setFrequency(11025); + nearest.setSampleRate(11025); nearest.setChannelCount(1); nearest.setByteOrder(QAudioFormat::LittleEndian); nearest.setSampleType(QAudioFormat::SignedInt); @@ -158,7 +158,7 @@ QStringList QAudioDeviceInfoInternal::supportedCodecs() QList QAudioDeviceInfoInternal::supportedSampleRates() { updateLists(); - return freqz; + return sampleRatez; } QList QAudioDeviceInfoInternal::supportedChannelCounts() @@ -213,8 +213,8 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const // check channel match = false; if (!failed) { - for( int i = 0; i < channelz.count(); i++) { - if (format.channels() == channelz.at(i)) { + for (int i = 0; i < channelz.count(); i++) { + if (format.channelCount() == channelz.at(i)) { match = true; break; } @@ -223,11 +223,11 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const failed = true; } - // check frequency + // check sampleRate match = false; if (!failed) { - for( int i = 0; i < freqz.count(); i++) { - if (format.frequency() == freqz.at(i)) { + for (int i = 0; i < sampleRatez.count(); i++) { + if (format.sampleRate() == sampleRatez.at(i)) { match = true; break; } @@ -302,7 +302,7 @@ void QAudioDeviceInfoInternal::updateLists() } } sizez.clear(); - freqz.clear(); + sampleRatez.clear(); channelz.clear(); byteOrderz.clear(); typez.clear(); @@ -339,31 +339,31 @@ void QAudioDeviceInfoInternal::updateLists() || (fmt & WAVE_FORMAT_1S08) || (fmt & WAVE_FORMAT_1M16) || (fmt & WAVE_FORMAT_1S16)) { - freqz.append(11025); + sampleRatez.append(11025); } if ((fmt & WAVE_FORMAT_2M08) || (fmt & WAVE_FORMAT_2S08) || (fmt & WAVE_FORMAT_2M16) || (fmt & WAVE_FORMAT_2S16)) { - freqz.append(22050); + sampleRatez.append(22050); } if ((fmt & WAVE_FORMAT_4M08) || (fmt & WAVE_FORMAT_4S08) || (fmt & WAVE_FORMAT_4M16) || (fmt & WAVE_FORMAT_4S16)) { - freqz.append(44100); + sampleRatez.append(44100); } if ((fmt & WAVE_FORMAT_48M08) || (fmt & WAVE_FORMAT_48S08) || (fmt & WAVE_FORMAT_48M16) || (fmt & WAVE_FORMAT_48S16)) { - freqz.append(48000); + sampleRatez.append(48000); } if ((fmt & WAVE_FORMAT_96M08) || (fmt & WAVE_FORMAT_96S08) || (fmt & WAVE_FORMAT_96M16) || (fmt & WAVE_FORMAT_96S16)) { - freqz.append(96000); + sampleRatez.append(96000); } channelz.append(1); channelz.append(2); @@ -380,8 +380,8 @@ void QAudioDeviceInfoInternal::updateLists() codecz.append(QLatin1String("audio/pcm")); } - if (freqz.count() > 0) - freqz.prepend(8000); + if (sampleRatez.count() > 0) + sampleRatez.prepend(8000); } QList QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode) diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h b/src/multimedia/audio/qaudiodeviceinfo_win32_p.h index 602aced17..a9e9c0551 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h +++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.h @@ -104,7 +104,7 @@ private: QString device; quint32 devId; QAudioFormat nearest; - QList freqz; + QList sampleRatez; QList channelz; QList sizez; QList byteOrderz; diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp index a1ece4fcd..c91620b37 100644 --- a/src/multimedia/audio/qaudioformat.cpp +++ b/src/multimedia/audio/qaudioformat.cpp @@ -64,7 +64,7 @@ class QAudioFormatPrivate : public QSharedData public: QAudioFormatPrivate() { - frequency = -1; + sampleRate = -1; channels = -1; sampleSize = -1; byteOrder = QAudioFormat::Endian(QSysInfo::ByteOrder); @@ -76,7 +76,7 @@ public: codec(other.codec), byteOrder(other.byteOrder), sampleType(other.sampleType), - frequency(other.frequency), + sampleRate(other.sampleRate), channels(other.channels), sampleSize(other.sampleSize) { @@ -87,7 +87,7 @@ public: codec = other.codec; byteOrder = other.byteOrder; sampleType = other.sampleType; - frequency = other.frequency; + sampleRate = other.sampleRate; channels = other.channels; sampleSize = other.sampleSize; @@ -97,7 +97,7 @@ public: QString codec; QAudioFormat::Endian byteOrder; QAudioFormat::SampleType sampleType; - int frequency; + int sampleRate; int channels; int sampleSize; }; @@ -206,7 +206,7 @@ QAudioFormat& QAudioFormat::operator=(const QAudioFormat &other) */ bool QAudioFormat::operator==(const QAudioFormat &other) const { - return d->frequency == other.d->frequency && + return d->sampleRate == other.d->sampleRate && d->channels == other.d->channels && d->sampleSize == other.d->sampleSize && d->byteOrder == other.d->byteOrder && @@ -230,7 +230,7 @@ bool QAudioFormat::operator!=(const QAudioFormat& other) const */ bool QAudioFormat::isValid() const { - return d->frequency != -1 && d->channels != -1 && d->sampleSize != -1 && + return d->sampleRate != -1 && d->channels != -1 && d->sampleSize != -1 && d->sampleType != QAudioFormat::Unknown && !d->codec.isEmpty(); } @@ -240,17 +240,7 @@ bool QAudioFormat::isValid() const */ void QAudioFormat::setSampleRate(int samplerate) { - d->frequency = samplerate; -} - -/*! - \obsolete - - Use setSampleRate() instead. -*/ -void QAudioFormat::setFrequency(int frequency) -{ - d->frequency = frequency; + d->sampleRate = samplerate; } /*! @@ -259,17 +249,7 @@ void QAudioFormat::setFrequency(int frequency) */ int QAudioFormat::sampleRate() const { - return d->frequency; -} - -/*! - \obsolete - - Use sampleRate() instead. -*/ -int QAudioFormat::frequency() const -{ - return d->frequency; + return d->sampleRate; } /*! @@ -281,16 +261,6 @@ void QAudioFormat::setChannelCount(int channels) d->channels = channels; } -/*! - \obsolete - - Use setChannelCount() instead. -*/ -void QAudioFormat::setChannels(int channels) -{ - d->channels = channels; -} - /*! Returns the current channel count value. @@ -300,16 +270,6 @@ int QAudioFormat::channelCount() const return d->channels; } -/*! - \obsolete - - Use channelCount() instead. -*/ -int QAudioFormat::channels() const -{ - return d->channels; -} - /*! Sets the sample size to the \a sampleSize specified, in bits. diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h index f39346af8..3bc5780d6 100644 --- a/src/multimedia/audio/qaudioformat.h +++ b/src/multimedia/audio/qaudioformat.h @@ -73,13 +73,9 @@ public: bool isValid() const; - void setFrequency(int frequency); - int frequency() const; void setSampleRate(int sampleRate); int sampleRate() const; - void setChannels(int channels); - int channels() const; void setChannelCount(int channelCount); int channelCount() const; diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp index 5f27f85cc..e5ce79ed3 100644 --- a/src/multimedia/audio/qaudioinput_alsa_p.cpp +++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp @@ -277,7 +277,7 @@ bool QAudioInputPrivate::open() int dir; int err = 0; int count=0; - unsigned int freakuency=settings.frequency(); + unsigned int sampleRate=settings.sampleRate(); if (!settings.isValid()) { qWarning("QAudioOutput: open error, invalid format."); @@ -373,14 +373,14 @@ bool QAudioInputPrivate::open() } } if ( !fatal ) { - err = snd_pcm_hw_params_set_channels( handle, hwparams, (unsigned int)settings.channels() ); + err = snd_pcm_hw_params_set_channels( handle, hwparams, (unsigned int)settings.channelCount() ); if ( err < 0 ) { fatal = true; errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_channels: err = %1").arg(err); } } if ( !fatal ) { - err = snd_pcm_hw_params_set_rate_near( handle, hwparams, &freakuency, 0 ); + err = snd_pcm_hw_params_set_rate_near( handle, hwparams, &sampleRate, 0 ); if ( err < 0 ) { fatal = true; errMessage = QString::fromLatin1("QAudioInput: snd_pcm_hw_params_set_rate_near: err = %1").arg(err); @@ -686,8 +686,8 @@ int QAudioInputPrivate::notifyInterval() const qint64 QAudioInputPrivate::processedUSecs() const { qint64 result = qint64(1000000) * totalTimeValue / - (settings.channels()*(settings.sampleSize()/8)) / - settings.frequency(); + (settings.channelCount()*(settings.sampleSize()/8)) / + settings.sampleRate(); return result; } diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp index c3c89db33..d25ace900 100644 --- a/src/multimedia/audio/qaudioinput_mac_p.cpp +++ b/src/multimedia/audio/qaudioinput_mac_p.cpp @@ -863,7 +863,7 @@ int QAudioInputPrivate::notifyInterval() const qint64 QAudioInputPrivate::processedUSecs() const { - return totalFrames * 1000000 / audioFormat.frequency(); + return totalFrames * 1000000 / audioFormat.sampleRate(); } qint64 QAudioInputPrivate::elapsedUSecs() const diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp index dd5d97cce..1ed68d256 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.cpp +++ b/src/multimedia/audio/qaudioinput_win32_p.cpp @@ -242,12 +242,12 @@ bool QAudioInputPrivate::open() } else if (settings.sampleSize() <= 0) { qWarning("QAudioInput: open error, invalid sample size (%d).", settings.sampleSize()); - } else if (settings.frequency() < 8000 || settings.frequency() > 96000) { - qWarning("QAudioInput: open error, frequency out of range (%d).", settings.frequency()); + } else if (settings.sampleRate() < 8000 || settings.sampleRate() > 96000) { + qWarning("QAudioInput: open error, sample rate out of range (%d).", settings.sampleRate()); } else if (buffer_size == 0) { buffer_size - = (settings.frequency() + = (settings.sampleRate() * settings.channelCount() * settings.sampleSize() + 39) / 40; @@ -265,9 +265,9 @@ bool QAudioInputPrivate::open() timeStamp.restart(); elapsedTimeOffset = 0; - wfx.nSamplesPerSec = settings.frequency(); + wfx.nSamplesPerSec = settings.sampleRate(); wfx.wBitsPerSample = settings.sampleSize(); - wfx.nChannels = settings.channels(); + wfx.nChannels = settings.channelCount(); wfx.cbSize = 0; wfx.wFormatTag = WAVE_FORMAT_PCM; @@ -539,8 +539,8 @@ qint64 QAudioInputPrivate::processedUSecs() const if (deviceState == QAudio::StoppedState) return 0; qint64 result = qint64(1000000) * totalTimeValue / - (settings.channels()*(settings.sampleSize()/8)) / - settings.frequency(); + (settings.channelCount()*(settings.sampleSize()/8)) / + settings.sampleRate(); return result; } diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp index adc4720c6..8da76d958 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp +++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp @@ -292,7 +292,7 @@ bool QAudioOutputPrivate::open() int dir; int err = 0; int count=0; - unsigned int freakuency=settings.frequency(); + unsigned int sampleRate=settings.sampleRate(); if (!settings.isValid()) { qWarning("QAudioOutput: open error, invalid format."); @@ -387,14 +387,14 @@ bool QAudioOutputPrivate::open() } } if ( !fatal ) { - err = snd_pcm_hw_params_set_channels( handle, hwparams, (unsigned int)settings.channels() ); + err = snd_pcm_hw_params_set_channels( handle, hwparams, (unsigned int)settings.channelCount() ); if ( err < 0 ) { fatal = true; errMessage = QString::fromLatin1("QAudioOutput: snd_pcm_hw_params_set_channels: err = %1").arg(err); } } if ( !fatal ) { - err = snd_pcm_hw_params_set_rate_near( handle, hwparams, &freakuency, 0 ); + err = snd_pcm_hw_params_set_rate_near( handle, hwparams, &sampleRate, 0 ); if ( err < 0 ) { fatal = true; errMessage = QString::fromLatin1("QAudioOutput: snd_pcm_hw_params_set_rate_near: err = %1").arg(err); @@ -630,7 +630,7 @@ int QAudioOutputPrivate::notifyInterval() const qint64 QAudioOutputPrivate::processedUSecs() const { - return qint64(1000000) * totalTimeValue / settings.frequency(); + return qint64(1000000) * totalTimeValue / settings.sampleRate(); } void QAudioOutputPrivate::resume() diff --git a/src/multimedia/audio/qaudiooutput_mac_p.cpp b/src/multimedia/audio/qaudiooutput_mac_p.cpp index 105f41f39..f93d5ec88 100644 --- a/src/multimedia/audio/qaudiooutput_mac_p.cpp +++ b/src/multimedia/audio/qaudiooutput_mac_p.cpp @@ -87,8 +87,8 @@ public: m_device(0) { m_buffer = new QAudioRingBuffer(bufferSize + (bufferSize % maxPeriodSize == 0 ? 0 : maxPeriodSize - (bufferSize % maxPeriodSize))); - m_bytesPerFrame = (audioFormat.sampleSize() / 8) * audioFormat.channels(); - m_periodTime = m_maxPeriodSize / m_bytesPerFrame * 1000 / audioFormat.frequency(); + m_bytesPerFrame = (audioFormat.sampleSize() / 8) * audioFormat.channelCount(); + m_periodTime = m_maxPeriodSize / m_bytesPerFrame * 1000 / audioFormat.sampleRate(); m_fillTimer = new QTimer(this); connect(m_fillTimer, SIGNAL(timeout()), SLOT(fillBuffer())); @@ -579,7 +579,7 @@ int QAudioOutputPrivate::notifyInterval() const qint64 QAudioOutputPrivate::processedUSecs() const { - return totalFrames * 1000000 / audioFormat.frequency(); + return totalFrames * 1000000 / audioFormat.sampleRate(); } qint64 QAudioOutputPrivate::elapsedUSecs() const diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp index a189ddd0f..2f52e51b3 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.cpp +++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp @@ -280,12 +280,12 @@ bool QAudioOutputPrivate::open() } else if (settings.sampleSize() <= 0) { qWarning("QAudioOutput: open error, invalid sample size (%d).", settings.sampleSize()); - } else if (settings.frequency() < 8000 || settings.frequency() > 96000) { - qWarning("QAudioOutput: open error, frequency out of range (%d).", settings.frequency()); + } else if (settings.sampleRate() < 8000 || settings.sampleRate() > 96000) { + qWarning("QAudioOutput: open error, sample rate out of range (%d).", settings.sampleRate()); } else if (buffer_size == 0) { // Default buffer size, 200ms, default period size is 40ms buffer_size - = (settings.frequency() + = (settings.sampleRate() * settings.channelCount() * settings.sampleSize() + 39) / 40; @@ -315,14 +315,14 @@ bool QAudioOutputPrivate::open() timeStamp.restart(); elapsedTimeOffset = 0; - wfx.nSamplesPerSec = settings.frequency(); + wfx.nSamplesPerSec = settings.sampleRate(); wfx.wBitsPerSample = settings.sampleSize(); - wfx.nChannels = settings.channels(); + wfx.nChannels = settings.channelCount(); wfx.cbSize = 0; bool surround = false; - if (settings.channels() > 2) + if (settings.channelCount() > 2) surround = true; wfx.wFormatTag = WAVE_FORMAT_PCM; @@ -347,9 +347,9 @@ bool QAudioOutputPrivate::open() } else { WAVEFORMATEXTENSIBLE wfex; wfex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - wfex.Format.nChannels = settings.channels(); + wfex.Format.nChannels = settings.channelCount(); wfex.Format.wBitsPerSample = settings.sampleSize(); - wfex.Format.nSamplesPerSec = settings.frequency(); + wfex.Format.nSamplesPerSec = settings.sampleRate(); wfex.Format.nBlockAlign = wfex.Format.nChannels*wfex.Format.wBitsPerSample/8; wfex.Format.nAvgBytesPerSec=wfex.Format.nSamplesPerSec*wfex.Format.nBlockAlign; wfex.Samples.wValidBitsPerSample=wfex.Format.wBitsPerSample; @@ -359,11 +359,11 @@ bool QAudioOutputPrivate::open() wfex.Format.cbSize=22; wfex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; - if (settings.channels() >= 4) + if (settings.channelCount() >= 4) wfex.dwChannelMask |= SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; - if (settings.channels() >= 6) + if (settings.channelCount() >= 6) wfex.dwChannelMask |= SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY; - if (settings.channels() == 8) + if (settings.channelCount() == 8) wfex.dwChannelMask |= SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT; if (waveOutOpen(&hWaveOut, UINT_PTR(deviceId), &wfex.Format, @@ -401,8 +401,8 @@ void QAudioOutputPrivate::close() deviceState = QAudio::StoppedState; errorState = QAudio::NoError; - int delay = (buffer_size-bytesFree())*1000/(settings.frequency() - *settings.channels()*(settings.sampleSize()/8)); + int delay = (buffer_size-bytesFree())*1000/(settings.sampleRate() + *settings.channelCount()*(settings.sampleSize()/8)); waveOutReset(hWaveOut); Sleep(delay+10); @@ -452,8 +452,8 @@ qint64 QAudioOutputPrivate::processedUSecs() const if (deviceState == QAudio::StoppedState) return 0; qint64 result = qint64(1000000) * totalTimeValue / - (settings.channels()*(settings.sampleSize()/8)) / - settings.frequency(); + (settings.channelCount()*(settings.sampleSize()/8)) / + settings.sampleRate(); return result; } @@ -553,8 +553,8 @@ void QAudioOutputPrivate::resume() void QAudioOutputPrivate::suspend() { if(deviceState == QAudio::ActiveState || deviceState == QAudio::IdleState) { - int delay = (buffer_size-bytesFree())*1000/(settings.frequency() - *settings.channels()*(settings.sampleSize()/8)); + int delay = (buffer_size-bytesFree())*1000/(settings.sampleRate() + *settings.channelCount()*(settings.sampleSize()/8)); waveOutPause(hWaveOut); Sleep(delay+10); deviceState = QAudio::SuspendedState; diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index 94dcb0bd5..e3357b02b 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -76,8 +76,8 @@ inline pa_sample_spec audioFormatToSampleSpec(const QAudioFormat &format) { pa_sample_spec spec; - spec.rate = format.frequency(); - spec.channels = format.channels(); + spec.rate = format.sampleRate(); + spec.channels = format.channelCount(); if (format.sampleSize() == 8) spec.format = PA_SAMPLE_U8; diff --git a/src/multimedia/audio/qwavedecoder_p.cpp b/src/multimedia/audio/qwavedecoder_p.cpp index 62e5a6008..84e56f270 100644 --- a/src/multimedia/audio/qwavedecoder_p.cpp +++ b/src/multimedia/audio/qwavedecoder_p.cpp @@ -74,7 +74,7 @@ QAudioFormat QWaveDecoder::audioFormat() const int QWaveDecoder::duration() const { - return size() * 1000 / (format.sampleSize() / 8) / format.channels() / format.frequency(); + return size() * 1000 / (format.sampleSize() / 8) / format.channelCount() / format.sampleRate(); } qint64 QWaveDecoder::size() const @@ -179,17 +179,17 @@ void QWaveDecoder::handleData() format.setSampleType(bps == 8 ? QAudioFormat::UnSignedInt : QAudioFormat::SignedInt); format.setByteOrder(QAudioFormat::BigEndian); - format.setFrequency(qFromBigEndian(wave.sampleRate)); + format.setSampleRate(qFromBigEndian(wave.sampleRate)); format.setSampleSize(bps); - format.setChannels(qFromBigEndian(wave.numChannels)); + format.setChannelCount(qFromBigEndian(wave.numChannels)); } else { int bps = qFromLittleEndian(wave.bitsPerSample); format.setSampleType(bps == 8 ? QAudioFormat::UnSignedInt : QAudioFormat::SignedInt); format.setByteOrder(QAudioFormat::LittleEndian); - format.setFrequency(qFromLittleEndian(wave.sampleRate)); + format.setSampleRate(qFromLittleEndian(wave.sampleRate)); format.setSampleSize(bps); - format.setChannels(qFromLittleEndian(wave.numChannels)); + format.setChannelCount(qFromLittleEndian(wave.numChannels)); } state = QWaveDecoder::WaitingForDataState; -- cgit v1.2.3