diff options
Diffstat (limited to 'src/multimedia/platform/darwin')
18 files changed, 73 insertions, 73 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; diff --git a/src/multimedia/platform/darwin/camera/avfcamera.mm b/src/multimedia/platform/darwin/camera/avfcamera.mm index 4d7cc5d45..89c8aa0de 100644 --- a/src/multimedia/platform/darwin/camera/avfcamera.mm +++ b/src/multimedia/platform/darwin/camera/avfcamera.mm @@ -202,7 +202,7 @@ QCamera::Status AVFCamera::status() const return statusTable[m_active ? 1 : 0][m_session->isActive() ? 1 : 0]; } -void AVFCamera::setCamera(const QCameraInfo &camera) +void AVFCamera::setCamera(const QCameraDevice &camera) { if (m_cameraInfo == camera) return; @@ -227,7 +227,7 @@ void AVFCamera::setCaptureSession(QPlatformMediaCaptureSession *session) Q_ASSERT(m_session); connect(m_session, SIGNAL(activeChanged(bool)), SLOT(updateStatus())); - m_session->setActiveCamera(QCameraInfo()); + m_session->setActiveCamera(QCameraDevice()); m_session->setActive(m_active); m_session->setActiveCamera(m_cameraInfo); } diff --git a/src/multimedia/platform/darwin/camera/avfcamera_p.h b/src/multimedia/platform/darwin/camera/avfcamera_p.h index 029c35b86..42999b917 100644 --- a/src/multimedia/platform/darwin/camera/avfcamera_p.h +++ b/src/multimedia/platform/darwin/camera/avfcamera_p.h @@ -77,7 +77,7 @@ public: QCamera::Status status() const override; - void setCamera(const QCameraInfo &camera) override; + void setCamera(const QCameraDevice &camera) override; void setCaptureSession(QPlatformMediaCaptureSession *) override; @@ -127,7 +127,7 @@ private: AVFCameraService *m_service = nullptr; AVFCameraSession *m_session = nullptr; - QCameraInfo m_cameraInfo; + QCameraDevice m_cameraInfo; bool m_active; QCamera::Status m_lastStatus; diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice.mm b/src/multimedia/platform/darwin/camera/avfcameraservice.mm index c75d7665e..899dd4602 100644 --- a/src/multimedia/platform/darwin/camera/avfcameraservice.mm +++ b/src/multimedia/platform/darwin/camera/avfcameraservice.mm @@ -148,17 +148,17 @@ void AVFCameraService::setVolume(qreal volume) } } -QAudioDeviceInfo AVFCameraService::audioInput() const +QAudioDevice AVFCameraService::audioInput() const { QByteArray id = [[m_audioCaptureDevice uniqueID] UTF8String]; - const QList<QAudioDeviceInfo> devices = QMediaDevices::audioInputs(); + const QList<QAudioDevice> devices = QMediaDevices::audioInputs(); for (auto d : devices) if (d.id() == id) return d; return QMediaDevices::defaultAudioInput(); } -bool AVFCameraService::setAudioInput(const QAudioDeviceInfo &id) +bool AVFCameraService::setAudioInput(const QAudioDevice &id) { AVCaptureDevice *device = nullptr; diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h index 29a145494..5698cda7a 100644 --- a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h +++ b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h @@ -85,8 +85,8 @@ public: void setMuted(bool muted) override; qreal volume() const override; void setVolume(qreal volume) override; - QAudioDeviceInfo audioInput() const override; - bool setAudioInput(const QAudioDeviceInfo &) override; + QAudioDevice audioInput() const override; + bool setAudioInput(const QAudioDevice &) override; void setVideoPreview(QVideoSink *sink) override; diff --git a/src/multimedia/platform/darwin/camera/avfcamerasession.mm b/src/multimedia/platform/darwin/camera/avfcamerasession.mm index 8256bd727..745db0ae9 100644 --- a/src/multimedia/platform/darwin/camera/avfcamerasession.mm +++ b/src/multimedia/platform/darwin/camera/avfcamerasession.mm @@ -175,7 +175,7 @@ AVFCameraSession::~AVFCameraSession() [m_captureSession release]; } -void AVFCameraSession::setActiveCamera(const QCameraInfo &info) +void AVFCameraSession::setActiveCamera(const QCameraDevice &info) { if (m_activeCameraInfo != info) { m_activeCameraInfo = info; @@ -330,7 +330,7 @@ void AVFCameraSession::attachVideoInputDevice() AVCaptureDevice *videoDevice = createVideoCaptureDevice(); if (!videoDevice) { - m_activeCameraInfo = QCameraInfo(); + m_activeCameraInfo = QCameraDevice(); return; } @@ -347,7 +347,7 @@ void AVFCameraSession::attachVideoInputDevice() [m_captureSession addInput:m_videoInput]; } else { qWarning() << "Failed to connect video device input"; - m_activeCameraInfo = QCameraInfo(); + m_activeCameraInfo = QCameraDevice(); } } } diff --git a/src/multimedia/platform/darwin/camera/avfcamerasession_p.h b/src/multimedia/platform/darwin/camera/avfcamerasession_p.h index f440c3d3f..530bdc96a 100644 --- a/src/multimedia/platform/darwin/camera/avfcamerasession_p.h +++ b/src/multimedia/platform/darwin/camera/avfcamerasession_p.h @@ -54,7 +54,7 @@ #include <QtCore/qmutex.h> #include <QtMultimedia/qcamera.h> #include <QVideoFrame> -#include <qcamerainfo.h> +#include <qcameradevice.h> #import <AVFoundation/AVFoundation.h> @@ -75,8 +75,8 @@ public: AVFCameraSession(AVFCameraService *service, QObject *parent = nullptr); ~AVFCameraSession(); - QCameraInfo activeCameraInfo() const { return m_activeCameraInfo; } - void setActiveCamera(const QCameraInfo &info); + QCameraDevice activeCameraInfo() const { return m_activeCameraInfo; } + void setActiveCamera(const QCameraDevice &info); AVFCameraRenderer *videoOutput() const { return m_videoOutput; } AVCaptureAudioDataOutput *audioOutput() const { return m_audioOutput; } @@ -115,7 +115,7 @@ private: bool applyImageEncoderSettings(); bool applyEncoderSettings(); - QCameraInfo m_activeCameraInfo; + QCameraDevice m_activeCameraInfo; AVFCameraService *m_service; AVCaptureSession *m_captureSession; diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm index b2a76eb0a..7d1725913 100644 --- a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm +++ b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm @@ -46,7 +46,7 @@ #include "avfcameradebug_p.h" #include "avfcamerautility_p.h" -#include "qaudiodeviceinfo.h" +#include "qaudiodevice.h" #include "qmediadevices.h" #include "private/qdarwinformatsinfo_p.h" @@ -483,11 +483,11 @@ void AVFMediaEncoder::record() // Make sure the video is recorded in device orientation. // The top of the video will match the side of the device which is on top // when recording starts (regardless of the UI orientation). - // QCameraInfo cameraInfo = m_service->session()->activeCameraInfo(); + // QCameraDevice cameraInfo = m_service->session()->activeCameraInfo(); // int screenOrientation = 360 - m_orientationHandler.currentOrientation(); // ### - // if (cameraInfo.position() == QCameraInfo::FrontFace) + // if (cameraInfo.position() == QCameraDevice::FrontFace) // rotation = (screenOrientation + cameraInfo.orientation()) % 360; // else // rotation = (screenOrientation + (360 - cameraInfo.orientation())) % 360; diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h b/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h index 8e6893a65..149adafa7 100644 --- a/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h +++ b/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h @@ -54,7 +54,7 @@ #include "avfmediaassetwriter_p.h" #include "avfstoragelocation_p.h" #include "avfcamerautility_p.h" -#include "qaudiodeviceinfo.h" +#include "qaudiodevice.h" #include <private/qplatformmediaencoder_p.h> #include <private/qvideooutputorientationhandler_p.h> diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm index 57d1d7890..cfd310cd3 100644 --- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm +++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm @@ -727,7 +727,7 @@ qreal AVFMediaPlayer::playbackRate() const return m_rate; } -bool AVFMediaPlayer::setAudioOutput(const QAudioDeviceInfo &info) +bool AVFMediaPlayer::setAudioOutput(const QAudioDevice &info) { m_audioOutput = info; @@ -743,7 +743,7 @@ bool AVFMediaPlayer::setAudioOutput(const QAudioDeviceInfo &info) return true; } -QAudioDeviceInfo AVFMediaPlayer::audioOutput() const +QAudioDevice AVFMediaPlayer::audioOutput() const { return m_audioOutput; } diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h index 6c6f5e40a..367b3d81e 100644 --- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h +++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h @@ -105,9 +105,9 @@ public: qreal playbackRate() const override; - bool setAudioOutput(const QAudioDeviceInfo &) override; - QAudioDeviceInfo audioOutput() const override; - QAudioDeviceInfo m_audioOutput; + bool setAudioOutput(const QAudioDevice &) override; + QAudioDevice audioOutput() const override; + QAudioDevice m_audioOutput; QMediaMetaData metaData() const override; diff --git a/src/multimedia/platform/darwin/qdarwinmediadevices.mm b/src/multimedia/platform/darwin/qdarwinmediadevices.mm index 576ae486a..271b3a9d1 100644 --- a/src/multimedia/platform/darwin/qdarwinmediadevices.mm +++ b/src/multimedia/platform/darwin/qdarwinmediadevices.mm @@ -39,9 +39,9 @@ #include "qdarwinmediadevices_p.h" #include "qmediadevices.h" -#include "qcamerainfo_p.h" -#include "qaudiodeviceinfo_p.h" -#include "private/qcoreaudiodeviceinfo_p.h" +#include "qcameradevice_p.h" +#include "qaudiodevice_p.h" +#include "private/qdarwinaudiodevice_p.h" #include "private/qdarwinaudiosource_p.h" #include "private/qdarwinaudiosink_p.h" #include "private/avfcamera_p.h" @@ -71,7 +71,7 @@ AudioDeviceID defaultAudioDevice(QAudio::Mode mode) if (AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultDevicePropertyAddress, 0, NULL, &size, &audioDevice) != noErr) { - qWarning("QAudioDeviceInfo: Unable to find default %s device", (mode == QAudio::AudioOutput) ? "output" : "input"); + qWarning("QAudioDevice: Unable to find default %s device", (mode == QAudio::AudioOutput) ? "output" : "input"); return 0; } @@ -90,7 +90,7 @@ static QByteArray uniqueId(AudioDeviceID device, QAudio::Mode mode) kAudioObjectPropertyElementMaster }; if (AudioObjectGetPropertyData(device, &audioDeviceNamePropertyAddress, 0, NULL, &size, &name) != noErr) { - qWarning() << "QAudioDeviceInfo: Unable to get device UID"; + qWarning() << "QAudioDevice: Unable to get device UID"; return QByteArray(); } @@ -99,10 +99,10 @@ static QByteArray uniqueId(AudioDeviceID device, QAudio::Mode mode) return s.toUtf8(); } -QList<QAudioDeviceInfo> availableAudioDevices(QAudio::Mode mode) +QList<QAudioDevice> availableAudioDevices(QAudio::Mode mode) { - QList<QAudioDeviceInfo> devices; + QList<QAudioDevice> devices; AudioDeviceID defaultDevice = defaultAudioDevice(mode); if (defaultDevice != 0) @@ -201,10 +201,10 @@ QDarwinMediaDevices::~QDarwinMediaDevices() #endif } -QList<QAudioDeviceInfo> QDarwinMediaDevices::audioInputs() const +QList<QAudioDevice> QDarwinMediaDevices::audioInputs() const { #ifdef Q_OS_IOS - QList<QAudioDeviceInfo> devices; + QList<QAudioDevice> devices; devices.append((new QCoreAudioDeviceInfo("default", QAudio::AudioInput))->create()); return devices; #else @@ -212,10 +212,10 @@ QList<QAudioDeviceInfo> QDarwinMediaDevices::audioInputs() const #endif } -QList<QAudioDeviceInfo> QDarwinMediaDevices::audioOutputs() const +QList<QAudioDevice> QDarwinMediaDevices::audioOutputs() const { #ifdef Q_OS_IOS - QList<QAudioDeviceInfo> devices; + QList<QAudioDevice> devices; devices.append((new QCoreAudioDeviceInfo("default", QAudio::AudioOutput))->create()); return devices; #else @@ -223,7 +223,7 @@ QList<QAudioDeviceInfo> QDarwinMediaDevices::audioOutputs() const #endif } -QList<QCameraInfo> QDarwinMediaDevices::videoInputs() const +QList<QCameraDevice> QDarwinMediaDevices::videoInputs() const { return m_cameraDevices; } @@ -236,14 +236,14 @@ void QDarwinMediaDevices::updateCameraDevices() return; #endif - QList<QCameraInfo> cameras; + QList<QCameraDevice> cameras; AVCaptureDevice *defaultDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo]; NSArray *videoDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]; for (AVCaptureDevice *device in videoDevices) { - QCameraInfoPrivate *info = new QCameraInfoPrivate; + QCameraDevicePrivate *info = new QCameraDevicePrivate; if (defaultDevice && [defaultDevice.uniqueID isEqualToString:device.uniqueID]) info->isDefault = true; info->id = QByteArray([[device uniqueID] UTF8String]); @@ -315,13 +315,13 @@ void QDarwinMediaDevices::updateCameraDevices() void QDarwinMediaDevices::updateAudioDevices() { #ifdef Q_OS_MACOS - QList<QAudioDeviceInfo> inputs = availableAudioDevices(QAudio::AudioInput); + QList<QAudioDevice> inputs = availableAudioDevices(QAudio::AudioInput); if (m_audioInputs != inputs) { m_audioInputs = inputs; audioInputsChanged(); } - QList<QAudioDeviceInfo> outputs = availableAudioDevices(QAudio::AudioOutput); + QList<QAudioDevice> outputs = availableAudioDevices(QAudio::AudioOutput); if (m_audioOutputs!= outputs) { m_audioOutputs = outputs; audioOutputsChanged(); @@ -329,12 +329,12 @@ void QDarwinMediaDevices::updateAudioDevices() #endif } -QPlatformAudioSource *QDarwinMediaDevices::createAudioSource(const QAudioDeviceInfo &info) +QPlatformAudioSource *QDarwinMediaDevices::createAudioSource(const QAudioDevice &info) { return new QDarwinAudioSource(info); } -QPlatformAudioSink *QDarwinMediaDevices::createAudioSink(const QAudioDeviceInfo &info) +QPlatformAudioSink *QDarwinMediaDevices::createAudioSink(const QAudioDevice &info) { return new QDarwinAudioSink(info); } diff --git a/src/multimedia/platform/darwin/qdarwinmediadevices_p.h b/src/multimedia/platform/darwin/qdarwinmediadevices_p.h index 87e20353e..da68643ed 100644 --- a/src/multimedia/platform/darwin/qdarwinmediadevices_p.h +++ b/src/multimedia/platform/darwin/qdarwinmediadevices_p.h @@ -53,14 +53,14 @@ #include <private/qplatformmediadevices_p.h> #include <qelapsedtimer.h> -#include <qcamerainfo.h> +#include <qcameradevice.h> Q_FORWARD_DECLARE_OBJC_CLASS(NSObject); Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureDeviceDiscoverySession); QT_BEGIN_NAMESPACE -class QCameraInfo; +class QCameraDevice; class QDarwinMediaDevices : public QPlatformMediaDevices { @@ -68,19 +68,19 @@ public: QDarwinMediaDevices(); ~QDarwinMediaDevices(); - QList<QAudioDeviceInfo> audioInputs() const override; - QList<QAudioDeviceInfo> audioOutputs() const override; - QList<QCameraInfo> videoInputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &info) override; - QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &info) override; + QList<QAudioDevice> audioInputs() const override; + QList<QAudioDevice> audioOutputs() const override; + QList<QCameraDevice> videoInputs() const override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &info) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &info) override; void updateCameraDevices(); void updateAudioDevices(); private: - QList<QCameraInfo> m_cameraDevices; - QList<QAudioDeviceInfo> m_audioInputs; - QList<QAudioDeviceInfo> m_audioOutputs; + QList<QCameraDevice> m_cameraDevices; + QList<QAudioDevice> m_audioInputs; + QList<QAudioDevice> m_audioOutputs; NSObject *m_deviceConnectedObserver; NSObject *m_deviceDisconnectedObserver; |