diff options
Diffstat (limited to 'examples/multimedia/audiodevices')
-rw-r--r-- | examples/multimedia/audiodevices/audiodevices.cpp | 10 | ||||
-rw-r--r-- | examples/multimedia/audiodevices/audiodevices.h | 4 |
2 files changed, 7 insertions, 7 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(); |