diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-28 02:26:30 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-28 02:26:30 (GMT) |
| commit | 566d525f5139955f1af61b21d16644e349b9fc7a (patch) | |
| tree | cc7376b1640726b1817e5f1b9d2b3936282f3914 /src/multimedia/audio/qaudio_mac.cpp | |
| parent | d2fa5b80d4f40ac67a7a74552390332551563466 (diff) | |
| parent | c9691c62b62c656a9a153b8879f13a5ce71a6d2d (diff) | |
| download | Qt-566d525f5139955f1af61b21d16644e349b9fc7a.zip Qt-566d525f5139955f1af61b21d16644e349b9fc7a.tar.gz Qt-566d525f5139955f1af61b21d16644e349b9fc7a.tar.bz2 | |
Merge branch 'master' of ../../qt/master
Conflicts:
src/multimedia/audio/qaudiodeviceinfo.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.cpp
Diffstat (limited to 'src/multimedia/audio/qaudio_mac.cpp')
| -rw-r--r-- | src/multimedia/audio/qaudio_mac.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/audio/qaudio_mac.cpp b/src/multimedia/audio/qaudio_mac.cpp index 61a00ce..14fee8b 100644 --- a/src/multimedia/audio/qaudio_mac.cpp +++ b/src/multimedia/audio/qaudio_mac.cpp @@ -48,8 +48,8 @@ QT_BEGIN_NAMESPACE QDebug operator<<(QDebug dbg, const QAudioFormat& audioFormat) { dbg.nospace() << "QAudioFormat(" << - audioFormat.sampleRate() << "," << - audioFormat.channelCount() << "," << + audioFormat.frequency() << "," << + audioFormat.channels() << "," << audioFormat.sampleSize()<< "," << audioFormat.codec() << "," << audioFormat.byteOrder() << "," << @@ -64,8 +64,8 @@ QAudioFormat toQAudioFormat(AudioStreamBasicDescription const& sf) { QAudioFormat audioFormat; - audioFormat.setSampleRate(sf.mSampleRate); - audioFormat.setChannelCount(sf.mChannelsPerFrame); + audioFormat.setFrequency(sf.mSampleRate); + audioFormat.setChannels(sf.mChannelsPerFrame); audioFormat.setSampleSize(sf.mBitsPerChannel); audioFormat.setCodec(QString::fromLatin1("audio/pcm")); audioFormat.setByteOrder(sf.mFormatFlags & kLinearPCMFormatFlagIsBigEndian != 0 ? QAudioFormat::BigEndian : QAudioFormat::LittleEndian); @@ -84,9 +84,9 @@ AudioStreamBasicDescription toAudioStreamBasicDescription(QAudioFormat const& au AudioStreamBasicDescription sf; sf.mFormatFlags = kAudioFormatFlagIsPacked; - sf.mSampleRate = audioFormat.sampleRate(); + sf.mSampleRate = audioFormat.frequency(); sf.mFramesPerPacket = 1; - sf.mChannelsPerFrame = audioFormat.channelCount(); + sf.mChannelsPerFrame = audioFormat.channels(); sf.mBitsPerChannel = audioFormat.sampleSize(); sf.mBytesPerFrame = sf.mChannelsPerFrame * (sf.mBitsPerChannel / 8); sf.mBytesPerPacket = sf.mFramesPerPacket * sf.mBytesPerFrame; |