6 files changed, 20 insertions, 20 deletions
diff --git a/src/multimedia/platform/darwin/audio/qcoreaudiodeviceinfo.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice.mm
index cbfa72c0c..d24a7c59e 100644
--- a/src/multimedia/platform/darwin/audio/qcoreaudiodeviceinfo.mm
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qcoreaudiodeviceinfo_p.h"
+#include "qdarwinaudiodevice_p.h"
 #include "qcoreaudioutils_p.h"
 #include <private/qcore_mac_p.h>
 
@@ -54,11 +54,11 @@ QT_BEGIN_NAMESPACE
 
 #if defined(Q_OS_MACOS)
     QCoreAudioDeviceInfo::QCoreAudioDeviceInfo(AudioDeviceID id, const QByteArray &device, QAudio::Mode mode)
-        : QAudioDeviceInfoPrivate(device, mode),
+        : QAudioDevicePrivate(device, mode),
         m_deviceId(id)
 #else
     QCoreAudioDeviceInfo::QCoreAudioDeviceInfo(const QByteArray &device, QAudio::Mode mode)
-        : QAudioDeviceInfoPrivate(device, mode)
+        : QAudioDevicePrivate(device, mode)
 #endif
     {
         preferredFormat = determinePreferredFormat();
@@ -103,10 +103,10 @@ QAudioFormat QCoreAudioDeviceInfo::determinePreferredFormat() const
                             format = CoreAudioUtils::toQAudioFormat(sf);
                             break;
                         } else {
-                            qWarning() << "QAudioDeviceInfo: Unable to find perferedFormat for stream";
+                            qWarning() << "QAudioDevice: Unable to find perferedFormat for stream";
                         }
                     } else {
-                        qWarning() << "QAudioDeviceInfo: Unable to find size of perferedFormat for stream";
+                        qWarning() << "QAudioDevice: Unable to find size of perferedFormat for stream";
                     }
                 }
             }
@@ -138,7 +138,7 @@ QString QCoreAudioDeviceInfo::getDescription() const
                                                                   kAudioObjectPropertyElementMaster };
 
     if (AudioObjectGetPropertyData(m_deviceId, &audioDeviceNamePropertyAddress, 0, NULL, &size, &name) != noErr) {
-        qWarning() << "QAudioDeviceInfo: Unable to find device description";
+        qWarning() << "QAudioDevice: Unable to find device description";
         return QString();
     }
 
diff --git a/src/multimedia/platform/darwin/audio/qcoreaudiodeviceinfo_p.h b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice_p.h
index 6bf5c2242..30aead354 100644
--- a/src/multimedia/platform/darwin/audio/qcoreaudiodeviceinfo_p.h
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice_p.h
@@ -51,7 +51,7 @@
 //
 
 #include <qaudiosystem_p.h>
-#include <private/qaudiodeviceinfo_p.h>
+#include <private/qaudiodevice_p.h>
 
 #if defined(Q_OS_MACOS)
 # include <CoreAudio/CoreAudio.h>
@@ -59,7 +59,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QCoreAudioDeviceInfo : public QAudioDeviceInfoPrivate
+class QCoreAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
 #if defined(Q_OS_MACOS)
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm
index 39cb39e99..f84bdeaa0 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm
@@ -38,7 +38,7 @@
 ****************************************************************************/
 #include "qdarwinaudiosink_p.h"
 #include "qcoreaudiosessionmanager_p.h"
-#include "qcoreaudiodeviceinfo_p.h"
+#include "qdarwinaudiodevice_p.h"
 #include "qcoreaudioutils_p.h"
 #include <private/qdarwinmediadevices_p.h>
 #include <qmediadevices.h>
@@ -221,7 +221,7 @@ qint64 QDarwinAudioSinkDevice::writeData(const char *data, qint64 len)
     return m_audioBuffer->writeBytes(data, len);
 }
 
