diff options
84 files changed, 435 insertions, 412 deletions
diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp index 677c2fc77..b3c8dea44 100644 --- a/examples/multimedia/audiodevices/audiodevices.cpp +++ b/examples/multimedia/audiodevices/audiodevices.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include "audiodevices.h" -#include <qmediadevicemanager.h> +#include <qmediadevices.h> // Utility functions for converting QAudioFormat fields into text @@ -81,7 +81,7 @@ AudioDevicesBase::~AudioDevicesBase() = default; AudioTest::AudioTest(QWidget *parent) : AudioDevicesBase(parent), - m_manager(new QMediaDeviceManager(this)) + m_devices(new QMediaDevices(this)) { connect(testButton, &QPushButton::clicked, this, &AudioTest::test); connect(modeBox, QOverload<int>::of(&QComboBox::activated), this, &AudioTest::modeChanged); @@ -90,8 +90,8 @@ AudioTest::AudioTest(QWidget *parent) connect(channelsSpinBox, &QSpinBox::valueChanged, this, &AudioTest::channelChanged); connect(sampleFormatBox, QOverload<int>::of(&QComboBox::activated), this, &AudioTest::sampleFormatChanged); connect(populateTableButton, &QPushButton::clicked, this, &AudioTest::populateTable); - connect(m_manager, &QMediaDeviceManager::audioInputsChanged, this, &AudioTest::updateAudioDevices); - connect(m_manager, &QMediaDeviceManager::audioOutputsChanged, this, &AudioTest::updateAudioDevices); + connect(m_devices, &QMediaDevices::audioInputsChanged, this, &AudioTest::updateAudioDevices); + connect(m_devices, &QMediaDevices::audioOutputsChanged, this, &AudioTest::updateAudioDevices); modeBox->setCurrentIndex(0); modeChanged(0); @@ -125,7 +125,7 @@ void AudioTest::test() void AudioTest::updateAudioDevices() { deviceBox->clear(); - const auto devices = m_mode == QAudio::AudioInput ? m_manager->audioInputs() : m_manager->audioOutputs(); + const auto devices = m_mode == QAudio::AudioInput ? m_devices->audioInputs() : m_devices->audioOutputs(); for (auto &deviceInfo: devices) deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo)); } diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h index 17d8d4888..7b74cc65a 100644 --- a/examples/multimedia/audiodevices/audiodevices.h +++ b/examples/multimedia/audiodevices/audiodevices.h @@ -52,7 +52,7 @@ #define AUDIODEVICES_H #include <QAudioDeviceInfo> -#include <QMediaDeviceManager> +#include <QMediaDevices> #include <QMainWindow> #include <QObject> @@ -76,7 +76,7 @@ private: QAudioDeviceInfo m_deviceInfo; QAudioFormat m_settings; QAudio::Mode m_mode = QAudio::AudioInput; - QMediaDeviceManager *m_manager = nullptr; + QMediaDevices *m_devices = nullptr; private slots: void updateAudioDevices(); diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index 549574ba0..b1b8e4648 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -147,10 +147,10 @@ void RenderArea::setLevel(qreal value) InputTest::InputTest() - : m_deviceManager(new QMediaDeviceManager(this)) + : m_devices(new QMediaDevices(this)) { initializeWindow(); - initializeAudio(m_deviceManager->defaultAudioInput()); + initializeAudio(m_devices->defaultAudioInput()); } @@ -163,9 +163,9 @@ void InputTest::initializeWindow() layout->addWidget(m_canvas); m_deviceBox = new QComboBox(this); - const QAudioDeviceInfo &defaultDeviceInfo = m_deviceManager->defaultAudioInput(); + const QAudioDeviceInfo &defaultDeviceInfo = m_devices->defaultAudioInput(); m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo)); - for (auto &deviceInfo: m_deviceManager->audioInputs()) { + for (auto &deviceInfo: m_devices->audioInputs()) { if (deviceInfo != defaultDeviceInfo) m_deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo)); } diff --git a/examples/multimedia/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h index ea24069a0..3575d9c44 100644 --- a/examples/multimedia/audioinput/audioinput.h +++ b/examples/multimedia/audioinput/audioinput.h @@ -61,7 +61,7 @@ #include <QSlider> #include <QWidget> #include <QScopedPointer> -#include <QMediaDeviceManager> +#include <QMediaDevices> class AudioInfo : public QIODevice { @@ -130,7 +130,7 @@ private: QComboBox *m_deviceBox = nullptr; QSlider *m_volumeSlider = nullptr; - QMediaDeviceManager *m_deviceManager = nullptr; + QMediaDevices *m_devices = nullptr; QScopedPointer<AudioInfo> m_audioInfo; QScopedPointer<QAudioInput> m_audioInput; bool m_pullMode = true; diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index 42b4c1bf2..ba421f3fa 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -141,11 +141,11 @@ qint64 Generator::bytesAvailable() const } AudioTest::AudioTest() - : m_deviceManager(new QMediaDeviceManager(this)), + : m_devices(new QMediaDevices(this)), m_pushTimer(new QTimer(this)) { initializeWindow(); - initializeAudio(m_deviceManager->defaultAudioOutput()); + initializeAudio(m_devices->defaultAudioOutput()); } AudioTest::~AudioTest() @@ -159,9 +159,9 @@ void AudioTest::initializeWindow() QVBoxLayout *layout = new QVBoxLayout; m_deviceBox = new QComboBox(this); - const QAudioDeviceInfo &defaultDeviceInfo = m_deviceManager->defaultAudioOutput(); + const QAudioDeviceInfo &defaultDeviceInfo = m_devices->defaultAudioOutput(); m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo)); - for (auto &deviceInfo: m_deviceManager->audioOutputs()) { + for (auto &deviceInfo: m_devices->audioOutputs()) { if (deviceInfo != defaultDeviceInfo) m_deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo)); } diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h index becd5ebfd..3f5f7db0c 100644 --- a/examples/multimedia/audiooutput/audiooutput.h +++ b/examples/multimedia/audiooutput/audiooutput.h @@ -64,7 +64,7 @@ #include <QSlider> #include <QTimer> #include <QScopedPointer> -#include <QMediaDeviceManager> +#include <QMediaDevices> class Generator : public QIODevice { @@ -102,7 +102,7 @@ private: void initializeAudio(const QAudioDeviceInfo &deviceInfo); private: - QMediaDeviceManager *m_deviceManager = nullptr; + QMediaDevices *m_devices = nullptr; QTimer *m_pushTimer = nullptr; // Owned by layout diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp index a19c22be4..8dc271ee0 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.cpp +++ b/examples/multimedia/audiorecorder/audiorecorder.cpp @@ -58,7 +58,7 @@ #include <QFileDialog> #include <QMediaEncoder> #include <QStandardPaths> -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #include <qaudiodeviceinfo.h> #include <qaudiobuffer.h> @@ -79,7 +79,7 @@ AudioRecorder::AudioRecorder() //audio devices ui->audioDeviceBox->addItem(tr("Default"), QVariant(QString())); - for (auto device: QMediaDeviceManager::audioInputs()) { + for (auto device: QMediaDevices::audioInputs()) { auto name = device.description(); ui->audioDeviceBox->addItem(name, QVariant::fromValue(device)); } diff --git a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml index 41c91a374..2a456e8b3 100644 --- a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml @@ -136,7 +136,7 @@ FocusScope { spacing: 8 CameraListButton { - model: MediaDeviceManager.videoInputs + model: MediaDevices.videoInputs onValueChanged: captureSession.camera.cameraInfo = value } diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml index 1f13dec00..4084b38b6 100644 --- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml @@ -111,7 +111,7 @@ FocusScope { spacing: 8 CameraListButton { - model: MediaDeviceManager.videoInputs + model: MediaDevices.videoInputs onValueChanged: captureSession.camera.cameraInfo = value } diff --git a/examples/multimedia/devices/main.cpp b/examples/multimedia/devices/main.cpp index 250d8c9a8..cfdd28116 100644 --- a/examples/multimedia/devices/main.cpp +++ b/examples/multimedia/devices/main.cpp @@ -54,7 +54,7 @@ #include <QAudioDeviceInfo> #include <QCameraInfo> -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #include <stdio.h> @@ -161,9 +161,9 @@ int main() { QTextStream out(stdout); - const auto audioInputDevices = QMediaDeviceManager::audioInputs(); - const auto audioOutputDevices = QMediaDeviceManager::audioOutputs(); - const auto videoInputDevices = QMediaDeviceManager::videoInputs(); + const auto audioInputDevices = QMediaDevices::audioInputs(); + const auto audioOutputDevices = QMediaDevices::audioOutputs(); + const auto videoInputDevices = QMediaDevices::videoInputs(); out << "Audio devices detected: " << Qt::endl; out << Qt::endl << "Input" << Qt::endl; diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp index 83f95820e..8d688ca0d 100644 --- a/examples/multimedia/spectrum/app/engine.cpp +++ b/examples/multimedia/spectrum/app/engine.cpp @@ -81,17 +81,17 @@ Engine::Engine(QObject *parent) : QObject(parent) , m_mode(QAudio::AudioInput) , m_state(QAudio::StoppedState) - , m_deviceManager(new QMediaDeviceManager(this)) + , m_devices(new QMediaDevices(this)) , m_generateTone(false) , m_file(nullptr) , m_analysisFile(nullptr) - , m_availableAudioInputDevices(m_deviceManager->audioInputs()) - , m_audioInputDevice(m_deviceManager->defaultAudioInput()) + , m_availableAudioInputDevices(m_devices->audioInputs()) + , m_audioInputDevice(m_devices->defaultAudioInput()) , m_audioInput(nullptr) , m_audioInputIODevice(nullptr) , m_recordPosition(0) - , m_availableAudioOutputDevices(m_deviceManager->audioOutputs()) - , m_audioOutputDevice(m_deviceManager->defaultAudioOutput()) + , m_availableAudioOutputDevices(m_devices->audioOutputs()) + , m_audioOutputDevice(m_devices->defaultAudioOutput()) , m_audioOutput(nullptr) , m_playPosition(0) , m_bufferPosition(0) diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h index f403afb80..a6aada174 100644 --- a/examples/multimedia/spectrum/app/engine.h +++ b/examples/multimedia/spectrum/app/engine.h @@ -61,7 +61,7 @@ #include <QDir> #include <QList> #include <QObject> -#include <QMediaDeviceManager> +#include <QMediaDevices> #include <QWaveDecoder> #include <QTimer> @@ -279,7 +279,7 @@ private: private: QAudio::Mode m_mode; QAudio::State m_state; - QMediaDeviceManager *m_deviceManager; + QMediaDevices *m_devices; bool m_generateTone; SweptTone m_tone; diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp index b7cbd936a..acc2a32e5 100644 --- a/examples/multimediawidgets/camera/camera.cpp +++ b/examples/multimediawidgets/camera/camera.cpp @@ -64,7 +64,7 @@ #include <QImage> #include <QtWidgets> -#include <QMediaDeviceManager> +#include <QMediaDevices> #include <QMediaFormat> Camera::Camera() @@ -77,14 +77,14 @@ Camera::Camera() videoDevicesGroup = new QActionGroup(this); videoDevicesGroup->setExclusive(true); updateCameras(); - connect(&m_manager, &QMediaDeviceManager::videoInputsChanged, this, &Camera::updateCameras); + connect(&m_devices, &QMediaDevices::videoInputsChanged, this, &Camera::updateCameras); connect(videoDevicesGroup, &QActionGroup::triggered, this, &Camera::updateCameraDevice); connect(ui->captureWidget, &QTabWidget::currentChanged, this, &Camera::updateCaptureMode); connect(ui->metaDataButton, &QPushButton::clicked, this, &Camera::showMetaDataDialog); - setCamera(QMediaDeviceManager::defaultVideoInput()); + setCamera(QMediaDevices::defaultVideoInput()); qDebug() << "Supported Containers:"; auto containers = QMediaFormat().supportedFileFormats(QMediaFormat::Encode); @@ -395,12 +395,12 @@ void Camera::closeEvent(QCloseEvent *event) void Camera::updateCameras() { ui->menuDevices->clear(); - const QList<QCameraInfo> availableCameras = QMediaDeviceManager::videoInputs(); + const QList<QCameraInfo> availableCameras = QMediaDevices::videoInputs(); for (const QCameraInfo &cameraInfo : availableCameras) { QAction *videoDeviceAction = new QAction(cameraInfo.description(), videoDevicesGroup); videoDeviceAction->setCheckable(true); videoDeviceAction->setData(QVariant::fromValue(cameraInfo)); - if (cameraInfo == QMediaDeviceManager::defaultVideoInput()) + if (cameraInfo == QMediaDevices::defaultVideoInput()) videoDeviceAction->setChecked(true); ui->menuDevices->addAction(videoDeviceAction); diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h index 3a17233b2..2424b57d0 100644 --- a/examples/multimediawidgets/camera/camera.h +++ b/examples/multimediawidgets/camera/camera.h @@ -57,7 +57,7 @@ #include <QScopedPointer> #include <QMediaMetaData> #include <QMediaCaptureSession> -#include <QMediaDeviceManager> +#include <QMediaDevices> #include <QMainWindow> @@ -130,7 +130,7 @@ private: QActionGroup *videoDevicesGroup = nullptr; - QMediaDeviceManager m_manager; + QMediaDevices m_devices; QMediaCaptureSession m_captureSession; QScopedPointer<QCamera> m_camera; QCameraImageCapture *m_imageCapture; diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp index 367211b2c..6fe7f55e2 100644 --- a/examples/multimediawidgets/player/player.cpp +++ b/examples/multimediawidgets/player/player.cpp @@ -57,7 +57,7 @@ #include <QMediaPlaylist> #include <QMediaMetaData> -#include <QMediaDeviceManager> +#include <QMediaDevices> #include <QAudioDeviceInfo> #include <QMediaFormat> #include <QtWidgets> @@ -191,7 +191,7 @@ Player::Player(QWidget *parent) m_audioOutput = new QComboBox(this); m_audioOutput->addItem(QString::fromUtf8("Default"), QVariant::fromValue(QAudioDeviceInfo())); - for (auto &deviceInfo: QMediaDeviceManager::audioOutputs()) + for (auto &deviceInfo: QMediaDevices::audioOutputs()) m_audioOutput->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo)); connect(m_audioOutput, QOverload<int>::of(&QComboBox::activated), this, &Player::audioOutputChanged); diff --git a/src/multimedia/.prev_CMakeLists.txt b/src/multimedia/.prev_CMakeLists.txt index 1379b0fe5..5d0cab807 100644 --- a/src/multimedia/.prev_CMakeLists.txt +++ b/src/multimedia/.prev_CMakeLists.txt @@ -48,13 +48,13 @@ qt_internal_add_module(Multimedia controls/qvideorenderercontrol.cpp controls/qvideorenderercontrol.h controls/qvideowindowcontrol.cpp controls/qvideowindowcontrol.h platform/qmediaplatformcaptureinterface.cpp platform/qmediaplatformcaptureinterface_p.h - platform/qmediaplatformdevicemanager.cpp platform/qmediaplatformdevicemanager_p.h + platform/qmediaplatformmediadevices.cpp platform/qmediaplatformmediadevices_p.h platform/qmediaplatformintegration.cpp platform/qmediaplatformintegration_p.h platform/qmediaplatformplayerinterface.cpp platform/qmediaplatformplayerinterface_p.h playback/qmediaplayer.cpp playback/qmediaplayer.h playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h playback/qplaylistfileparser.cpp playback/qplaylistfileparser_p.h - qmediadevicemanager.cpp qmediadevicemanager.h + qmediadevices.cpp qmediadevices.h qmediaenumdebug.h qmediametadata.cpp qmediametadata.h qmediapluginloader.cpp qmediapluginloader_p.h @@ -167,7 +167,7 @@ qt_internal_extend_target(Multimedia CONDITION WIN32 platform/windows/player/mfvideoprobecontrol.cpp platform/windows/player/mfvideoprobecontrol_p.h platform/windows/player/mfvideorenderercontrol.cpp platform/windows/player/mfvideorenderercontrol_p.h platform/windows/player/samplegrabber.cpp platform/windows/player/samplegrabber_p.h - platform/windows/qwindowsdevicemanager.cpp platform/windows/qwindowsdevicemanager_p.h + platform/windows/qwindowsmediadevices.cpp platform/windows/qwindowsmediadevices_p.h platform/windows/qwindowsintegration.cpp platform/windows/qwindowsintegration_p.h platform/windows/sourceresolver.cpp platform/windows/sourceresolver_p.h INCLUDE_DIRECTORIES @@ -228,7 +228,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer platform/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp platform/gstreamer/mediaplayer/qgstreamermetadataprovider_p.h platform/gstreamer/mediaplayer/qgstreamerplayerservice.cpp platform/gstreamer/mediaplayer/qgstreamerplayerservice_p.h platform/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp platform/gstreamer/mediaplayer/qgstreamerstreamscontrol_p.h - platform/gstreamer/qgstreamerdevicemanager.cpp platform/gstreamer/qgstreamerdevicemanager_p.h + platform/gstreamer/qgstreamermediadevices.cpp platform/gstreamer/qgstreamermediadevices_p.h platform/gstreamer/qgstreamerintegration.cpp platform/gstreamer/qgstreamerintegration_p.h DEFINES GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 @@ -333,7 +333,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_pulseaudio platform/pulseaudio/qaudioengine_pulse.cpp platform/pulseaudio/qaudioengine_pulse_p.h platform/pulseaudio/qaudioinput_pulse.cpp platform/pulseaudio/qaudioinput_pulse_p.h platform/pulseaudio/qaudiooutput_pulse.cpp platform/pulseaudio/qaudiooutput_pulse_p.h - platform/pulseaudio/qpulseaudiodevicemanager.cpp platform/pulseaudio/qpulseaudiodevicemanager_p.h + platform/pulseaudio/qpulseaudiomediadevices.cpp platform/pulseaudio/qpulseaudiomediadevices_p.h platform/pulseaudio/qpulseaudiointegration.cpp platform/pulseaudio/qpulseaudiointegration_p.h platform/pulseaudio/qpulsehelpers.cpp platform/pulseaudio/qpulsehelpers_p.h LIBRARIES @@ -345,7 +345,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_alsa platform/alsa/qalsaaudiodeviceinfo.cpp platform/alsa/qalsaaudiodeviceinfo_p.h platform/alsa/qalsaaudioinput.cpp platform/alsa/qalsaaudioinput_p.h platform/alsa/qalsaaudiooutput.cpp platform/alsa/qalsaaudiooutput_p.h - platform/alsa/qalsadevicemanager.cpp platform/alsa/qalsadevicemanager_p.h + platform/alsa/qalsamediadevices.cpp platform/alsa/qalsamediadevices_p.h platform/alsa/qalsaintegration.cpp platform/alsa/qalsaintegration_p.h LIBRARIES alsa @@ -380,7 +380,7 @@ qt_internal_extend_target(Multimedia CONDITION ANDROID platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol.cpp platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol_p.h platform/android/mediaplayer/qandroidmediaservice.cpp platform/android/mediaplayer/qandroidmediaservice_p.h platform/android/mediaplayer/qandroidmetadatareadercontrol.cpp platform/android/mediaplayer/qandroidmetadatareadercontrol_p.h - platform/android/qandroiddevicemanager.cpp platform/android/qandroiddevicemanager_p.h + platform/android/qandroidmediadevices.cpp platform/android/qandroidmediadevices_p.h platform/android/qandroidintegration.cpp platform/android/qandroidintegration_p.h platform/android/qandroidmediaserviceplugin.cpp platform/android/qandroidmediaserviceplugin_p.h platform/android/wrappers/jni/androidcamera.cpp platform/android/wrappers/jni/androidcamera_p.h @@ -429,7 +429,7 @@ qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS platform/darwin/mediaplayer/avfmediaplayersession.mm platform/darwin/mediaplayer/avfmediaplayersession_p.h platform/darwin/mediaplayer/avfvideooutput.mm platform/darwin/mediaplayer/avfvideooutput_p.h platform/darwin/mediaplayer/avfvideowindowcontrol.mm platform/darwin/mediaplayer/avfvideowindowcontrol_p.h - platform/darwin/qdarwindevicemanager.mm platform/darwin/qdarwindevicemanager_p.h + platform/darwin/qdarwinmediadevices.mm platform/darwin/qdarwinmediadevices_p.h platform/darwin/qdarwinintegration.mm platform/darwin/qdarwinintegration_p.h PUBLIC_LIBRARIES ${FWAudioToolbox} @@ -553,7 +553,7 @@ qt_internal_extend_target(Multimedia CONDITION QNX platform/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp platform/qnx/mediaplayer/mmrenderervideowindowcontrol_p.h platform/qnx/mediaplayer/mmrevent_p.hread.cpp platform/qnx/mediaplayer/mmrevent_p.hread.h platform/qnx/mediaplayer/mmreventmediaplayercontrol.cpp platform/qnx/mediaplayer/mmreventmediaplayercontrol_p.h - platform/qnx/qqnxdevicemanager.cpp platform/qnx/qqnxdevicemanager_p.h + platform/qnx/qqnxmediadevices.cpp platform/qnx/qqnxmediadevices_p.h platform/qnx/qqnxintegration.cpp platform/qnx/qqnxintegration_p.h INCLUDE_DIRECTORIES platform/qnx/camera diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 28c1e7e32..f7bc809be 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -39,7 +39,7 @@ qt_internal_add_module(Multimedia platform/qplatformcameraimagecapture.cpp platform/qplatformcameraimagecapture_p.h platform/qplatformcameraimageprocessing.cpp platform/qplatformcameraimageprocessing_p.h platform/qplatformmediacapture.cpp platform/qplatformmediacapture_p.h - platform/qplatformmediadevicemanager.cpp platform/qplatformmediadevicemanager_p.h + platform/qplatformmediadevices.cpp platform/qplatformmediadevices_p.h platform/qplatformmediaencoder.cpp platform/qplatformmediaencoder_p.h platform/qplatformmediaformatinfo.cpp platform/qplatformmediaformatinfo_p.h platform/qplatformmediaintegration.cpp platform/qplatformmediaintegration_p.h @@ -48,7 +48,7 @@ qt_internal_add_module(Multimedia playback/qmediaplayer.cpp playback/qmediaplayer.h playback/qmediaplayer_p.h playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h playback/qplaylistfileparser.cpp playback/qplaylistfileparser_p.h - qmediadevicemanager.cpp qmediadevicemanager.h + qmediadevices.cpp qmediadevices.h qmediaenumdebug.h qmediaformat.cpp qmediaformat.h qmediametadata.cpp qmediametadata.h @@ -173,7 +173,7 @@ qt_internal_extend_target(Multimedia CONDITION WIN32 platform/windows/mediacapture/qwindowsmediacapture_p.h platform/windows/mediacapture/qwindowsmediaencoder.cpp platform/windows/mediacapture/qwindowsmediaencoder_p.h - platform/windows/qwindowsdevicemanager.cpp platform/windows/qwindowsdevicemanager_p.h + platform/windows/qwindowsmediadevices.cpp platform/windows/qwindowsmediadevices_p.h platform/windows/qwindowsformatinfo.cpp platform/windows/qwindowsformatinfo_p.h platform/windows/qwindowsintegration.cpp platform/windows/qwindowsintegration_p.h platform/windows/sourceresolver.cpp platform/windows/sourceresolver_p.h @@ -230,7 +230,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer platform/gstreamer/common/qgstutils.cpp platform/gstreamer/common/qgstutils_p.h platform/gstreamer/common/qgstvideobuffer.cpp platform/gstreamer/common/qgstvideobuffer_p.h platform/gstreamer/common/qgstvideorenderersink.cpp platform/gstreamer/common/qgstvideorenderersink_p.h - platform/gstreamer/qgstreamerdevicemanager.cpp platform/gstreamer/qgstreamerdevicemanager_p.h + platform/gstreamer/qgstreamermediadevices.cpp platform/gstreamer/qgstreamermediadevices_p.h platform/gstreamer/qgstreamerformatinfo.cpp platform/gstreamer/qgstreamerformatinfo_p.h platform/gstreamer/qgstreamerintegration.cpp platform/gstreamer/qgstreamerintegration_p.h platform/gstreamer/mediacapture/qgstreamercamera.cpp platform/gstreamer/mediacapture/qgstreamercamera_p.h @@ -287,7 +287,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_pulseaudio platform/pulseaudio/qaudioengine_pulse.cpp platform/pulseaudio/qaudioengine_pulse_p.h platform/pulseaudio/qaudioinput_pulse.cpp platform/pulseaudio/qaudioinput_pulse_p.h platform/pulseaudio/qaudiooutput_pulse.cpp platform/pulseaudio/qaudiooutput_pulse_p.h - platform/pulseaudio/qpulseaudiodevicemanager.cpp platform/pulseaudio/qpulseaudiodevicemanager_p.h + platform/pulseaudio/qpulseaudiomediadevices.cpp platform/pulseaudio/qpulseaudiomediadevices_p.h platform/pulseaudio/qpulseaudiointegration.cpp platform/pulseaudio/qpulseaudiointegration_p.h platform/pulseaudio/qpulsehelpers.cpp platform/pulseaudio/qpulsehelpers_p.h LIBRARIES @@ -299,7 +299,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_alsa platform/alsa/qalsaaudiodeviceinfo.cpp platform/alsa/qalsaaudiodeviceinfo_p.h platform/alsa/qalsaaudioinput.cpp platform/alsa/qalsaaudioinput_p.h platform/alsa/qalsaaudiooutput.cpp platform/alsa/qalsaaudiooutput_p.h - platform/alsa/qalsadevicemanager.cpp platform/alsa/qalsadevicemanager_p.h + platform/alsa/qalsamediadevices.cpp platform/alsa/qalsamediadevices_p.h platform/alsa/qalsaintegration.cpp platform/alsa/qalsaintegration_p.h LIBRARIES ALSA::ALSA @@ -327,7 +327,7 @@ qt_internal_extend_target(Multimedia CONDITION ANDROID platform/android/mediaplayer/qandroidmediaplayercontrol.cpp platform/android/mediaplayer/qandroidmediaplayercontrol_p.h platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol.cpp platform/android/mediaplayer/qandroidmediaplayervideorenderercontrol_p.h platform/android/mediaplayer/qandroidmetadata.cpp platform/android/mediaplayer/qandroidmetadata_p.h - platform/android/qandroiddevicemanager.cpp platform/android/qandroiddevicemanager_p.h + platform/android/qandroidmediadevices.cpp platform/android/qandroidmediadevices_p.h platform/android/qandroidformatsinfo.cpp platform/android/qandroidformatsinfo_p.h platform/android/qandroidintegration.cpp platform/android/qandroidintegration_p.h platform/android/wrappers/jni/androidcamera.cpp platform/android/wrappers/jni/androidcamera_p.h @@ -376,7 +376,7 @@ qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS platform/darwin/mediaplayer/avfvideorenderercontrol.mm platform/darwin/mediaplayer/avfvideorenderercontrol_p.h platform/darwin/avfvideosink.mm platform/darwin/avfvideosink_p.h platform/darwin/avfvideobuffer.mm platform/darwin/avfvideobuffer_p.h - platform/darwin/qdarwindevicemanager.mm platform/darwin/qdarwindevicemanager_p.h + platform/darwin/qdarwinmediadevices.mm platform/darwin/qdarwinmediadevices_p.h platform/darwin/qdarwinformatsinfo.mm platform/darwin/qdarwinformatsinfo_p.h platform/darwin/qdarwinintegration.mm platform/darwin/qdarwinintegration_p.h PUBLIC_LIBRARIES @@ -469,7 +469,7 @@ qt_internal_extend_target(Multimedia CONDITION QNX platform/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp platform/qnx/mediaplayer/mmrenderervideowindowcontrol_p.h platform/qnx/mediaplayer/mmrevent_p.hread.cpp platform/qnx/mediaplayer/mmrevent_p.hread.h platform/qnx/mediaplayer/mmreventmediaplayercontrol.cpp platform/qnx/mediaplayer/mmreventmediaplayercontrol_p.h - platform/qnx/qqnxdevicemanager.cpp platform/qnx/qqnxdevicemanager_p.h + platform/qnx/qqnxmediadevices.cpp platform/qnx/qqnxmediadevices_p.h platform/qnx/qqnxintegration.cpp platform/qnx/qqnxintegration_p.h INCLUDE_DIRECTORIES platform/qnx/camera diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp index 847872795..7b6352256 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo.cpp @@ -39,7 +39,7 @@ #include "qaudiosystem_p.h" #include "qaudiodeviceinfo_p.h" -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <private/qplatformmediaintegration_p.h> #include <QtCore/qmap.h> diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp index 80840f63c..5d6e64ae0 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/audio/qaudioinput.cpp @@ -43,7 +43,7 @@ #include "qaudiosystem_p.h" #include "qaudioinput.h" -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE @@ -132,7 +132,7 @@ QAudioInput::QAudioInput(const QAudioFormat &format, QObject *parent) QAudioInput::QAudioInput(const QAudioDeviceInfo &audioDevice, const QAudioFormat &format, QObject *parent): QObject(parent) { - d = QPlatformMediaIntegration::instance()->deviceManager()->audioInputDevice(format, audioDevice); + d = QPlatformMediaIntegration::instance()->devices()->audioInputDevice(format, audioDevice); if (d) connect(d, SIGNAL(stateChanged(QAudio::State)), SIGNAL(stateChanged(QAudio::State))); } diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp index 3f0375da3..0d404cb81 100644 --- a/src/multimedia/audio/qaudiooutput.cpp +++ b/src/multimedia/audio/qaudiooutput.cpp @@ -43,7 +43,7 @@ #include "qaudiosystem_p.h" #include "qaudiooutput.h" -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <private/qplatformmediaintegration_p.h> QT_BEGIN_NAMESPACE @@ -121,7 +121,7 @@ QAudioOutput::QAudioOutput(const QAudioFormat &format, QObject *parent) QAudioOutput::QAudioOutput(const QAudioDeviceInfo &audioDevice, const QAudioFormat &format, QObject *parent): QObject(parent) { - d = QPlatformMediaIntegration::instance()->deviceManager()->audioOutputDevice(format, audioDevice); + d = QPlatformMediaIntegration::instance()->devices()->audioOutputDevice(format, audioDevice); if (d) { connect(d, SIGNAL(stateChanged(QAudio::State)), SIGNAL(stateChanged(QAudio::State))); } diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index e0e1ec485..e4ec467c1 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -42,7 +42,7 @@ #include "qsamplecache_p.h" #include "qaudiodeviceinfo.h" #include "qaudiooutput.h" -#include "qmediadevicemanager.h" +#include "qmediadevices.h" #include <QtCore/qloggingcategory.h> Q_LOGGING_CATEGORY(qLcSoundEffect, "qt.multimedia.soundeffect") @@ -319,7 +319,7 @@ QSoundEffect::~QSoundEffect() QStringList QSoundEffect::supportedMimeTypes() { // Only return supported mime types if we have a audio device available - const QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs(); + const QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs(); if (devices.isEmpty()) return QStringList(); diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index a91a367b3..2e9c5ed48 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -48,7 +48,7 @@ #include <private/qplatformcameraimagecapture_p.h> #include <private/qplatformmediaintegration_p.h> #include <private/qplatformmediacapture_p.h> -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #include <qmediacapturesession.h> #include <QDebug> @@ -109,7 +109,7 @@ void QCameraPrivate::init() */ QCamera::QCamera(QObject *parent) - : QCamera(QMediaDeviceManager::defaultVideoInput(), parent) + : QCamera(QMediaDevices::defaultVideoInput(), parent) { } @@ -147,7 +147,7 @@ QCamera::QCamera(QCameraInfo::Position position, QObject *parent) d->init(); QCameraInfo info; - auto cameras = QMediaDeviceManager::videoInputs(); + auto cameras = QMediaDevices::videoInputs(); for (const auto &c : cameras) { if (c.position() == position) { info = c; diff --git a/src/multimedia/platform/alsa/qalsaintegration.cpp b/src/multimedia/platform/alsa/qalsaintegration.cpp index 5c5cb598b..bfbc40c6a 100644 --- a/src/multimedia/platform/alsa/qalsaintegration.cpp +++ b/src/multimedia/platform/alsa/qalsaintegration.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qalsaintegration_p.h" -#include "qalsadevicemanager_p.h" +#include "qalsamediadevices_p.h" QT_BEGIN_NAMESPACE @@ -48,14 +48,14 @@ QAlsaIntegration::QAlsaIntegration() QAlsaIntegration::~QAlsaIntegration() { - delete m_manager; + delete m_devices; } -QPlatformMediaDeviceManager *QAlsaIntegration::deviceManager() +QPlatformMediaDevices *QAlsaIntegration::devices() { - if (!m_manager) - m_manager = new QAlsaDeviceManager(); - return m_manager; + if (!m_devices) + m_devices = new QAlsaMediaDevices(); + return m_devices; } QT_END_NAMESPACE diff --git a/src/multimedia/platform/alsa/qalsaintegration_p.h b/src/multimedia/platform/alsa/qalsaintegration_p.h index 31789e852..a3b7315b3 100644 --- a/src/multimedia/platform/alsa/qalsaintegration_p.h +++ b/src/multimedia/platform/alsa/qalsaintegration_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -class QAlsaDeviceManager; +class QAlsaMediaDevices; class QAlsaIntegration : public QPlatformMediaIntegration { @@ -63,9 +63,9 @@ public: QAlsaIntegration(); ~QAlsaIntegration(); - QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaDevices *devices() override; - QAlsaDeviceManager *m_manager = nullptr; + QAlsaMediaDevices *m_devices = nullptr; }; QT_END_NAMESPACE diff --git a/src/multimedia/platform/alsa/qalsadevicemanager.cpp b/src/multimedia/platform/alsa/qalsamediadevices.cpp index cf18bf0c4..a6823191e 100644 --- a/src/multimedia/platform/alsa/qalsadevicemanager.cpp +++ b/src/multimedia/platform/alsa/qalsamediadevices.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qalsadevicemanager_p.h" -#include "qmediadevicemanager.h" +#include "qalsamediadevices_p.h" +#include "qmediadevices.h" #include "qcamerainfo_p.h" #include "private/qalsaaudioinput_p.h" @@ -49,8 +49,8 @@ QT_BEGIN_NAMESPACE -QAlsaDeviceManager::QAlsaDeviceManager() - : QPlatformMediaDeviceManager() +QAlsaMediaDevices::QAlsaMediaDevices() + : QPlatformMediaDevices() { } @@ -100,27 +100,27 @@ static QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode) return devices; } -QList<QAudioDeviceInfo> QAlsaDeviceManager::audioInputs() const +QList<QAudioDeviceInfo> QAlsaMediaDevices::audioInputs() const { return availableDevices(QAudio::AudioInput); } -QList<QAudioDeviceInfo> QAlsaDeviceManager::audioOutputs() const +QList<QAudioDeviceInfo> QAlsaMediaDevices::audioOutputs() const { return availableDevices(QAudio::AudioOutput); } -QList<QCameraInfo> QAlsaDeviceManager::videoInputs() const +QList<QCameraInfo> QAlsaMediaDevices::videoInputs() const { return {}; } -QAbstractAudioInput *QAlsaDeviceManager::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioInput *QAlsaMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) { return new QAlsaAudioInput(deviceInfo.id()); } -QAbstractAudioOutput *QAlsaDeviceManager::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioOutput *QAlsaMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) { return new QAlsaAudioOutput(deviceInfo.id()); } diff --git a/src/multimedia/platform/alsa/qalsadevicemanager_p.h b/src/multimedia/platform/alsa/qalsamediadevices_p.h index aedb186bf..204d6c138 100644 --- a/src/multimedia/platform/alsa/qalsadevicemanager_p.h +++ b/src/multimedia/platform/alsa/qalsamediadevices_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QALSADEVICEMANAGER_H -#define QALSADEVICEMANAGER_H +#ifndef QALSAMEDIADEVICES_H +#define QALSAMEDIADEVICES_H // // W A R N I N G @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <qset.h> #include <qaudio.h> @@ -59,10 +59,10 @@ QT_BEGIN_NAMESPACE class QAlsaEngine; -class QAlsaDeviceManager : public QPlatformMediaDeviceManager +class QAlsaMediaDevices : public QPlatformMediaDevices { public: - QAlsaDeviceManager(); + QAlsaMediaDevices(); QList<QAudioDeviceInfo> audioInputs() const override; QList<QAudioDeviceInfo> audioOutputs() const override; diff --git a/src/multimedia/platform/android/audio/qopenslesaudiooutput.cpp b/src/multimedia/platform/android/audio/qopenslesaudiooutput.cpp index dc4eaa815..0951da8c6 100644 --- a/src/multimedia/platform/android/audio/qopenslesaudiooutput.cpp +++ b/src/multimedia/platform/android/audio/qopenslesaudiooutput.cpp @@ -41,7 +41,7 @@ #include "qopenslesengine_p.h" #include <QDebug> #include <qmath.h> -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #ifdef ANDROID #include <SLES/OpenSLES_Android.h> @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE static inline void openSlDebugInfo() { - const QAudioFormat &format = QMediaDeviceManager::defaultAudioOutput().preferredFormat(); + const QAudioFormat &format = QMediaDevices::defaultAudioOutput().preferredFormat(); qDebug() << "======= OpenSL ES Device info =======" << "\nSupports low-latency playback: " << (QOpenSLESEngine::supportsLowLatency() ? "YES" : "NO") << "\nPreferred sample rate: " << QOpenSLESEngine::getOutputValue(QOpenSLESEngine::SampleRate, -1) diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp index c079742a0..cd7e80411 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp @@ -44,7 +44,7 @@ #include "qandroidcameraimageprocessingcontrol_p.h" #include "qandroidcameravideorenderercontrol_p.h" #include "qandroidcaptureservice_p.h" -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #include <qcamerainfo.h> #include <qtimer.h> @@ -83,7 +83,7 @@ QCamera::Status QAndroidCameraControl::status() const void QAndroidCameraControl::setCamera(const QCameraInfo &camera) { int id = 0; - auto cameras = QMediaDeviceManager::videoInputs(); + auto cameras = QMediaDevices::videoInputs(); for (int i = 0; i < cameras.size(); ++i) { if (cameras.at(i) == camera) { id = i; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp index 3bf76ee83..6a84f324a 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp @@ -46,7 +46,7 @@ #include "qandroidcamerasession_p.h" #include "qandroidcameravideorenderercontrol_p.h" #include "qandroidcameraimagecapturecontrol_p.h" -#include "qmediadevicemanager.h" +#include "qmediadevices.h" #include "qaudiodeviceinfo.h" QT_BEGIN_NAMESPACE @@ -164,14 +164,14 @@ void QAndroidCaptureService::setVolume(qreal volume) QAudioDeviceInfo QAndroidCaptureService::audioInput() const { - const auto devices = QMediaDeviceManager::audioInputs(); + const auto devices = QMediaDevices::audioInputs(); QByteArray id = m_captureSession->audioInput().toLatin1(); for (auto c : devices) { if (c.id() == id) return c; } - return QMediaDeviceManager::defaultAudioInput(); + return QMediaDevices::defaultAudioInput(); } bool QAndroidCaptureService::setAudioInput(const QAudioDeviceInfo &info) diff --git a/src/multimedia/platform/android/qandroiddevicemanager.cpp b/src/multimedia/platform/android/qandroiddevicemanager.cpp index 9c40be93f..da1c5ea3c 100644 --- a/src/multimedia/platform/android/qandroiddevicemanager.cpp +++ b/src/multimedia/platform/android/qandroiddevicemanager.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qandroiddevicemanager_p.h" -#include "qmediadevicemanager.h" +#include "qandroidmediadevices_p.h" +#include "qmediadevices.h" #include "qcamerainfo_p.h" #include "private/qopenslesaudioinput_p.h" @@ -50,32 +50,32 @@ QT_BEGIN_NAMESPACE -QAndroidDeviceManager::QAndroidDeviceManager() - : QPlatformMediaDeviceManager() +QAndroidMediaDevices::QAndroidMediaDevices() + : QPlatformMediaDevices() { } -QList<QAudioDeviceInfo> QAndroidDeviceManager::audioInputs() const +QList<QAudioDeviceInfo> QAndroidMediaDevices::audioInputs() const { return QOpenSLESEngine::availableDevices(QAudio::AudioInput); } -QList<QAudioDeviceInfo> QAndroidDeviceManager::audioOutputs() const +QList<QAudioDeviceInfo> QAndroidMediaDevices::audioOutputs() const { return QOpenSLESEngine::availableDevices(QAudio::AudioOutput); } -QList<QCameraInfo> QAndroidDeviceManager::videoInputs() const +QList<QCameraInfo> QAndroidMediaDevices::videoInputs() const { return QAndroidCameraSession::availableCameras(); } -QAbstractAudioInput *QAndroidDeviceManager::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioInput *QAndroidMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) { return new QOpenSLESAudioInput(deviceInfo.id()); } -QAbstractAudioOutput *QAndroidDeviceManager::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioOutput *QAndroidMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) { return new QOpenSLESAudioOutput(deviceInfo.id()); } diff --git a/src/multimedia/platform/android/qandroiddevicemanager_p.h b/src/multimedia/platform/android/qandroiddevicemanager_p.h index 76499994e..c0f75d860 100644 --- a/src/multimedia/platform/android/qandroiddevicemanager_p.h +++ b/src/multimedia/platform/android/qandroiddevicemanager_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QANDROIDDEVICEMANAGER_H -#define QANDROIDDEVICEMANAGER_H +#ifndef QANDROIDMEDIADEVICES_H +#define QANDROIDMEDIADEVICES_H // // W A R N I N G @@ -51,15 +51,15 @@ // We mean it. // -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <qaudio.h> QT_BEGIN_NAMESPACE -class QAndroidDeviceManager : public QPlatformMediaDeviceManager +class QAndroidMediaDevices : public QPlatformMediaDevices { public: - QAndroidDeviceManager(); + QAndroidMediaDevices(); QList<QAudioDeviceInfo> audioInputs() const override; QList<QAudioDeviceInfo> audioOutputs() const override; diff --git a/src/multimedia/platform/android/qandroidintegration.cpp b/src/multimedia/platform/android/qandroidintegration.cpp index 2ee95a509..0481de822 100644 --- a/src/multimedia/platform/android/qandroidintegration.cpp +++ b/src/multimedia/platform/android/qandroidintegration.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qandroidintegration_p.h" -#include "qandroiddevicemanager_p.h" +#include "qandroidmediadevices_p.h" #include "private/qandroidglobal_p.h" #include "private/qandroidcaptureservice_p.h" #include "private/androidmediaplayer_p.h" @@ -64,15 +64,15 @@ QAndroidIntegration::QAndroidIntegration() QAndroidIntegration::~QAndroidIntegration() { - delete m_manager; + delete m_devices; delete m_formatInfo; } -QPlatformMediaDeviceManager *QAndroidIntegration::deviceManager() +QPlatformMediaDevices *QAndroidIntegration::devices() { - if (!m_manager) - m_manager = new QAndroidDeviceManager(); - return m_manager; + if (!m_devices) + m_devices = new QAndroidMediaDevices(); + return m_devices; } QPlatformMediaFormatInfo *QAndroidIntegration::formatInfo() diff --git a/src/multimedia/platform/android/qandroidintegration_p.h b/src/multimedia/platform/android/qandroidintegration_p.h index 540d66e21..14cedf02c 100644 --- a/src/multimedia/platform/android/qandroidintegration_p.h +++ b/src/multimedia/platform/android/qandroidintegration_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -class QAndroidDeviceManager; +class QAndroidMediaDevices; class QAndroidIntegration : public QPlatformMediaIntegration { @@ -63,7 +63,7 @@ public: QAndroidIntegration(); ~QAndroidIntegration(); - QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaDevices *devices() override; QPlatformMediaFormatInfo *formatInfo() override; QPlatformMediaCaptureSession *createCaptureSession(QMediaRecorder::CaptureMode mode) override; @@ -72,7 +72,7 @@ public: QPlatformMediaEncoder *createEncoder(QMediaEncoder *encoder) override; QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *imageCapture) override; - QAndroidDeviceManager *m_manager = nullptr; + QAndroidMediaDevices *m_devices = nullptr; QPlatformMediaFormatInfo *m_formatInfo = nullptr; }; diff --git a/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm b/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm index 025304ae5..8206707e6 100644 --- a/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm +++ b/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm @@ -40,8 +40,8 @@ #include "qcoreaudiosessionmanager_p.h" #include "qcoreaudiodeviceinfo_p.h" #include "qcoreaudioutils_p.h" -#include "private/qdarwindevicemanager_p.h" -#include <qmediadevicemanager.h> +#include "private/qdarwinmediadevices_p.h" +#include <qmediadevices.h> #if defined(Q_OS_OSX) # include <AudioUnit/AudioComponent.h> @@ -462,7 +462,7 @@ CoreAudioInput::CoreAudioInput(const QAudioDeviceInfo &device) { QAudioDeviceInfo di = device; if (di.isNull()) - di = QMediaDeviceManager::defaultAudioInput(); + di = QMediaDevices::defaultAudioInput(); #if defined(Q_OS_MACOS) const QCoreAudioDeviceInfo *info = static_cast<const QCoreAudioDeviceInfo *>(di.handle()); Q_ASSERT(info); diff --git a/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm b/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm index d78ca66bf..6d9658277 100644 --- a/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm +++ b/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm @@ -40,8 +40,8 @@ #include "qcoreaudiosessionmanager_p.h" #include "qcoreaudiodeviceinfo_p.h" #include "qcoreaudioutils_p.h" -#include <private/qdarwindevicemanager_p.h> -#include <qmediadevicemanager.h> +#include <private/qdarwinmediadevices_p.h> +#include <qmediadevices.h> #include <QtCore/QDataStream> #include <QtCore/QTimer> @@ -237,7 +237,7 @@ QCoreAudioOutput::QCoreAudioOutput(const QAudioDeviceInfo &device) { QAudioDeviceInfo di = device; if (di.isNull()) - di = QMediaDeviceManager::defaultAudioOutput(); + di = QMediaDevices::defaultAudioOutput(); #if defined(Q_OS_MACOS) const QCoreAudioDeviceInfo *info = static_cast<const QCoreAudioDeviceInfo *>(di.handle()); Q_ASSERT(info); diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice.mm b/src/multimedia/platform/darwin/camera/avfcameraservice.mm index a77398333..1f71b793a 100644 --- a/src/multimedia/platform/darwin/camera/avfcameraservice.mm +++ b/src/multimedia/platform/darwin/camera/avfcameraservice.mm @@ -50,7 +50,7 @@ #include "avfcameraexposure_p.h" #include "avfcameraimageprocessing_p.h" #include "avfmediaencoder_p.h" -#include <qmediadevicemanager.h> +#include <qmediadevices.h> QT_USE_NAMESPACE @@ -155,11 +155,11 @@ void AVFCameraService::setVolume(qreal volume) QAudioDeviceInfo AVFCameraService::audioInput() const { QByteArray id = [[m_audioCaptureDevice uniqueID] UTF8String]; - const QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioInputs(); + const QList<QAudioDeviceInfo> devices = QMediaDevices::audioInputs(); for (auto d : devices) if (d.id() == id) return d; - return QMediaDeviceManager::defaultAudioInput(); + return QMediaDevices::defaultAudioInput(); } bool AVFCameraService::setAudioInput(const QAudioDeviceInfo &id) diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm index 2dc790cbf..be347b6a0 100644 --- a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm +++ b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm @@ -47,7 +47,7 @@ #include "avfcamerautility_p.h" #include "qaudiodeviceinfo.h" -#include "qmediadevicemanager.h" +#include "qmediadevices.h" #include "private/qdarwinformatsinfo_p.h" #include <QtCore/qmath.h> diff --git a/src/multimedia/platform/darwin/qdarwinformatsinfo_p.h b/src/multimedia/platform/darwin/qdarwinformatsinfo_p.h index 798832b9c..79e33b6f4 100644 --- a/src/multimedia/platform/darwin/qdarwinformatsinfo_p.h +++ b/src/multimedia/platform/darwin/qdarwinformatsinfo_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -class QDarwinDeviceManager; +class QDarwinMediaDevices; class QDarwinFormatInfo : public QPlatformMediaFormatInfo { diff --git a/src/multimedia/platform/darwin/qdarwinintegration.mm b/src/multimedia/platform/darwin/qdarwinintegration.mm index 57ffaa9a3..991112276 100644 --- a/src/multimedia/platform/darwin/qdarwinintegration.mm +++ b/src/multimedia/platform/darwin/qdarwinintegration.mm @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qdarwinintegration_p.h" -#include "qdarwindevicemanager_p.h" +#include "qdarwinmediadevices_p.h" #include <private/avfmediaplayer_p.h> #include <private/avfcameraservice_p.h> #include <private/avfcamera_p.h> @@ -56,15 +56,15 @@ QDarwinIntegration::QDarwinIntegration() QDarwinIntegration::~QDarwinIntegration() { - delete m_manager; + delete m_devices; delete m_formatInfo; } -QPlatformMediaDeviceManager *QDarwinIntegration::deviceManager() +QPlatformMediaDevices *QDarwinIntegration::devices() { - if (!m_manager) - m_manager = new QDarwinDeviceManager(); - return m_manager; + if (!m_devices) + m_devices = new QDarwinMediaDevices(); + return m_devices; } QPlatformMediaFormatInfo *QDarwinIntegration::formatInfo() diff --git a/src/multimedia/platform/darwin/qdarwinintegration_p.h b/src/multimedia/platform/darwin/qdarwinintegration_p.h index cf7691624..1b6d14a26 100644 --- a/src/multimedia/platform/darwin/qdarwinintegration_p.h +++ b/src/multimedia/platform/darwin/qdarwinintegration_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -class QDarwinDeviceManager; +class QDarwinMediaDevices; class QDarwinIntegration : public QPlatformMediaIntegration { @@ -63,7 +63,7 @@ public: QDarwinIntegration(); ~QDarwinIntegration(); - QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaDevices *devices() override; QPlatformMediaFormatInfo *formatInfo() override; QPlatformMediaCaptureSession *createCaptureSession(QMediaRecorder::CaptureMode /*mode*/) override; @@ -74,7 +74,7 @@ public: QPlatformVideoSink *createVideoSink(QVideoSink *) override; - QDarwinDeviceManager *m_manager = nullptr; + QDarwinMediaDevices *m_devices = nullptr; QPlatformMediaFormatInfo *m_formatInfo = nullptr; }; diff --git a/src/multimedia/platform/darwin/qdarwindevicemanager.mm b/src/multimedia/platform/darwin/qdarwinmediadevices.mm index 4a6a9a484..7ff93b126 100644 --- a/src/multimedia/platform/darwin/qdarwindevicemanager.mm +++ b/src/multimedia/platform/darwin/qdarwinmediadevices.mm @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qdarwindevicemanager_p.h" -#include "qmediadevicemanager.h" +#include "qdarwinmediadevices_p.h" +#include "qmediadevices.h" #include "qcamerainfo_p.h" #include "qaudiodeviceinfo_p.h" #include "private/qcoreaudiodeviceinfo_p.h" @@ -147,15 +147,15 @@ QList<QAudioDeviceInfo> availableAudioDevices(QAudio::Mode mode) static OSStatus audioDeviceChangeListener(AudioObjectID, UInt32, const AudioObjectPropertyAddress*, void* ptr) { - QDarwinDeviceManager *m = static_cast<QDarwinDeviceManager *>(ptr); + QDarwinMediaDevices *m = static_cast<QDarwinMediaDevices *>(ptr); m->updateAudioDevices(); return 0; } #endif -QDarwinDeviceManager::QDarwinDeviceManager() - : QPlatformMediaDeviceManager() +QDarwinMediaDevices::QDarwinMediaDevices() + : QPlatformMediaDevices() { NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter]; m_deviceConnectedObserver = [notificationCenter addObserverForName:AVCaptureDeviceWasConnectedNotification @@ -189,7 +189,7 @@ QDarwinDeviceManager::QDarwinDeviceManager() } -QDarwinDeviceManager::~QDarwinDeviceManager() +QDarwinMediaDevices::~QDarwinMediaDevices() { NSNotificationCenter* notificationCenter = [NSNotificationCenter defaultCenter]; [notificationCenter removeObserver:(id)m_deviceConnectedObserver]; @@ -200,7 +200,7 @@ QDarwinDeviceManager::~QDarwinDeviceManager() #endif } -QList<QAudioDeviceInfo> QDarwinDeviceManager::audioInputs() const +QList<QAudioDeviceInfo> QDarwinMediaDevices::audioInputs() const { #ifdef Q_OS_IOS QList<QAudioDeviceInfo> devices; @@ -211,7 +211,7 @@ QList<QAudioDeviceInfo> QDarwinDeviceManager::audioInputs() const #endif } -QList<QAudioDeviceInfo> QDarwinDeviceManager::audioOutputs() const +QList<QAudioDeviceInfo> QDarwinMediaDevices::audioOutputs() const { #ifdef Q_OS_IOS QList<QAudioDeviceInfo> devices; @@ -222,12 +222,12 @@ QList<QAudioDeviceInfo> QDarwinDeviceManager::audioOutputs() const #endif } -QList<QCameraInfo> QDarwinDeviceManager::videoInputs() const +QList<QCameraInfo> QDarwinMediaDevices::videoInputs() const { return m_cameraDevices; } -void QDarwinDeviceManager::updateCameraDevices() +void QDarwinMediaDevices::updateCameraDevices() { #ifdef Q_OS_IOS // Cameras can't change dynamically on iOS. Update only once. @@ -311,7 +311,7 @@ void QDarwinDeviceManager::updateCameraDevices() } -void QDarwinDeviceManager::updateAudioDevices() +void QDarwinMediaDevices::updateAudioDevices() { #ifdef Q_OS_MACOS QList<QAudioDeviceInfo> inputs = availableAudioDevices(QAudio::AudioInput); @@ -328,12 +328,12 @@ void QDarwinDeviceManager::updateAudioDevices() #endif } -QAbstractAudioInput *QDarwinDeviceManager::createAudioInputDevice(const QAudioDeviceInfo &info) +QAbstractAudioInput *QDarwinMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &info) { return new CoreAudioInput(info); } -QAbstractAudioOutput *QDarwinDeviceManager::createAudioOutputDevice(const QAudioDeviceInfo &info) +QAbstractAudioOutput *QDarwinMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &info) { return new QCoreAudioOutput(info); } diff --git a/src/multimedia/platform/darwin/qdarwindevicemanager_p.h b/src/multimedia/platform/darwin/qdarwinmediadevices_p.h index cbace9330..22906d40a 100644 --- a/src/multimedia/platform/darwin/qdarwindevicemanager_p.h +++ b/src/multimedia/platform/darwin/qdarwinmediadevices_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QDARWINDEVICEMANAGER_H -#define QDARWINDEVICEMANAGER_H +#ifndef QDARWINMEDIADEVICES_H +#define QDARWINMEDIADEVICES_H // // W A R N I N G @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <qelapsedtimer.h> #include <qcamerainfo.h> @@ -63,11 +63,11 @@ Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureDeviceDiscoverySession); class QCameraInfo; -class QDarwinDeviceManager : public QPlatformMediaDeviceManager +class QDarwinMediaDevices : public QPlatformMediaDevices { public: - QDarwinDeviceManager(); - ~QDarwinDeviceManager(); + QDarwinMediaDevices(); + ~QDarwinMediaDevices(); QList<QAudioDeviceInfo> audioInputs() const override; QList<QAudioDeviceInfo> audioOutputs() const override; diff --git a/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp index e99b6e072..5e4c45cdc 100644 --- a/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp +++ b/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp @@ -41,15 +41,15 @@ #include <private/qgstutils_p.h> #include <private/qplatformmediaintegration_p.h> -#include <private/qgstreamerdevicemanager_p.h> +#include <private/qgstreamermediadevices_p.h> QT_BEGIN_NAMESPACE QGStreamerAudioDeviceInfo::QGStreamerAudioDeviceInfo(const QByteArray &device, QAudio::Mode mode) : QAudioDeviceInfoPrivate(device, mode) { - auto *deviceManager = static_cast<QGstreamerDeviceManager *>(QPlatformMediaIntegration::instance()->deviceManager()); - gstDevice = deviceManager->audioDevice(device, mode); + auto *devices = static_cast<QGstreamerMediaDevices *>(QPlatformMediaIntegration::instance()->devices()); + gstDevice = devices->audioDevice(device, mode); if (gstDevice) { gst_object_ref(gstDevice); auto *n = gst_device_get_display_name(gstDevice); diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp index 4a99ee57a..050417518 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp @@ -41,7 +41,7 @@ #include "qgstreamercamera_p.h" #include "qgstreamercameraimagecapture_p.h" -#include <private/qgstreamerdevicemanager_p.h> +#include <private/qgstreamermediadevices_p.h> #include <private/qgstreamerintegration_p.h> #include <private/qgstreamercameraexposure_p.h> #include <private/qgstreamercamerafocus_p.h> @@ -106,8 +106,8 @@ void QGstreamerCamera::setCamera(const QCameraInfo &camera) if (camera.isNull()) { gstCamera = QGstElement("videotestsrc"); } else { - auto *deviceManager = static_cast<QGstreamerDeviceManager *>(QGstreamerIntegration::instance()->deviceManager()); - auto *device = deviceManager->videoDevice(camera.id()); + auto *devices = static_cast<QGstreamerMediaDevices *>(QGstreamerIntegration::instance()->devices()); + auto *device = devices->videoDevice(camera.id()); gstCamera = gst_device_create_element(device, "camerasrc"); QGstStructure properties = gst_device_get_properties(device); if (properties.name() == "v4l2deviceprovider") diff --git a/src/multimedia/platform/gstreamer/qgstreamerdevicemanager.cpp b/src/multimedia/platform/gstreamer/qgstreamerdevicemanager.cpp index 361044134..9067eea6b 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerdevicemanager.cpp +++ b/src/multimedia/platform/gstreamer/qgstreamerdevicemanager.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qgstreamerdevicemanager_p.h" -#include "qmediadevicemanager.h" +#include "qgstreamermediadevices_p.h" +#include "qmediadevices.h" #include "qcamerainfo_p.h" #include "private/qaudioinput_gstreamer_p.h" @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE static gboolean deviceMonitor(GstBus *, GstMessage *message, gpointer m) { - QGstreamerDeviceManager *manager = static_cast<QGstreamerDeviceManager *>(m); + QGstreamerMediaDevices *manager = static_cast<QGstreamerMediaDevices *>(m); GstDevice *device = nullptr; switch (GST_MESSAGE_TYPE (message)) { @@ -71,8 +71,8 @@ static gboolean deviceMonitor(GstBus *, GstMessage *message, gpointer m) return G_SOURCE_CONTINUE; } -QGstreamerDeviceManager::QGstreamerDeviceManager() - : QPlatformMediaDeviceManager() +QGstreamerMediaDevices::QGstreamerMediaDevices() + : QPlatformMediaDevices() { GstDeviceMonitor *monitor; GstBus *bus; @@ -122,17 +122,17 @@ static QList<QAudioDeviceInfo> devicesFromSet(const QSet<GstDevice *> &deviceSet return devices; }; -QList<QAudioDeviceInfo> QGstreamerDeviceManager::audioInputs() const +QList<QAudioDeviceInfo> QGstreamerMediaDevices::audioInputs() const { return devicesFromSet(m_audioSources, QAudio::AudioInput); } -QList<QAudioDeviceInfo> QGstreamerDeviceManager::audioOutputs() const +QList<QAudioDeviceInfo> QGstreamerMediaDevices::audioOutputs() const { return devicesFromSet(m_audioSinks, QAudio::AudioOutput); } -QList<QCameraInfo> QGstreamerDeviceManager::videoInputs() const +QList<QCameraInfo> QGstreamerMediaDevices::videoInputs() const { QList<QCameraInfo> devices; @@ -187,17 +187,17 @@ QList<QCameraInfo> QGstreamerDeviceManager::videoInputs() const return devices; } -QAbstractAudioInput *QGstreamerDeviceManager::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioInput *QGstreamerMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) { return new QGStreamerAudioInput(deviceInfo.id()); } -QAbstractAudioOutput *QGstreamerDeviceManager::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioOutput *QGstreamerMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) { return new QGStreamerAudioOutput(deviceInfo.id()); } -void QGstreamerDeviceManager::addDevice(GstDevice *device) +void QGstreamerMediaDevices::addDevice(GstDevice *device) { gchar *type = gst_device_get_device_class(device); // qDebug() << "adding device:" << device << type << gst_device_get_display_name(device) << gst_structure_to_string(gst_device_get_properties(device)); @@ -217,7 +217,7 @@ void QGstreamerDeviceManager::addDevice(GstDevice *device) g_free(type); } -void QGstreamerDeviceManager::removeDevice(GstDevice *device) +void QGstreamerMediaDevices::removeDevice(GstDevice *device) { // qDebug() << "removing device:" << device << gst_device_get_display_name(device); if (m_videoSources.remove(device)) { @@ -250,14 +250,14 @@ static GstDevice *getDevice(const QSet<GstDevice *> &devices, const char *key, c } -GstDevice *QGstreamerDeviceManager::audioDevice(const QByteArray &id, QAudio::Mode mode) const +GstDevice *QGstreamerMediaDevices::audioDevice(const QByteArray &id, QAudio::Mode mode) const { const auto devices = (mode == QAudio::AudioOutput) ? m_audioSinks : m_audioSources; return getDevice(devices, "sysfs.path", id); } -GstDevice *QGstreamerDeviceManager::videoDevice(const QByteArray &id) const +GstDevice *QGstreamerMediaDevices::videoDevice(const QByteArray &id) const { return getDevice(m_videoSources, "device.path", id); } diff --git a/src/multimedia/platform/gstreamer/qgstreamerdevicemanager_p.h b/src/multimedia/platform/gstreamer/qgstreamerdevicemanager_p.h index 102d2cc8e..21dc124c4 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerdevicemanager_p.h +++ b/src/multimedia/platform/gstreamer/qgstreamerdevicemanager_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QGSTREAMERDEVICEMANAGER_H -#define QGSTREAMERDEVICEMANAGER_H +#ifndef QGSTREAMERMEDIADEVICES_H +#define QGSTREAMERMEDIADEVICES_H // // W A R N I N G @@ -51,17 +51,17 @@ // We mean it. // -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <gst/gst.h> #include <qset.h> #include <qaudio.h> QT_BEGIN_NAMESPACE -class QGstreamerDeviceManager : public QPlatformMediaDeviceManager +class QGstreamerMediaDevices : public QPlatformMediaDevices { public: - QGstreamerDeviceManager(); + QGstreamerMediaDevices(); QList<QAudioDeviceInfo> audioInputs() const override; QList<QAudioDeviceInfo> audioOutputs() const override; diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp index 07216a5cb..fec548162 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp +++ b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qgstreamerintegration_p.h" -#include "qgstreamerdevicemanager_p.h" +#include "qgstreamermediadevices_p.h" #include "private/qgstreamermediaplayer_p.h" #include "private/qgstreamermediacapture_p.h" #include "private/qgstreameraudiodecoder_p.h" @@ -58,15 +58,15 @@ QGstreamerIntegration::QGstreamerIntegration() QGstreamerIntegration::~QGstreamerIntegration() { - delete m_manager; + delete m_devices; delete m_formatsInfo; } -QPlatformMediaDeviceManager *QGstreamerIntegration::deviceManager() +QPlatformMediaDevices *QGstreamerIntegration::devices() { - if (!m_manager) - m_manager = new QGstreamerDeviceManager(); - return m_manager; + if (!m_devices) + m_devices = new QGstreamerMediaDevices(); + return m_devices; } QPlatformMediaFormatInfo *QGstreamerIntegration::formatInfo() diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h index 38fc93f43..7781b538e 100644 --- a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h +++ b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -class QGstreamerDeviceManager; +class QGstreamerMediaDevices; class QGstreamerPlayerInterface; class QGstreamerFormatInfo; @@ -66,7 +66,7 @@ public: ~QGstreamerIntegration(); static QGstreamerIntegration *instance() { return static_cast<QGstreamerIntegration *>(QPlatformMediaIntegration::instance()); } - QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaDevices *devices() override; QPlatformMediaFormatInfo *formatInfo() override; QPlatformAudioDecoder *createAudioDecoder() override; @@ -78,7 +78,7 @@ public: QPlatformVideoSink *createVideoSink(QVideoSink *sink) override; - QGstreamerDeviceManager *m_manager = nullptr; + QGstreamerMediaDevices *m_devices = nullptr; QGstreamerFormatInfo *m_formatsInfo = nullptr; }; diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiointegration.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiointegration.cpp index 59a1f991a..69e0ac207 100644 --- a/src/multimedia/platform/pulseaudio/qpulseaudiointegration.cpp +++ b/src/multimedia/platform/pulseaudio/qpulseaudiointegration.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qpulseaudiointegration_p.h" -#include "qpulseaudiodevicemanager_p.h" +#include "qpulseaudiomediadevices_p.h" QT_BEGIN_NAMESPACE @@ -49,14 +49,14 @@ QPulseAudioIntegration::QPulseAudioIntegration() QPulseAudioIntegration::~QPulseAudioIntegration() { - delete m_manager; + delete m_devices; } -QPlatformMediaDeviceManager *QPulseAudioIntegration::deviceManager() +QPlatformMediaDevices *QPulseAudioIntegration::devices() { - if (!m_manager) - m_manager = new QPulseAudioDeviceManager(pulseEngine); - return m_manager; + if (!m_devices) + m_devices = new QPulseAudioMediaDevices(pulseEngine); + return m_devices; } QT_END_NAMESPACE diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiointegration_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiointegration_p.h index 9f7f8d50d..16e96b0ae 100644 --- a/src/multimedia/platform/pulseaudio/qpulseaudiointegration_p.h +++ b/src/multimedia/platform/pulseaudio/qpulseaudiointegration_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -class QPulseAudioDeviceManager; +class QPulseAudioMediaDevices; class QPulseAudioIntegration : public QPlatformMediaIntegration { @@ -64,9 +64,9 @@ public: QPulseAudioIntegration(); ~QPulseAudioIntegration(); - QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaDevices *devices() override; - QPulseAudioDeviceManager *m_manager = nullptr; + QPulseAudioMediaDevices *m_devices = nullptr; QPulseAudioEngine *pulseEngine = nullptr; }; diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp index 2562b2a53..fa6999167 100644 --- a/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager.cpp +++ b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qpulseaudiodevicemanager_p.h" -#include "qmediadevicemanager.h" +#include "qpulseaudiomediadevices_p.h" +#include "qmediadevices.h" #include "qcamerainfo_p.h" #include "private/qaudioinput_pulse_p.h" @@ -48,33 +48,33 @@ QT_BEGIN_NAMESPACE -QPulseAudioDeviceManager::QPulseAudioDeviceManager(QPulseAudioEngine *engine) - : QPlatformMediaDeviceManager(), +QPulseAudioMediaDevices::QPulseAudioMediaDevices(QPulseAudioEngine *engine) + : QPlatformMediaDevices(), pulseEngine(engine) { } -QList<QAudioDeviceInfo> QPulseAudioDeviceManager::audioInputs() const +QList<QAudioDeviceInfo> QPulseAudioMediaDevices::audioInputs() const { return pulseEngine->availableDevices(QAudio::AudioInput); } -QList<QAudioDeviceInfo> QPulseAudioDeviceManager::audioOutputs() const +QList<QAudioDeviceInfo> QPulseAudioMediaDevices::audioOutputs() const { return pulseEngine->availableDevices(QAudio::AudioOutput); } -QList<QCameraInfo> QPulseAudioDeviceManager::videoInputs() const +QList<QCameraInfo> QPulseAudioMediaDevices::videoInputs() const { return {}; } -QAbstractAudioInput *QPulseAudioDeviceManager::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioInput *QPulseAudioMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) { return new QPulseAudioInput(deviceInfo.id()); } -QAbstractAudioOutput *QPulseAudioDeviceManager::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioOutput *QPulseAudioMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) { return new QPulseAudioOutput(deviceInfo.id()); } diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h index 8f5054bc7..522a9384c 100644 --- a/src/multimedia/platform/pulseaudio/qpulseaudiodevicemanager_p.h +++ b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QPULSEAUDIODEVICEMANAGER_H -#define QPULSEAUDIODEVICEMANAGER_H +#ifndef QPULSEAUDIOMEDIADEVICES_H +#define QPULSEAUDIOMEDIADEVICES_H // // W A R N I N G @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <qset.h> #include <qaudio.h> @@ -59,10 +59,10 @@ QT_BEGIN_NAMESPACE class QPulseAudioEngine; -class QPulseAudioDeviceManager : public QPlatformMediaDeviceManager +class QPulseAudioMediaDevices : public QPlatformMediaDevices { public: - QPulseAudioDeviceManager(QPulseAudioEngine *engine); + QPulseAudioMediaDevices(QPulseAudioEngine *engine); QList<QAudioDeviceInfo> audioInputs() const override; QList<QAudioDeviceInfo> audioOutputs() const override; diff --git a/src/multimedia/platform/qnx/qqnxdevicemanager.cpp b/src/multimedia/platform/qnx/qqnxdevicemanager.cpp index d4c34d3d6..76096f01c 100644 --- a/src/multimedia/platform/qnx/qqnxdevicemanager.cpp +++ b/src/multimedia/platform/qnx/qqnxdevicemanager.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qqnxdevicemanager_p.h" -#include "qmediadevicemanager.h" +#include "qqnxmediadevices_p.h" +#include "qmediadevices.h" #include "qcamerainfo_p.h" #include "private/qnxaudioinput_p.h" @@ -89,32 +89,32 @@ static QList<QCameraInfo> enumerateCameras() return cameras; } -QQnxDeviceManager::QQnxDeviceManager() - : QMediaPlatformDeviceManager() +QQnxMediaDevices::QQnxMediaDevices() + : QMediaPlatformMediaDevices() { } -QList<QAudioDeviceInfo> QQnxDeviceManager::audioInputs() const +QList<QAudioDeviceInfo> QQnxMediaDevices::audioInputs() const { return { QAudioDeviceInfo(new QnxAudioDeviceInfo("default", QAudio::AudioInput)) }; } -QList<QAudioDeviceInfo> QQnxDeviceManager::audioOutputs() const +QList<QAudioDeviceInfo> QQnxMediaDevices::audioOutputs() const { return { QAudioDeviceInfo(new QnxAudioDeviceInfo("default", QAudio::AudioOutput)) }; } -QList<QCameraInfo> QQnxDeviceManager::videoInputs() const +QList<QCameraInfo> QQnxMediaDevices::videoInputs() const { return enumerateCameras(); } -QAbstractAudioInput *QQnxDeviceManager::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioInput *QQnxMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) { return new QnxAudioInput(); } -QAbstractAudioOutput *QQnxDeviceManager::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioOutput *QQnxMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) { return new QNxAudioOutput(); } diff --git a/src/multimedia/platform/qnx/qqnxdevicemanager_p.h b/src/multimedia/platform/qnx/qqnxdevicemanager_p.h index 803660384..214cda3d6 100644 --- a/src/multimedia/platform/qnx/qqnxdevicemanager_p.h +++ b/src/multimedia/platform/qnx/qqnxdevicemanager_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QQNXDEVICEMANAGER_H -#define QQNXDEVICEMANAGER_H +#ifndef QQNXMEDIADEVICES_H +#define QQNXMEDIADEVICES_H // // W A R N I N G @@ -51,15 +51,15 @@ // We mean it. // -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <qaudio.h> QT_BEGIN_NAMESPACE -class QQnxDeviceManager : public QPlatformMediaDeviceManager +class QQnxMediaDevices : public QPlatformMediaDevices { public: - QQnxDeviceManager(); + QQnxMediaDevices(); QList<QAudioDeviceInfo> audioInputs() const override; QList<QAudioDeviceInfo> audioOutputs() const override; diff --git a/src/multimedia/platform/qnx/qqnxintegration.cpp b/src/multimedia/platform/qnx/qqnxintegration.cpp index 6729a6ab6..2e5496434 100644 --- a/src/multimedia/platform/qnx/qqnxintegration.cpp +++ b/src/multimedia/platform/qnx/qqnxintegration.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qqnxintegration_p.h" -#include "qqnxdevicemanager_p.h" +#include "qqnxmediadevices_p.h" #include "private/mmrenderermediaplayercontrol_p.h" #include "private/mmrendererutil_p.h" @@ -51,14 +51,14 @@ QQnxIntegration::QQnxIntegration() QQnxIntegration::~QQnxIntegration() { - delete m_manager; + delete m_devices; } -QMediaPlatformDeviceManager *QQnxIntegration::deviceManager() +QMediaPlatformMediaDevices *QQnxIntegration::devices() { - if (!m_manager) - m_manager = new QQnxDeviceManager(); - return m_manager; + if (!m_devices) + m_devices = new QQnxMediaDevices(); + return m_devices; } QPlatformMediaPlayer *QQnxIntegration::createPlayer(QMediaPlayer *parent) diff --git a/src/multimedia/platform/qnx/qqnxintegration_p.h b/src/multimedia/platform/qnx/qqnxintegration_p.h index 84f3c28be..8cc4ce9fb 100644 --- a/src/multimedia/platform/qnx/qqnxintegration_p.h +++ b/src/multimedia/platform/qnx/qqnxintegration_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -class QQnxDeviceManager; +class QQnxMediaDevices; class QQnxPlayerInterface; class QQnxIntegration : public QPlatformMediaIntegration @@ -64,11 +64,11 @@ public: QQnxIntegration(); ~QQnxIntegration(); - QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaDevices *devices() override; QPlatformMediaPlayer *createPlayer(QMediaPlayer *parent) override; - QQnxDeviceManager *m_manager = nullptr; + QQnxMediaDevices *m_devices = nullptr; }; QT_END_NAMESPACE diff --git a/src/multimedia/platform/qplatformmediadevicemanager.cpp b/src/multimedia/platform/qplatformmediadevices.cpp index f2a0d4f4e..500868352 100644 --- a/src/multimedia/platform/qplatformmediadevicemanager.cpp +++ b/src/multimedia/platform/qplatformmediadevices.cpp @@ -37,19 +37,19 @@ ** ****************************************************************************/ -#include "qplatformmediadevicemanager_p.h" -#include "qmediadevicemanager.h" +#include "qplatformmediadevices_p.h" +#include "qmediadevices.h" #include "qaudiodeviceinfo.h" #include "qcamerainfo.h" #include "qaudiosystem_p.h" QT_BEGIN_NAMESPACE -QPlatformMediaDeviceManager::QPlatformMediaDeviceManager() = default; +QPlatformMediaDevices::QPlatformMediaDevices() = default; -QPlatformMediaDeviceManager::~QPlatformMediaDeviceManager() = default; +QPlatformMediaDevices::~QPlatformMediaDevices() = default; -QAudioDeviceInfo QPlatformMediaDeviceManager::audioInput(const QByteArray &id) const +QAudioDeviceInfo QPlatformMediaDevices::audioInput(const QByteArray &id) const { const auto inputs = audioInputs(); for (auto i : inputs) { @@ -59,7 +59,7 @@ QAudioDeviceInfo QPlatformMediaDeviceManager::audioInput(const QByteArray &id) c return {}; } -QAudioDeviceInfo QPlatformMediaDeviceManager::audioOutput(const QByteArray &id) const +QAudioDeviceInfo QPlatformMediaDevices::audioOutput(const QByteArray &id) const { const auto outputs = audioOutputs(); for (auto o : outputs) { @@ -69,7 +69,7 @@ QAudioDeviceInfo QPlatformMediaDeviceManager::audioOutput(const QByteArray &id) return {}; } -QCameraInfo QPlatformMediaDeviceManager::videoInput(const QByteArray &id) const +QCameraInfo QPlatformMediaDevices::videoInput(const QByteArray &id) const { const auto inputs = videoInputs(); for (auto i : inputs) { @@ -79,7 +79,7 @@ QCameraInfo QPlatformMediaDeviceManager::videoInput(const QByteArray &id) const return QCameraInfo(); } -QAbstractAudioInput* QPlatformMediaDeviceManager::audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo) +QAbstractAudioInput* QPlatformMediaDevices::audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo) { QAudioDeviceInfo info = deviceInfo; if (info.isNull()) @@ -91,7 +91,7 @@ QAbstractAudioInput* QPlatformMediaDeviceManager::audioInputDevice(const QAudioF return p; } -QAbstractAudioOutput* QPlatformMediaDeviceManager::audioOutputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo) +QAbstractAudioOutput* QPlatformMediaDevices::audioOutputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo) { QAudioDeviceInfo info = deviceInfo; if (info.isNull()) @@ -103,21 +103,21 @@ QAbstractAudioOutput* QPlatformMediaDeviceManager::audioOutputDevice(const QAudi return p; } -void QPlatformMediaDeviceManager::audioInputsChanged() const +void QPlatformMediaDevices::audioInputsChanged() const { - for (auto m : m_deviceManagers) + for (auto m : m_devices) emit m->audioInputsChanged(); } -void QPlatformMediaDeviceManager::audioOutputsChanged() const +void QPlatformMediaDevices::audioOutputsChanged() const { - for (auto m : m_deviceManagers) + for (auto m : m_devices) emit m->audioOutputsChanged(); } -void QPlatformMediaDeviceManager::videoInputsChanged() const +void QPlatformMediaDevices::videoInputsChanged() const { - for (auto m : m_deviceManagers) + for (auto m : m_devices) emit m->videoInputsChanged(); } diff --git a/src/multimedia/platform/qplatformmediadevicemanager_p.h b/src/multimedia/platform/qplatformmediadevices_p.h index d46a908a6..d0de397b2 100644 --- a/src/multimedia/platform/qplatformmediadevicemanager_p.h +++ b/src/multimedia/platform/qplatformmediadevices_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QPLATFORMMEDIADEVICEMANAGER_H -#define QPLATFORMMEDIADEVICEMANAGER_H +#ifndef QPLATFORMMEDIADEVICES_H +#define QPLATFORMMEDIADEVICES_H // // W A R N I N G @@ -56,18 +56,18 @@ QT_BEGIN_NAMESPACE -class QMediaDeviceManager; +class QMediaDevices; class QAudioDeviceInfo; class QCameraInfo; class QAbstractAudioInput; class QAbstractAudioOutput; class QAudioFormat; -class Q_AUTOTEST_EXPORT QPlatformMediaDeviceManager +class Q_AUTOTEST_EXPORT QPlatformMediaDevices { public: - QPlatformMediaDeviceManager(); - virtual ~QPlatformMediaDeviceManager(); + QPlatformMediaDevices(); + virtual ~QPlatformMediaDevices(); virtual QList<QAudioDeviceInfo> audioInputs() const = 0; virtual QList<QAudioDeviceInfo> audioOutputs() const = 0; @@ -82,13 +82,13 @@ public: QAbstractAudioInput *audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo); QAbstractAudioOutput *audioOutputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo); - void addDeviceManager(QMediaDeviceManager *m) + void addDevices(QMediaDevices *m) { - m_deviceManagers.append(m); + m_devices.append(m); } - void removeDeviceManager(QMediaDeviceManager *m) + void removeDevices(QMediaDevices *m) { - m_deviceManagers.removeAll(m); + m_devices.removeAll(m); } protected: @@ -97,10 +97,10 @@ protected: void videoInputsChanged() const; private: - QList<QMediaDeviceManager *> m_deviceManagers; + QList<QMediaDevices *> m_devices; }; QT_END_NAMESPACE -#endif // QPLATFORMMEDIADEVICEMANAGER_H +#endif // QPLATFORMMEDIADEVICES_H diff --git a/src/multimedia/platform/qplatformmediaformatinfo_p.h b/src/multimedia/platform/qplatformmediaformatinfo_p.h index af04e4492..359648f81 100644 --- a/src/multimedia/platform/qplatformmediaformatinfo_p.h +++ b/src/multimedia/platform/qplatformmediaformatinfo_p.h @@ -82,4 +82,4 @@ public: QT_END_NAMESPACE -#endif // QPLATFORMMEDIADEVICEMANAGER_H +#endif // QPLATFORMMEDIAFORMATINFO_H diff --git a/src/multimedia/platform/qplatformmediaintegration_p.h b/src/multimedia/platform/qplatformmediaintegration_p.h index dd26c2b71..0a089f9dc 100644 --- a/src/multimedia/platform/qplatformmediaintegration_p.h +++ b/src/multimedia/platform/qplatformmediaintegration_p.h @@ -59,8 +59,8 @@ class QMediaPlayer; class QCamera; class QMediaEncoder; class QCameraImageCapture; -class QMediaDeviceManager; -class QPlatformMediaDeviceManager; +class QMediaDevices; +class QPlatformMediaDevices; class QPlatformMediaCaptureSession; class QPlatformMediaPlayer; class QPlatformAudioDecoder; @@ -81,7 +81,7 @@ public: static void setIntegration(QPlatformMediaIntegration *); virtual ~QPlatformMediaIntegration(); - virtual QPlatformMediaDeviceManager *deviceManager() = 0; + virtual QPlatformMediaDevices *devices() = 0; virtual QPlatformMediaFormatInfo *formatInfo() = 0; virtual QPlatformAudioDecoder *createAudioDecoder() { return nullptr; } diff --git a/src/multimedia/platform/qplatformvideosink_p.h b/src/multimedia/platform/qplatformvideosink_p.h index 4e9862491..8074e6095 100644 --- a/src/multimedia/platform/qplatformvideosink_p.h +++ b/src/multimedia/platform/qplatformvideosink_p.h @@ -40,6 +40,17 @@ #ifndef QPLATFORMVIDEOSINK_H #define QPLATFORMVIDEOSINK_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtMultimedia/qtmultimediaglobal.h> #include <QtCore/qobject.h> #include <QtCore/qrect.h> diff --git a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp b/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp index 951208598..767c4d673 100644 --- a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp +++ b/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp @@ -134,7 +134,7 @@ D3DPresentEngine::D3DPresentEngine() : m_deviceResetToken(0) , m_D3D9(0) , m_device(0) - , m_deviceManager(0) + , m_devices(0) , m_useTextureRendering(false) { ZeroMemory(&m_displayMode, sizeof(m_displayMode)); @@ -155,7 +155,7 @@ D3DPresentEngine::~D3DPresentEngine() releaseResources(); qt_evr_safe_release(&m_device); - qt_evr_safe_release(&m_deviceManager); + qt_evr_safe_release(&m_devices); qt_evr_safe_release(&m_D3D9); } @@ -164,7 +164,7 @@ HRESULT D3DPresentEngine::initializeD3D() HRESULT hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &m_D3D9); if (SUCCEEDED(hr)) - hr = DXVA2CreateDirect3DDeviceManager9(&m_deviceResetToken, &m_deviceManager); + hr = DXVA2CreateDirect3DMediaDevices9(&m_deviceResetToken, &m_devices); return hr; } @@ -181,7 +181,7 @@ HRESULT D3DPresentEngine::createD3DDevice() IDirect3DDevice9Ex* device = NULL; - if (!m_D3D9 || !m_deviceManager) + if (!m_D3D9 || !m_devices) return MF_E_NOT_INITIALIZED; hwnd = ::GetShellWindow(); @@ -225,7 +225,7 @@ HRESULT D3DPresentEngine::createD3DDevice() if (FAILED(hr)) goto done; - hr = m_deviceManager->ResetDevice(device, m_deviceResetToken); + hr = m_devices->ResetDevice(device, m_deviceResetToken); if (FAILED(hr)) goto done; @@ -253,12 +253,12 @@ HRESULT D3DPresentEngine::getService(REFGUID, REFIID riid, void** ppv) { HRESULT hr = S_OK; - if (riid == __uuidof(IDirect3DDeviceManager9)) { - if (m_deviceManager == NULL) { + if (riid == __uuidof(IDirect3DMediaDevices9)) { + if (m_devices == NULL) { hr = MF_E_UNSUPPORTED_SERVICE; } else { - *ppv = m_deviceManager; - m_deviceManager->AddRef(); + *ppv = m_devices; + m_devices->AddRef(); } } else { hr = MF_E_UNSUPPORTED_SERVICE; diff --git a/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h b/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h index e4a4503ff..f187b977c 100644 --- a/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h +++ b/src/multimedia/platform/windows/evr/evrd3dpresentengine_p.h @@ -58,7 +58,7 @@ struct IDirect3D9Ex; struct IDirect3DDevice9Ex; -struct IDirect3DDeviceManager9; +struct IDirect3DMediaDevices9; struct IDirect3DSurface9; struct IDirect3DTexture9; struct IMFSample; @@ -141,7 +141,7 @@ private: IDirect3D9Ex *m_D3D9; IDirect3DDevice9Ex *m_device; - IDirect3DDeviceManager9 *m_deviceManager; + IDirect3DMediaDevices9 *m_devices; QVideoFrameFormat m_surfaceFormat; diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp index ec726e823..d1ec041d3 100644 --- a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp +++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp @@ -43,7 +43,7 @@ #include "qwindowscamera_p.h" #include "qwindowscamerasession_p.h" #include "qwindowscameraimagecapture_p.h" -#include "qmediadevicemanager.h" +#include "qmediadevices.h" #include "qaudiodeviceinfo.h" QT_BEGIN_NAMESPACE @@ -138,7 +138,7 @@ void QWindowsMediaCaptureService::setVolume(qreal volume) QAudioDeviceInfo QWindowsMediaCaptureService::audioInput() const { - return QMediaDeviceManager::defaultAudioInput(); + return QMediaDevices::defaultAudioInput(); } bool QWindowsMediaCaptureService::setAudioInput(const QAudioDeviceInfo &info) diff --git a/src/multimedia/platform/windows/qwindowsintegration.cpp b/src/multimedia/platform/windows/qwindowsintegration.cpp index b3f2b1e60..a399d3be8 100644 --- a/src/multimedia/platform/windows/qwindowsintegration.cpp +++ b/src/multimedia/platform/windows/qwindowsintegration.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qwindowsintegration_p.h" -#include <private/qwindowsdevicemanager_p.h> +#include <private/qwindowsmediadevices_p.h> #include <private/qwindowsformatinfo_p.h> #include <private/qwindowsmediacapture_p.h> #include <private/qwindowscameraimagecapture_p.h> @@ -63,7 +63,7 @@ QWindowsIntegration::QWindowsIntegration() QWindowsIntegration::~QWindowsIntegration() { - delete m_manager; + delete m_devices; delete m_formatInfo; g_refCount--; @@ -74,11 +74,11 @@ QWindowsIntegration::~QWindowsIntegration() } } -QPlatformMediaDeviceManager *QWindowsIntegration::deviceManager() +QPlatformMediaDevices *QWindowsIntegration::devices() { - if (!m_manager) - m_manager = new QWindowsDeviceManager(); - return m_manager; + if (!m_devices) + m_devices = new QWindowsMediaDevices(); + return m_devices; } QPlatformMediaFormatInfo *QWindowsIntegration::formatInfo() diff --git a/src/multimedia/platform/windows/qwindowsintegration_p.h b/src/multimedia/platform/windows/qwindowsintegration_p.h index 8ad86eded..98b159206 100644 --- a/src/multimedia/platform/windows/qwindowsintegration_p.h +++ b/src/multimedia/platform/windows/qwindowsintegration_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -class QWindowsDeviceManager; +class QWindowsMediaDevices; class QWindowsFormatInfo; class QWindowsIntegration : public QPlatformMediaIntegration @@ -67,7 +67,7 @@ public: void addRefCount(); void releaseRefCount(); - QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaDevices *devices() override; QPlatformMediaFormatInfo *formatInfo() override; QPlatformMediaCaptureSession *createCaptureSession(QMediaRecorder::CaptureMode) override; @@ -80,7 +80,7 @@ public: QPlatformVideoSink *createVideoSink(QVideoSink *sink) override; - QWindowsDeviceManager *m_manager = nullptr; + QWindowsMediaDevices *m_devices = nullptr; QWindowsFormatInfo *m_formatInfo = nullptr; }; diff --git a/src/multimedia/platform/windows/qwindowsdevicemanager.cpp b/src/multimedia/platform/windows/qwindowsmediadevices.cpp index 17d35c81b..4632d5fe2 100644 --- a/src/multimedia/platform/windows/qwindowsdevicemanager.cpp +++ b/src/multimedia/platform/windows/qwindowsmediadevices.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qwindowsdevicemanager_p.h" -#include "qmediadevicemanager.h" +#include "qwindowsmediadevices_p.h" +#include "qmediadevices.h" #include "qcamerainfo_p.h" #include "qvarlengtharray.h" @@ -60,8 +60,8 @@ QT_BEGIN_NAMESPACE -QWindowsDeviceManager::QWindowsDeviceManager() - : QPlatformMediaDeviceManager() +QWindowsMediaDevices::QWindowsMediaDevices() + : QPlatformMediaDevices() { } @@ -144,17 +144,17 @@ static QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode) return devices; } -QList<QAudioDeviceInfo> QWindowsDeviceManager::audioInputs() const +QList<QAudioDeviceInfo> QWindowsMediaDevices::audioInputs() const { return availableDevices(QAudio::AudioInput); } -QList<QAudioDeviceInfo> QWindowsDeviceManager::audioOutputs() const +QList<QAudioDeviceInfo> QWindowsMediaDevices::audioOutputs() const { return availableDevices(QAudio::AudioOutput); } -QList<QCameraInfo> QWindowsDeviceManager::videoInputs() const +QList<QCameraInfo> QWindowsMediaDevices::videoInputs() const { QList<QCameraInfo> cameras; auto hrCoInit = CoInitialize(nullptr); @@ -282,13 +282,13 @@ QList<QCameraInfo> QWindowsDeviceManager::videoInputs() const return cameras; } -QAbstractAudioInput *QWindowsDeviceManager::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioInput *QWindowsMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &deviceInfo) { const auto *devInfo = static_cast<const QWindowsAudioDeviceInfo *>(deviceInfo.handle()); return new QWindowsAudioInput(devInfo->waveId()); } -QAbstractAudioOutput *QWindowsDeviceManager::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) +QAbstractAudioOutput *QWindowsMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &deviceInfo) { const auto *devInfo = static_cast<const QWindowsAudioDeviceInfo *>(deviceInfo.handle()); return new QWindowsAudioOutput(devInfo->waveId()); diff --git a/src/multimedia/platform/windows/qwindowsdevicemanager_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h index b55ee6b6d..6baffbfdd 100644 --- a/src/multimedia/platform/windows/qwindowsdevicemanager_p.h +++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QWINDOWSDEVICEMANAGER_H -#define QWINDOWSDEVICEMANAGER_H +#ifndef QWINDOWSMEDIADEVICES_H +#define QWINDOWSMEDIADEVICES_H // // W A R N I N G @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <qset.h> #include <qaudio.h> @@ -59,10 +59,10 @@ QT_BEGIN_NAMESPACE class QWindowsEngine; -class QWindowsDeviceManager : public QPlatformMediaDeviceManager +class QWindowsMediaDevices : public QPlatformMediaDevices { public: - QWindowsDeviceManager(); + QWindowsMediaDevices(); QList<QAudioDeviceInfo> audioInputs() const override; QList<QAudioDeviceInfo> audioOutputs() const override; diff --git a/src/multimedia/qmediadevicemanager.cpp b/src/multimedia/qmediadevices.cpp index d6ffd3bf0..36278e5e0 100644 --- a/src/multimedia/qmediadevicemanager.cpp +++ b/src/multimedia/qmediadevices.cpp @@ -37,40 +37,40 @@ ** ****************************************************************************/ -#include "qmediadevicemanager.h" +#include "qmediadevices.h" #include "private/qplatformmediaintegration_p.h" -#include "private/qplatformmediadevicemanager_p.h" +#include "private/qplatformmediadevices_p.h" #include <qaudiodeviceinfo.h> #include <qcamerainfo.h> QT_BEGIN_NAMESPACE -class QMediaDeviceManagerPrivate +class QMediaDevicesPrivate { public: - ~QMediaDeviceManagerPrivate() + ~QMediaDevicesPrivate() { } - QPlatformMediaDeviceManager *manager() { - if (!pmanager) - pmanager = QPlatformMediaIntegration::instance()->deviceManager(); - return pmanager; + QPlatformMediaDevices *platformDevices() { + if (!platform) + platform = QPlatformMediaIntegration::instance()->devices(); + return platform; } private: - QPlatformMediaDeviceManager *pmanager = nullptr; + QPlatformMediaDevices *platform = nullptr; } priv; /*! - \class QMediaDeviceManager - \brief The QMediaDeviceManager class provides information about available + \class QMediaDevices + \brief The QMediaDevices class provides information about available multimedia input and output devices. \ingroup multimedia \inmodule QtMultimedia - The QMediaDeviceManager class helps in managing the available multimedia + The QMediaDevices class helps in managing the available multimedia input and output devices. It manages three types of devices: \list \li Audio input devices (Microphones) @@ -78,24 +78,24 @@ private: \li Video input devices (Cameras) \endlist - QMediaDeviceManager allows listing all available devices and will emit + QMediaDevices allows listing all available devices and will emit signals when the list of available devices has changed. While using the default input and output devices is often sufficient for playing back or recording multimedia, there is often a need to explicitly select the device to be used. - QMediaDeviceManager is a singleton object and all getters are thread-safe. + QMediaDevices is a singleton object and all getters are thread-safe. */ -QList<QAudioDeviceInfo> QMediaDeviceManager::audioInputs() +QList<QAudioDeviceInfo> QMediaDevices::audioInputs() { - return priv.manager()->audioInputs(); + return priv.platformDevices()->audioInputs(); } -QList<QAudioDeviceInfo> QMediaDeviceManager::audioOutputs() +QList<QAudioDeviceInfo> QMediaDevices::audioOutputs() { - return priv.manager()->audioOutputs(); + return priv.platformDevices()->audioOutputs(); } /*! @@ -104,12 +104,12 @@ QList<QAudioDeviceInfo> QMediaDeviceManager::audioOutputs() If \a position is not specified or if the value is QCameraInfo::UnspecifiedPosition, a list of all available cameras will be returned. */ -QList<QCameraInfo> QMediaDeviceManager::videoInputs() +QList<QCameraInfo> QMediaDevices::videoInputs() { - return priv.manager()->videoInputs(); + return priv.platformDevices()->videoInputs(); } -QAudioDeviceInfo QMediaDeviceManager::defaultAudioInput() +QAudioDeviceInfo QMediaDevices::defaultAudioInput() { const auto inputs = audioInputs(); for (const auto &info : inputs) @@ -118,7 +118,7 @@ QAudioDeviceInfo QMediaDeviceManager::defaultAudioInput() return inputs.value(0); } -QAudioDeviceInfo QMediaDeviceManager::defaultAudioOutput() +QAudioDeviceInfo QMediaDevices::defaultAudioOutput() { const auto outputs = audioOutputs(); for (const auto &info : outputs) @@ -135,7 +135,7 @@ QAudioDeviceInfo QMediaDeviceManager::defaultAudioOutput() \sa availableCameras() */ -QCameraInfo QMediaDeviceManager::defaultVideoInput() +QCameraInfo QMediaDevices::defaultVideoInput() { const auto inputs = videoInputs(); for (const auto &info : inputs) @@ -147,21 +147,21 @@ QCameraInfo QMediaDeviceManager::defaultVideoInput() /*! \internal */ -QMediaDeviceManager::QMediaDeviceManager(QObject *parent) +QMediaDevices::QMediaDevices(QObject *parent) : QObject(parent) { - priv.manager()->addDeviceManager(this); + priv.platformDevices()->addDevices(this); } /*! \internal */ -QMediaDeviceManager::~QMediaDeviceManager() +QMediaDevices::~QMediaDevices() { - priv.manager()->removeDeviceManager(this); + priv.platformDevices()->removeDevices(this); } QT_END_NAMESPACE -#include "moc_qmediadevicemanager.cpp" +#include "moc_qmediadevices.cpp" diff --git a/src/multimedia/qmediadevicemanager.h b/src/multimedia/qmediadevices.h index b8b4e88ab..27a45763a 100644 --- a/src/multimedia/qmediadevicemanager.h +++ b/src/multimedia/qmediadevices.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QMEDIADEVICEMANAGER_H -#define QMEDIADEVICEMANAGER_H +#ifndef QMEDIADEVICES_H +#define QMEDIADEVICES_H #include <QtMultimedia/qtmultimediaglobal.h> #include <QtCore/qobject.h> @@ -49,8 +49,9 @@ QT_BEGIN_NAMESPACE class QAudioDeviceInfo; class QCameraInfo; -class QMediaDeviceManagerPrivate; -class Q_MULTIMEDIA_EXPORT QMediaDeviceManager : public QObject +class QMediaDevicesPrivate; + +class Q_MULTIMEDIA_EXPORT QMediaDevices : public QObject { Q_OBJECT Q_PROPERTY(QList<QAudioDeviceInfo> audioInputs READ audioInputs NOTIFY audioInputsChanged) @@ -61,8 +62,8 @@ class Q_MULTIMEDIA_EXPORT QMediaDeviceManager : public QObject Q_PROPERTY(QCameraInfo defaultVideoInput READ defaultVideoInput NOTIFY videoInputsChanged) public: - QMediaDeviceManager(QObject *parent = nullptr); - ~QMediaDeviceManager(); + QMediaDevices(QObject *parent = nullptr); + ~QMediaDevices(); static QList<QAudioDeviceInfo> audioInputs(); static QList<QAudioDeviceInfo> audioOutputs(); @@ -78,7 +79,7 @@ signals: void videoInputsChanged(); private: - friend class QMediaDeviceManagerPrivate; + friend class QMediaDevicesPrivate; }; QT_END_NAMESPACE diff --git a/src/multimedia/video/qvideotexturehelper_p.h b/src/multimedia/video/qvideotexturehelper_p.h index a984101e5..7c331f0ff 100644 --- a/src/multimedia/video/qvideotexturehelper_p.h +++ b/src/multimedia/video/qvideotexturehelper_p.h @@ -40,6 +40,17 @@ #ifndef QVIDEOTEXTUREHELPER_H #define QVIDEOTEXTUREHELPER_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <qvideoframeformat.h> #include <private/qrhi_p.h> diff --git a/src/multimediaquick/qtmultimediaquicktypes_p.h b/src/multimediaquick/qtmultimediaquicktypes_p.h index 8bbbe29eb..4ef94fe64 100644 --- a/src/multimediaquick/qtmultimediaquicktypes_p.h +++ b/src/multimediaquick/qtmultimediaquicktypes_p.h @@ -130,12 +130,12 @@ struct QMediaMetaDataForeign QML_NAMED_ELEMENT(mediaMetaData) }; -struct QMediaDeviceManagerForeign +struct QMediaDevicesForeign { Q_GADGET QML_SINGLETON - QML_FOREIGN(QMediaDeviceManager) - QML_NAMED_ELEMENT(MediaDeviceManager) + QML_FOREIGN(QMediaDevices) + QML_NAMED_ELEMENT(MediaDevices) }; struct QAudioDeviceInfoForeign diff --git a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp index 99c9c174e..05fb07d24 100644 --- a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp +++ b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp @@ -33,7 +33,7 @@ #include <QStringList> #include <QList> -#include <QMediaDeviceManager> +#include <QMediaDevices> //TESTED_COMPONENT=src/multimedia @@ -65,7 +65,7 @@ private: void tst_QAudioDeviceInfo::initTestCase() { // Only perform tests if audio output device exists! - QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs(); + QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs(); if (devices.size() == 0) { QSKIP("NOTE: no audio output device found, no tests will be performed"); } else { @@ -81,18 +81,18 @@ void tst_QAudioDeviceInfo::cleanupTestCase() void tst_QAudioDeviceInfo::checkAvailableDefaultInput() { // Only perform tests if audio input device exists! - QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioInputs(); + QList<QAudioDeviceInfo> devices = QMediaDevices::audioInputs(); if (devices.size() > 0) { - QVERIFY(!QMediaDeviceManager::defaultAudioInput().isNull()); + QVERIFY(!QMediaDevices::defaultAudioInput().isNull()); } } void tst_QAudioDeviceInfo::checkAvailableDefaultOutput() { // Only perform tests if audio input device exists! - QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs(); + QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs(); if (devices.size() > 0) { - QVERIFY(!QMediaDeviceManager::defaultAudioOutput().isNull()); + QVERIFY(!QMediaDevices::defaultAudioOutput().isNull()); } } @@ -139,7 +139,7 @@ void tst_QAudioDeviceInfo::assignOperator() QVERIFY(dev.id().isNull()); QVERIFY(dev.isNull() == true); - QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs(); + QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs(); QVERIFY(devices.size() > 0); QAudioDeviceInfo dev1(devices.at(0)); dev = dev1; @@ -150,7 +150,7 @@ void tst_QAudioDeviceInfo::assignOperator() void tst_QAudioDeviceInfo::id() { QVERIFY(!device->id().isNull()); - QVERIFY(device->id() == QMediaDeviceManager::audioOutputs().at(0).id()); + QVERIFY(device->id() == QMediaDevices::audioOutputs().at(0).id()); } // QAudioDeviceInfo's defaultConstructor method @@ -171,7 +171,7 @@ void tst_QAudioDeviceInfo::equalityOperator() QVERIFY(!(dev1 != dev2)); // Make sure each available device is not equal to null - const auto infos = QMediaDeviceManager::audioOutputs(); + const auto infos = QMediaDevices::audioOutputs(); for (const QAudioDeviceInfo &info : infos) { QVERIFY(dev1 != info); QVERIFY(!(dev1 == info)); diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp index 8cf42830e..360f60b87 100644 --- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp @@ -36,7 +36,7 @@ #include <qaudiodeviceinfo.h> #include <qaudioformat.h> #include <qaudio.h> -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #include <qwavedecoder.h> @@ -131,12 +131,12 @@ QString tst_QAudioInput::formatToFileName(const QAudioFormat &format) void tst_QAudioInput::initTestCase() { // Only perform tests if audio output device exists - const QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs(); + const QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs(); if (devices.size() <= 0) QSKIP("No audio backend"); - audioDevice = QMediaDeviceManager::defaultAudioInput(); + audioDevice = QMediaDevices::defaultAudioInput(); QAudioFormat format; diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index 17ee8a875..87937b454 100644 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -38,7 +38,7 @@ #include <qaudiodeviceinfo.h> #include <qaudioformat.h> #include <qaudio.h> -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #include <qwavedecoder.h> #define AUDIO_BUFFER 192000 @@ -166,12 +166,12 @@ void tst_QAudioOutput::generate_audiofile_testrows() void tst_QAudioOutput::initTestCase() { // Only perform tests if audio output device exists - const QList<QAudioDeviceInfo> devices = QMediaDeviceManager::audioOutputs(); + const QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs(); if (devices.size() <= 0) QSKIP("No audio backend"); - audioDevice = QMediaDeviceManager::defaultAudioOutput(); + audioDevice = QMediaDevices::defaultAudioOutput(); QAudioFormat format; diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 275617235..ebe375f6c 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -42,7 +42,7 @@ #include <qcameraimagecapture.h> #include <qmediacapturesession.h> #include <qobject.h> -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #include <qmediaencoder.h> QT_USE_NAMESPACE @@ -93,11 +93,11 @@ void tst_QCameraBackend::cleanupTestCase() void tst_QCameraBackend::testCameraInfo() { - int deviceCount = QMediaDeviceManager::videoInputs().count(); - const QList<QCameraInfo> cameras = QMediaDeviceManager::videoInputs(); + int deviceCount = QMediaDevices::videoInputs().count(); + const QList<QCameraInfo> cameras = QMediaDevices::videoInputs(); QCOMPARE(cameras.count(), deviceCount); if (cameras.isEmpty()) { - QVERIFY(QMediaDeviceManager::defaultVideoInput().isNull()); + QVERIFY(QMediaDevices::defaultVideoInput().isNull()); QSKIP("Camera selection is not supported"); } @@ -109,17 +109,17 @@ void tst_QCameraBackend::testCameraInfo() void tst_QCameraBackend::testCtorWithCameraInfo() { - if (QMediaDeviceManager::videoInputs().isEmpty()) + if (QMediaDevices::videoInputs().isEmpty()) QSKIP("Camera selection not supported"); { - QCameraInfo info = QMediaDeviceManager::defaultVideoInput(); + QCameraInfo info = QMediaDevices::defaultVideoInput(); QCamera camera(info); QCOMPARE(camera.error(), QCamera::NoError); QCOMPARE(camera.cameraInfo(), info); } { - QCameraInfo info = QMediaDeviceManager::videoInputs().first(); + QCameraInfo info = QMediaDevices::videoInputs().first(); QCamera camera(info); QCOMPARE(camera.error(), QCamera::NoError); QCOMPARE(camera.cameraInfo(), info); @@ -188,8 +188,8 @@ void tst_QCameraBackend::testCameraStartError() { QMediaCaptureSession session1; QMediaCaptureSession session2; - QCamera camera1(QMediaDeviceManager::defaultVideoInput()); - QCamera camera2(QMediaDeviceManager::defaultVideoInput()); + QCamera camera1(QMediaDevices::defaultVideoInput()); + QCamera camera2(QMediaDevices::defaultVideoInput()); session1.setCamera(&camera1); session2.setCamera(&camera2); QSignalSpy errorSpy1(&camera1, &QCamera::errorOccurred); @@ -394,7 +394,7 @@ void tst_QCameraBackend::testVideoRecording_data() { QTest::addColumn<QCameraInfo>("device"); - const auto devices = QMediaDeviceManager::videoInputs(); + const auto devices = QMediaDevices::videoInputs(); for (const auto &device : devices) { QTest::newRow(device.description().toUtf8()) diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp index f48a2d29b..f98693522 100644 --- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp @@ -34,7 +34,7 @@ #include <qaudiodeviceinfo.h> #include <qaudio.h> #include "qsoundeffect.h" -#include "qmediadevicemanager.h" +#include "qmediadevices.h" class tst_QSoundEffect : public QObject { @@ -394,7 +394,7 @@ void tst_QSoundEffect::testSupportedMimeTypes_data() // Verify also passing of audio device info as parameter QTest::addColumn<QSoundEffect*>("instance"); QTest::newRow("without QAudioDeviceInfo") << sound; - QAudioDeviceInfo deviceInfo(QMediaDeviceManager::defaultAudioOutput()); + QAudioDeviceInfo deviceInfo(QMediaDevices::defaultAudioOutput()); QTest::newRow("with QAudioDeviceInfo") << new QSoundEffect(deviceInfo, this); } diff --git a/tests/auto/unit/mockbackend/CMakeLists.txt b/tests/auto/unit/mockbackend/CMakeLists.txt index 9824fafcc..5bddb393b 100644 --- a/tests/auto/unit/mockbackend/CMakeLists.txt +++ b/tests/auto/unit/mockbackend/CMakeLists.txt @@ -23,8 +23,8 @@ target_sources(QtMultimediaMockBackend INTERFACE qmockmediaencoder.h qmockmediacapturesession.h qmockvideosink.h - qmockdevicemanager.cpp - qmockdevicemanager_p.h + qmockmediadevices.cpp + qmockmediadevices_p.h qmockintegration.cpp qmockintegration_p.h ) diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp index 5468b10b6..698ecfed9 100644 --- a/tests/auto/unit/mockbackend/qmockintegration.cpp +++ b/tests/auto/unit/mockbackend/qmockintegration.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qmockintegration_p.h" -#include "qmockdevicemanager_p.h" +#include "qmockmediadevices_p.h" #include "qmockmediaplayer.h" #include "qmockaudiodecoder.h" #include "qmockcamera.h" @@ -56,14 +56,14 @@ QMockIntegration::QMockIntegration() QMockIntegration::~QMockIntegration() { setIntegration(nullptr); - delete m_manager; + delete m_devices; } -QPlatformMediaDeviceManager *QMockIntegration::deviceManager() +QPlatformMediaDevices *QMockIntegration::devices() { - if (!m_manager) - m_manager = new QMockDeviceManager(); - return m_manager; + if (!m_devices) + m_devices = new QMockMediaDevices(); + return m_devices; } QPlatformAudioDecoder *QMockIntegration::createAudioDecoder() diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h index feef106b1..11ca8eccc 100644 --- a/tests/auto/unit/mockbackend/qmockintegration_p.h +++ b/tests/auto/unit/mockbackend/qmockintegration_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -class QMockDeviceManager; +class QMockMediaDevices; class QMockMediaPlayer; class QMockAudioDecoder; class QMockCamera; @@ -68,7 +68,7 @@ public: QMockIntegration(); ~QMockIntegration(); - QPlatformMediaDeviceManager *deviceManager() override; + QPlatformMediaDevices *devices() override; QPlatformMediaFormatInfo *formatInfo() override { return nullptr; } QPlatformAudioDecoder *createAudioDecoder() override; @@ -98,7 +98,7 @@ public: private: Flags m_flags = {}; - QMockDeviceManager *m_manager = nullptr; + QMockMediaDevices *m_devices = nullptr; QMockMediaPlayer *m_lastPlayer = nullptr; QMockAudioDecoder *m_lastAudioDecoderControl = nullptr; QMockCamera *m_lastCamera = nullptr; diff --git a/tests/auto/unit/mockbackend/qmockdevicemanager.cpp b/tests/auto/unit/mockbackend/qmockmediadevices.cpp index a5ef956c8..72242ce01 100644 --- a/tests/auto/unit/mockbackend/qmockdevicemanager.cpp +++ b/tests/auto/unit/mockbackend/qmockmediadevices.cpp @@ -37,13 +37,13 @@ ** ****************************************************************************/ -#include "qmockdevicemanager_p.h" +#include "qmockmediadevices_p.h" #include "private/qcamerainfo_p.h" QT_BEGIN_NAMESPACE -QMockDeviceManager::QMockDeviceManager() - : QPlatformMediaDeviceManager() +QMockMediaDevices::QMockMediaDevices() + : QPlatformMediaDevices() { QCameraInfoPrivate *info = new QCameraInfoPrivate; info->description = QString::fromUtf8("defaultCamera"); @@ -65,30 +65,30 @@ QMockDeviceManager::QMockDeviceManager() } -QMockDeviceManager::~QMockDeviceManager() = default; +QMockMediaDevices::~QMockMediaDevices() = default; -QList<QAudioDeviceInfo> QMockDeviceManager::audioInputs() const +QList<QAudioDeviceInfo> QMockMediaDevices::audioInputs() const { return m_inputDevices; } -QList<QAudioDeviceInfo> QMockDeviceManager::audioOutputs() const +QList<QAudioDeviceInfo> QMockMediaDevices::audioOutputs() const { return m_outputDevices; } -QList<QCameraInfo> QMockDeviceManager::videoInputs() const +QList<QCameraInfo> QMockMediaDevices::videoInputs() const { return m_cameraDevices; } -QAbstractAudioInput *QMockDeviceManager::createAudioInputDevice(const QAudioDeviceInfo &info) +QAbstractAudioInput *QMockMediaDevices::createAudioInputDevice(const QAudioDeviceInfo &info) { Q_UNUSED(info); return nullptr;// ### } -QAbstractAudioOutput *QMockDeviceManager::createAudioOutputDevice(const QAudioDeviceInfo &info) +QAbstractAudioOutput *QMockMediaDevices::createAudioOutputDevice(const QAudioDeviceInfo &info) { Q_UNUSED(info); return nullptr; //### diff --git a/tests/auto/unit/mockbackend/qmockdevicemanager_p.h b/tests/auto/unit/mockbackend/qmockmediadevices_p.h index 100fe610f..30afa2276 100644 --- a/tests/auto/unit/mockbackend/qmockdevicemanager_p.h +++ b/tests/auto/unit/mockbackend/qmockmediadevices_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QMOCKDEVICEMANAGER_H -#define QMOCKDEVICEMANAGER_H +#ifndef QMOCKMEDIADEVICES_H +#define QMOCKMEDIADEVICES_H // // W A R N I N G @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qplatformmediadevicemanager_p.h> +#include <private/qplatformmediadevices_p.h> #include <qelapsedtimer.h> #include <qaudiodeviceinfo.h> #include <qcamerainfo.h> @@ -62,11 +62,11 @@ Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureDeviceDiscoverySession); class QCameraInfo; -class QMockDeviceManager : public QPlatformMediaDeviceManager +class QMockMediaDevices : public QPlatformMediaDevices { public: - QMockDeviceManager(); - ~QMockDeviceManager(); + QMockMediaDevices(); + ~QMockMediaDevices(); QList<QAudioDeviceInfo> audioInputs() const override; QList<QAudioDeviceInfo> audioOutputs() const override; diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp index b4e159540..08cb621bc 100644 --- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp @@ -42,7 +42,7 @@ #include <qcameraimagecapture.h> #include <qmediacapturesession.h> #include <qobject.h> -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #include "qmockintegration_p.h" #include "qmockmediacapturesession.h" @@ -690,8 +690,8 @@ void tst_QCamera::testCameraControl() void tst_QCamera::testConstructor() { - auto cameras = QMediaDeviceManager::videoInputs(); - QCameraInfo defaultCamera = QMediaDeviceManager::defaultVideoInput(); + auto cameras = QMediaDevices::videoInputs(); + QCameraInfo defaultCamera = QMediaDevices::defaultVideoInput(); QCameraInfo frontCamera, backCamera; for (const auto &c : cameras) { if (frontCamera.isNull() && c.position() == QCameraInfo::FrontFace) @@ -718,14 +718,14 @@ void tst_QCamera::testConstructor() } { - QCamera camera(QMediaDeviceManager::defaultVideoInput()); + QCamera camera(QMediaDevices::defaultVideoInput()); QCOMPARE(camera.isAvailable(), true); QCOMPARE(camera.error(), QCamera::NoError); QCOMPARE(camera.cameraInfo(), defaultCamera); } { - QCameraInfo cameraInfo = QMediaDeviceManager::videoInputs().at(0); + QCameraInfo cameraInfo = QMediaDevices::videoInputs().at(0); QCamera camera(cameraInfo); QCOMPARE(camera.isAvailable(), true); QCOMPARE(camera.error(), QCamera::NoError); diff --git a/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp b/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp index 673607c88..5582c82dc 100644 --- a/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp +++ b/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp @@ -31,7 +31,7 @@ #include <qcamera.h> #include <qcamerainfo.h> -#include <qmediadevicemanager.h> +#include <qmediadevices.h> #include "qmockintegration_p.h" #include "qmockmediacapturesession.h" @@ -81,7 +81,7 @@ void tst_QCameraInfo::constructor() QCOMPARE(info.position(), QCameraInfo::UnspecifiedPosition); } - auto cameras = QMediaDeviceManager::videoInputs(); + auto cameras = QMediaDevices::videoInputs(); QCameraInfo info; for (const auto &c : cameras) { if (c.position() == QCameraInfo::BackFace) @@ -105,7 +105,7 @@ void tst_QCameraInfo::constructor() void tst_QCameraInfo::defaultCamera() { - QCameraInfo info = QMediaDeviceManager::defaultVideoInput(); + QCameraInfo info = QMediaDevices::defaultVideoInput(); QVERIFY(!info.isNull()); QCOMPARE(info.id(), QStringLiteral("default")); @@ -118,7 +118,7 @@ void tst_QCameraInfo::defaultCamera() void tst_QCameraInfo::availableCameras() { - QList<QCameraInfo> cameras = QMediaDeviceManager::videoInputs(); + QList<QCameraInfo> cameras = QMediaDevices::videoInputs(); QCOMPARE(cameras.count(), 3); QCameraInfo info = cameras.at(0); @@ -143,8 +143,8 @@ void tst_QCameraInfo::availableCameras() void tst_QCameraInfo::equality_operators() { - QCameraInfo defaultCamera = QMediaDeviceManager::defaultVideoInput(); - QList<QCameraInfo> cameras = QMediaDeviceManager::videoInputs(); + QCameraInfo defaultCamera = QMediaDevices::defaultVideoInput(); + QList<QCameraInfo> cameras = QMediaDevices::videoInputs(); QVERIFY(defaultCamera == cameras.at(0)); QVERIFY(defaultCamera != cameras.at(1)); |