summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/audiooutput
diff options
context:
space:
mode:
Diffstat (limited to 'examples/multimedia/audiooutput')
-rw-r--r--examples/multimedia/audiooutput/audiooutput.cpp8
-rw-r--r--examples/multimedia/audiooutput/audiooutput.h4
2 files changed, 6 insertions, 6 deletions
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