-QDarwinAudioSink::QDarwinAudioSink(const QAudioDeviceInfo &device)
+QDarwinAudioSink::QDarwinAudioSink(const QAudioDevice &device)
     : m_audioDeviceInfo(device)
     , m_isOpen(false)
     , m_internalBufferSize(DEFAULT_BUFFER_SIZE)
@@ -235,7 +235,7 @@ QDarwinAudioSink::QDarwinAudioSink(const QAudioDeviceInfo &device)
     , m_errorCode(QAudio::NoError)
     , m_stateCode(QAudio::StoppedState)
 {
-    QAudioDeviceInfo di = device;
+    QAudioDevice di = device;
     if (di.isNull())
         di = QMediaDevices::defaultAudioOutput();
 #if defined(Q_OS_MACOS)
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h b/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h
index e30e04116..6bc0ff272 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h
@@ -61,7 +61,7 @@
 #include <QtCore/QIODevice>
 #include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
-#include <private/qcoreaudiodeviceinfo_p.h>
+#include <private/qdarwinaudiodevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -125,7 +125,7 @@ class QDarwinAudioSink : public QPlatformAudioSink
     Q_OBJECT
 
 public:
-    QDarwinAudioSink(const QAudioDeviceInfo &device);
+    QDarwinAudioSink(const QAudioDevice &device);
     ~QDarwinAudioSink();
 
     void start(QIODevice *device);
@@ -176,7 +176,7 @@ private:
     void startTimers();
     void stopTimers();
 
-    QAudioDeviceInfo m_audioDeviceInfo;
+    QAudioDevice m_audioDeviceInfo;
     QByteArray m_device;
 
     bool m_isOpen;
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm
index 95d22d01a..17754518b 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm
@@ -38,7 +38,7 @@
 ****************************************************************************/
 #include "qdarwinaudiosource_p.h"
 #include "qcoreaudiosessionmanager_p.h"
-#include "qcoreaudiodeviceinfo_p.h"
+#include "qdarwinaudiodevice_p.h"
 #include "qcoreaudioutils_p.h"
 #include "private/qdarwinmediadevices_p.h"
 #include <qmediadevices.h>
@@ -448,7 +448,7 @@ qint64 QDarwinAudioSourceDevice::writeData(const char *data, qint64 len)
     return 0;
 }
 
-QDarwinAudioSource::QDarwinAudioSource(const QAudioDeviceInfo &device)
+QDarwinAudioSource::QDarwinAudioSource(const QAudioDevice &device)
     : m_audioDeviceInfo(device)
     , m_isOpen(false)
     , m_internalBufferSize(DEFAULT_BUFFER_SIZE)
@@ -460,7 +460,7 @@ QDarwinAudioSource::QDarwinAudioSource(const QAudioDeviceInfo &device)
     , m_audioBuffer(nullptr)
     , m_volume(1.0)
 {
-    QAudioDeviceInfo di = device;
+    QAudioDevice di = device;
     if (di.isNull())
         di = QMediaDevices::defaultAudioInput();
 #if defined(Q_OS_MACOS)
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h b/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h
index 02c8f5ea5..6a14b6a55 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h
@@ -51,7 +51,7 @@
 //
 
 #include <qaudiosystem_p.h>
-#include <private/qcoreaudiodeviceinfo_p.h>
+#include <private/qdarwinaudiodevice_p.h>
 
 #include <AudioUnit/AudioUnit.h>
 #include <CoreAudio/CoreAudioTypes.h>
@@ -201,7 +201,7 @@ class QDarwinAudioSource : public QPlatformAudioSource
     Q_OBJECT
 
 public:
-    QDarwinAudioSource(const QAudioDeviceInfo &device);
+    QDarwinAudioSource(const QAudioDevice &device);
     ~QDarwinAudioSource();
 
     void start(QIODevice *device);
@@ -253,7 +253,7 @@ private:
                                     UInt32 inNumberFrames,
                                     AudioBufferList *ioData);
 
-    QAudioDeviceInfo m_audioDeviceInfo;
+    QAudioDevice m_audioDeviceInfo;
     QByteArray m_device;
     bool m_isOpen;
     int m_periodSizeBytes;