Changeset 846 for trunk/src/multimedia/audio/qaudiooutput_mac_p.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/multimedia/audio/qaudiooutput_mac_p.cpp (modified) (7 diffs)

trunk/src/multimedia/audio/qaudiooutput_mac_p.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -61 +61 @@
 #include <QtCore/qdebug.h>
 
-#include <QtMultimedia/qaudiodeviceinfo.h>
 #include <QtMultimedia/qaudiooutput.h>
 
 #include "qaudio_mac_p.h"
 #include "qaudiooutput_mac_p.h"
+
 
 
@@ -279 +279 @@
         errorCode = QAudio::OpenError;
     else {
+
         isOpen = false;
         audioDeviceId = AudioDeviceID(did);
@@ -300 +301 @@
 QAudioOutputPrivate::~QAudioOutputPrivate()
 {
+
     close();
 }
@@ -359 +361 @@
     streamFormat = toAudioStreamBasicDescription(audioFormat);
 
-    UInt32 size = sizeof(deviceFormat);
-    if (AudioUnitGetProperty(audioUnit,
-                                kAudioUnitProperty_StreamFormat,
-                                kAudioUnitScope_Input,
-                                0,
-                                &deviceFormat,
-                                &size) != noErr) {
-        qWarning() << "QAudioOutput: Unable to retrieve device format";
-        return false;
-    }
-
+    UInt32 size = sizeof(streamFormat);
     if (AudioUnitSetProperty(audioUnit,
                                 kAudioUnitProperty_StreamFormat,
@@ -393 +385 @@
     }
 
-    periodSizeBytes = (numberOfFrames * streamFormat.mSampleRate / deviceFormat.mSampleRate) * 
-                        streamFormat.mBytesPerFrame;
+    periodSizeBytes = numberOfFrames * streamFormat.mBytesPerFrame;
     if (internalBufferSize < periodSizeBytes * 2)
         internalBufferSize = periodSizeBytes * 2;
@@ -436 +427 @@
     QIODevice*  op = device;
 
-    if (!audioFormat.isValid() || !open()) {
+    if (!audio) || !open()) {
         stateCode = QAudio::StoppedState;
         errorCode = QAudio::OpenError;