diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-06-04 12:43:05 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-08 09:58:15 +0200 |
commit | 1c4dd0c23c0a7bdefaeecbae491a12f49a6b9ce5 (patch) | |
tree | 1a8e273f5da4a4c7718a36c9d70831ab99150280 /examples/multimedia/audiooutput | |
parent | 34d4dc092aa82adf9dc1b9e1a2f85dc474cfbc63 (diff) |
Rename QCameraInfo/QAudioDeviceInfo to QCamera/AudioDevice
Those classes represent the physical device and it's properties, thus
that name fits best.
Change-Id: I0f45fc875ae6110452c1f2fb17f32adbe5155d01
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/multimedia/audiooutput')
-rw-r--r-- | examples/multimedia/audiooutput/audiooutput.cpp | 8 | ||||
-rw-r--r-- | examples/multimedia/audiooutput/audiooutput.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index faf5c0555..3e3460251 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -50,7 +50,7 @@ #include "audiooutput.h" -#include <QAudioDeviceInfo> +#include <QAudioDevice> #include <QAudioSink> #include <QDebug> #include <QVBoxLayout> @@ -159,7 +159,7 @@ void AudioTest::initializeWindow() QVBoxLayout *layout = new QVBoxLayout; m_deviceBox = new QComboBox(this); - const QAudioDeviceInfo &defaultDeviceInfo = m_devices->defaultAudioOutput(); + const QAudioDevice &defaultDeviceInfo = m_devices->defaultAudioOutput(); m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo)); for (auto &deviceInfo: m_devices->audioOutputs()) { if (deviceInfo != defaultDeviceInfo) @@ -194,7 +194,7 @@ void AudioTest::initializeWindow() window->show(); } -void AudioTest::initializeAudio(const QAudioDeviceInfo &deviceInfo) +void AudioTest::initializeAudio(const QAudioDevice &deviceInfo) { QAudioFormat format = deviceInfo.preferredFormat(); @@ -216,7 +216,7 @@ void AudioTest::deviceChanged(int index) m_generator->stop(); m_audioOutput->stop(); m_audioOutput->disconnect(this); - initializeAudio(m_deviceBox->itemData(index).value<QAudioDeviceInfo>()); + initializeAudio(m_deviceBox->itemData(index).value<QAudioDevice>()); } void AudioTest::volumeChanged(int value) diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h index 1a7bf9f63..156cc775c 100644 --- a/examples/multimedia/audiooutput/audiooutput.h +++ b/examples/multimedia/audiooutput/audiooutput.h @@ -99,7 +99,7 @@ public: private: void initializeWindow(); - void initializeAudio(const QAudioDeviceInfo &deviceInfo); + void initializeAudio(const QAudioDevice &deviceInfo); private: QMediaDevices *m_devices = nullptr; |