summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/multimedia/audiodevices/audiodevices.cpp2
-rw-r--r--examples/multimedia/audiodevices/audiodevices.h4
-rw-r--r--examples/multimedia/audiooutput/audiooutput.cpp8
-rw-r--r--examples/multimedia/audiooutput/audiooutput.h2
-rw-r--r--examples/multimedia/audiorecorder/audiorecorder.cpp4
-rw-r--r--examples/multimedia/audiosource/audiosource.cpp8
-rw-r--r--examples/multimedia/audiosource/audiosource.h2
-rw-r--r--examples/multimedia/devices/main.cpp14
-rw-r--r--examples/multimedia/spectrum/app/engine.cpp4
-rw-r--r--examples/multimedia/spectrum/app/engine.h18
-rw-r--r--examples/multimedia/spectrum/app/settingsdialog.cpp12
-rw-r--r--examples/multimedia/spectrum/app/settingsdialog.h14
-rw-r--r--examples/multimedia/spectrum/app/tonegeneratordialog.h2
-rw-r--r--examples/multimediawidgets/camera/camera.cpp12
-rw-r--r--examples/multimediawidgets/camera/camera.h2
-rw-r--r--examples/multimediawidgets/camera/videosettings.cpp4
-rw-r--r--examples/multimediawidgets/player/player.cpp6
17 files changed, 59 insertions, 59 deletions
diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index 5ec944013..ecd097a50 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -147,7 +147,7 @@ void AudioTest::deviceChanged(int idx)
return;
// device has changed
- m_deviceInfo = deviceBox->itemData(idx).value<QAudioDeviceInfo>();
+ m_deviceInfo = deviceBox->itemData(idx).value<QAudioDevice>();
sampleRateSpinBox->clear();
sampleRateSpinBox->setMinimum(m_deviceInfo.minimumSampleRate());
diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
index 7b74cc65a..18c968ca1 100644
--- a/examples/multimedia/audiodevices/audiodevices.h
+++ b/examples/multimedia/audiodevices/audiodevices.h
@@ -51,7 +51,7 @@
#ifndef AUDIODEVICES_H
#define AUDIODEVICES_H
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
#include <QMediaDevices>
#include <QMainWindow>
#include <QObject>
@@ -73,7 +73,7 @@ public:
explicit AudioTest(QWidget *parent = nullptr);
private:
- QAudioDeviceInfo m_deviceInfo;
+ QAudioDevice m_deviceInfo;
QAudioFormat m_settings;
QAudio::Mode m_mode = QAudio::AudioInput;
QMediaDevices *m_devices = nullptr;
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;
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 7ff792330..53575c45a 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -59,7 +59,7 @@
#include <QMediaEncoder>
#include <QStandardPaths>
#include <qmediadevices.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
#include <qaudiobuffer.h>
static QList<qreal> getBufferLevels(const QAudioBuffer &buffer);
@@ -189,7 +189,7 @@ static QVariant boxValue(const QComboBox *box)
void AudioRecorder::toggleRecord()
{
if (m_audioEncoder->state() == QMediaEncoder::StoppedState) {
- m_captureSession.setAudioInput(boxValue(ui->audioDeviceBox).value<QAudioDeviceInfo>());
+ m_captureSession.setAudioInput(boxValue(ui->audioDeviceBox).value<QAudioDevice>());
QMediaEncoderSettings settings;
settings.setFileFormat(boxValue(ui->containerBox).value<QMediaFormat::FileFormat>());
diff --git a/examples/multimedia/audiosource/audiosource.cpp b/examples/multimedia/audiosource/audiosource.cpp
index 3469a44f0..04e8e0f40 100644
--- a/examples/multimedia/audiosource/audiosource.cpp
+++ b/examples/multimedia/audiosource/audiosource.cpp
@@ -57,7 +57,7 @@
#include <QDebug>
#include <QPainter>
#include <QVBoxLayout>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
#include <QAudioSource>
#include <qendian.h>
@@ -163,7 +163,7 @@ void InputTest::initializeWindow()
layout->addWidget(m_canvas);
m_deviceBox = new QComboBox(this);
- const QAudioDeviceInfo &defaultDeviceInfo = m_devices->defaultAudioInput();
+ const QAudioDevice &defaultDeviceInfo = m_devices->defaultAudioInput();
m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo));
for (auto &deviceInfo: m_devices->audioInputs()) {
if (deviceInfo != defaultDeviceInfo)
@@ -193,7 +193,7 @@ void InputTest::initializeWindow()
window->show();
}
-void InputTest::initializeAudio(const QAudioDeviceInfo &deviceInfo)
+void InputTest::initializeAudio(const QAudioDevice &deviceInfo)
{
QAudioFormat format;
format.setSampleRate(8000);
@@ -263,7 +263,7 @@ void InputTest::deviceChanged(int index)
m_audioInput->stop();
m_audioInput->disconnect(this);
- initializeAudio(m_deviceBox->itemData(index).value<QAudioDeviceInfo>());
+ initializeAudio(m_deviceBox->itemData(index).value<QAudioDevice>());
}
void InputTest::sliderChanged(int value)
diff --git a/examples/multimedia/audiosource/audiosource.h b/examples/multimedia/audiosource/audiosource.h
index f1a48bd9b..c5662a397 100644
--- a/examples/multimedia/audiosource/audiosource.h
+++ b/examples/multimedia/audiosource/audiosource.h
@@ -114,7 +114,7 @@ public:
private:
void initializeWindow();
- void initializeAudio(const QAudioDeviceInfo &deviceInfo);
+ void initializeAudio(const QAudioDevice &deviceInfo);
private slots:
void toggleMode();
diff --git a/examples/multimedia/devices/main.cpp b/examples/multimedia/devices/main.cpp
index ce43c7079..a9d1537d3 100644
--- a/examples/multimedia/devices/main.cpp
+++ b/examples/multimedia/devices/main.cpp
@@ -52,8 +52,8 @@
#include <QString>
#include <QAudioFormat>
-#include <QAudioDeviceInfo>
-#include <QCameraInfo>
+#include <QAudioDevice>
+#include <QCameraDevice>
#include <qmediadevices.h>
#include <stdio.h>
@@ -74,19 +74,19 @@ QString formatToString(QAudioFormat::SampleFormat sampleFormat)
}
}
-QString positionToString(QCameraInfo::Position position)
+QString positionToString(QCameraDevice::Position position)
{
switch (position) {
- case QCameraInfo::BackFace:
+ case QCameraDevice::BackFace:
return "BackFace";
- case QCameraInfo::FrontFace:
+ case QCameraDevice::FrontFace:
return "FrontFace";
default:
return "Unspecified";
}
}
-void printAudioDeviceInfo(QTextStream &out, const QAudioDeviceInfo &deviceInfo)
+void printAudioDeviceInfo(QTextStream &out, const QAudioDevice &deviceInfo)
{
const auto isDefault = deviceInfo.isDefault() ? "Yes" : "No";
const auto preferredFormat = deviceInfo.preferredFormat();
@@ -119,7 +119,7 @@ void printAudioDeviceInfo(QTextStream &out, const QAudioDeviceInfo &deviceInfo)
out << Qt::endl;
}
-void printVideoDeviceInfo(QTextStream &out, const QCameraInfo &cameraInfo)
+void printVideoDeviceInfo(QTextStream &out, const QCameraDevice &cameraInfo)
{
const auto isDefault = cameraInfo.isDefault() ? "Yes" : "No";
const auto position = cameraInfo.position();
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 25d7361eb..78aef1412 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -304,7 +304,7 @@ void Engine::suspend()
}
}
-void Engine::setAudioInputDevice(const QAudioDeviceInfo &device)
+void Engine::setAudioInputDevice(const QAudioDevice &device)
{
if (device.id() != m_audioInputDevice.id()) {
m_audioInputDevice = device;
@@ -312,7 +312,7 @@ void Engine::setAudioInputDevice(const QAudioDeviceInfo &device)
}
}
-void Engine::setAudioOutputDevice(const QAudioDeviceInfo &device)
+void Engine::setAudioOutputDevice(const QAudioDevice &device)
{
if (device.id() != m_audioOutputDevice.id()) {
m_audioOutputDevice = device;
diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
index d82f17da2..1ee87a2a5 100644
--- a/examples/multimedia/spectrum/app/engine.h
+++ b/examples/multimedia/spectrum/app/engine.h
@@ -54,7 +54,7 @@
#include "spectrum.h"
#include "spectrumanalyser.h"
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
#include <QAudioFormat>
#include <QBuffer>
#include <QByteArray>
@@ -93,10 +93,10 @@ public:
explicit Engine(QObject *parent = 0);
~Engine();
- const QList<QAudioDeviceInfo> &availableAudioInputDevices() const
+ const QList<QAudioDevice> &availableAudioInputDevices() const
{ return m_availableAudioInputDevices; }
- const QList<QAudioDeviceInfo> &availableAudioOutputDevices() const
+ const QList<QAudioDevice> &availableAudioOutputDevices() const
{ return m_availableAudioOutputDevices; }
QAudio::Mode mode() const { return m_mode; }
@@ -178,8 +178,8 @@ public slots:
void startRecording();
void startPlayback();
void suspend();
- void setAudioInputDevice(const QAudioDeviceInfo &device);
- void setAudioOutputDevice(const QAudioDeviceInfo &device);
+ void setAudioInputDevice(const QAudioDevice &device);
+ void setAudioOutputDevice(const QAudioDevice &device);
signals:
void stateChanged(QAudio::Mode mode, QAudio::State state);
@@ -291,14 +291,14 @@ private:
QAudioFormat m_format;
- const QList<QAudioDeviceInfo> m_availableAudioInputDevices;
- QAudioDeviceInfo m_audioInputDevice;
+ const QList<QAudioDevice> m_availableAudioInputDevices;
+ QAudioDevice m_audioInputDevice;
QAudioSource* m_audioInput;
QIODevice* m_audioInputIODevice;
qint64 m_recordPosition;
- const QList<QAudioDeviceInfo> m_availableAudioOutputDevices;
- QAudioDeviceInfo m_audioOutputDevice;
+ const QList<QAudioDevice> m_availableAudioOutputDevices;
+ QAudioDevice m_audioOutputDevice;
QAudioSink* m_audioOutput;
qint64 m_playPosition;
QBuffer m_audioOutputIODevice;
diff --git a/examples/multimedia/spectrum/app/settingsdialog.cpp b/examples/multimedia/spectrum/app/settingsdialog.cpp
index 455e1dd5a..3ec9c6956 100644
--- a/examples/multimedia/spectrum/app/settingsdialog.cpp
+++ b/examples/multimedia/spectrum/app/settingsdialog.cpp
@@ -59,8 +59,8 @@
#include <QVBoxLayout>
SettingsDialog::SettingsDialog(
- const QList<QAudioDeviceInfo> &availableInputDevices,
- const QList<QAudioDeviceInfo> &availableOutputDevices,
+ const QList<QAudioDevice> &availableInputDevices,
+ const QList<QAudioDevice> &availableOutputDevices,
QWidget *parent)
: QDialog(parent)
, m_windowFunction(DefaultWindowFunction)
@@ -72,10 +72,10 @@ SettingsDialog::SettingsDialog(
// Populate combo boxes
- for (const QAudioDeviceInfo &device : availableInputDevices)
+ for (const QAudioDevice &device : availableInputDevices)
m_inputDeviceComboBox->addItem(device.description(),
QVariant::fromValue(device));
- for (const QAudioDeviceInfo &device : availableOutputDevices)
+ for (const QAudioDevice &device : availableOutputDevices)
m_outputDeviceComboBox->addItem(device.description(),
QVariant::fromValue(device));
@@ -141,11 +141,11 @@ void SettingsDialog::windowFunctionChanged(int index)
void SettingsDialog::inputDeviceChanged(int index)
{
- m_inputDevice = m_inputDeviceComboBox->itemData(index).value<QAudioDeviceInfo>();
+ m_inputDevice = m_inputDeviceComboBox->itemData(index).value<QAudioDevice>();
}
void SettingsDialog::outputDeviceChanged(int index)
{
- m_outputDevice = m_outputDeviceComboBox->itemData(index).value<QAudioDeviceInfo>();
+ m_outputDevice = m_outputDeviceComboBox->itemData(index).value<QAudioDevice>();
}
diff --git a/examples/multimedia/spectrum/app/settingsdialog.h b/examples/multimedia/spectrum/app/settingsdialog.h
index 3200ccf54..e6563b6ce 100644
--- a/examples/multimedia/spectrum/app/settingsdialog.h
+++ b/examples/multimedia/spectrum/app/settingsdialog.h
@@ -53,7 +53,7 @@
#include "spectrum.h"
#include <QDialog>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
QT_BEGIN_NAMESPACE
class QComboBox;
@@ -72,14 +72,14 @@ class SettingsDialog : public QDialog
Q_OBJECT
public:
- SettingsDialog(const QList<QAudioDeviceInfo> &availableInputDevices,
- const QList<QAudioDeviceInfo> &availableOutputDevices,
+ SettingsDialog(const QList<QAudioDevice> &availableInputDevices,
+ const QList<QAudioDevice> &availableOutputDevices,
QWidget *parent = 0);
~SettingsDialog();
WindowFunction windowFunction() const { return m_windowFunction; }
- const QAudioDeviceInfo &inputDevice() const { return m_inputDevice; }
- const QAudioDeviceInfo &outputDevice() const { return m_outputDevice; }
+ const QAudioDevice &inputDevice() const { return m_inputDevice; }
+ const QAudioDevice &outputDevice() const { return m_outputDevice; }
private slots:
void windowFunctionChanged(int index);
@@ -88,8 +88,8 @@ private slots:
private:
WindowFunction m_windowFunction;
- QAudioDeviceInfo m_inputDevice;
- QAudioDeviceInfo m_outputDevice;
+ QAudioDevice m_inputDevice;
+ QAudioDevice m_outputDevice;
QComboBox *m_inputDeviceComboBox;
QComboBox *m_outputDeviceComboBox;
diff --git a/examples/multimedia/spectrum/app/tonegeneratordialog.h b/examples/multimedia/spectrum/app/tonegeneratordialog.h
index 48a44a152..5095cbb7d 100644
--- a/examples/multimedia/spectrum/app/tonegeneratordialog.h
+++ b/examples/multimedia/spectrum/app/tonegeneratordialog.h
@@ -52,7 +52,7 @@
#define TONEGENERATORDIALOG_H
#include "spectrum.h"
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
#include <QDialog>
QT_BEGIN_NAMESPACE
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index a237c38de..8e339a6cb 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -56,10 +56,10 @@
#include <QMediaEncoder>
#include <QVideoWidget>
-#include <QCameraInfo>
+#include <QCameraDevice>
#include <QMediaMetaData>
#include <QMediaDevices>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
#include <QMessageBox>
#include <QPalette>
@@ -89,7 +89,7 @@ Camera::Camera()
setCamera(QMediaDevices::defaultVideoInput());
}
-void Camera::setCamera(const QCameraInfo &cameraInfo)
+void Camera::setCamera(const QCameraDevice &cameraInfo)
{
m_camera.reset(new QCamera(cameraInfo));
m_captureSession.setCamera(m_camera.data());
@@ -320,7 +320,7 @@ void Camera::displayCameraError()
void Camera::updateCameraDevice(QAction *action)
{
- setCamera(qvariant_cast<QCameraInfo>(action->data()));
+ setCamera(qvariant_cast<QCameraDevice>(action->data()));
}
void Camera::displayViewfinder()
@@ -362,8 +362,8 @@ void Camera::closeEvent(QCloseEvent *event)
void Camera::updateCameras()
{
ui->menuDevices->clear();
- const QList<QCameraInfo> availableCameras = QMediaDevices::videoInputs();
- for (const QCameraInfo &cameraInfo : availableCameras) {
+ const QList<QCameraDevice> availableCameras = QMediaDevices::videoInputs();
+ for (const QCameraDevice &cameraInfo : availableCameras) {
QAction *videoDeviceAction = new QAction(cameraInfo.description(), videoDevicesGroup);
videoDeviceAction->setCheckable(true);
videoDeviceAction->setData(QVariant::fromValue(cameraInfo));
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 2424b57d0..95e436744 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -79,7 +79,7 @@ public slots:
void saveMetaData();
private slots:
- void setCamera(const QCameraInfo &cameraInfo);
+ void setCamera(const QCameraDevice &cameraInfo);
void startCamera();
void stopCamera();
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index c6c0182ab..aafd4b5f3 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
@@ -56,9 +56,9 @@
#include <QDebug>
#include <QMediaEncoder>
#include <QMediaFormat>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
#include <QMediaCaptureSession>
-#include <QCameraInfo>
+#include <QCameraDevice>
#include <QCamera>
VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent)
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index d3e3128a5..7c9d74b9c 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -58,7 +58,7 @@
#include <QMediaPlaylist>
#include <QMediaMetaData>
#include <QMediaDevices>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
#include <QMediaFormat>
#include <QtWidgets>
@@ -187,7 +187,7 @@ Player::Player(QWidget *parent)
connect(m_colorButton, &QPushButton::clicked, this, &Player::showColorDialog);
m_audioOutput = new QComboBox(this);
- m_audioOutput->addItem(QString::fromUtf8("Default"), QVariant::fromValue(QAudioDeviceInfo()));
+ m_audioOutput->addItem(QString::fromUtf8("Default"), QVariant::fromValue(QAudioDevice()));
for (auto &deviceInfo: QMediaDevices::audioOutputs())
m_audioOutput->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
connect(m_audioOutput, QOverload<int>::of(&QComboBox::activated), this, &Player::audioOutputChanged);
@@ -583,7 +583,7 @@ void Player::showColorDialog()
void Player::audioOutputChanged(int index)
{
- auto device = m_audioOutput->itemData(index).value<QAudioDeviceInfo>();
+ auto device = m_audioOutput->itemData(index).value<QAudioDevice>();
m_player->setAudioOutput(device);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 21:32:07 +0000