diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-06-03 10:38:13 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-04 14:15:51 +0200 |
| commit | 3350275e25c96b391e31d2c9c472b4f0aa58b8f7 (patch) | |
| tree | 31d18bf584e852008620967304341c428fc1311f /examples/multimedia/audiooutput | |
| parent | aa1f073a32147d147e4e9a0fee9dde8ccc30531e (diff) | |
Rename QAudioOutput to QAudioSink
Change-Id: If852737b85d3ca95d55a852a3c50f80a5a09c61e
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 | 4 | ||||
| -rw-r--r-- | examples/multimedia/audiooutput/doc/src/audiooutput.qdoc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index ba421f3fa..faf5c0555 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -51,7 +51,7 @@ #include "audiooutput.h" #include <QAudioDeviceInfo> -#include <QAudioOutput> +#include <QAudioSink> #include <QDebug> #include <QVBoxLayout> #include <qmath.h> @@ -201,7 +201,7 @@ void AudioTest::initializeAudio(const QAudioDeviceInfo &deviceInfo) const int durationSeconds = 1; const int toneSampleRateHz = 600; m_generator.reset(new Generator(format, durationSeconds * 1000000, toneSampleRateHz)); - m_audioOutput.reset(new QAudioOutput(deviceInfo, format)); + m_audioOutput.reset(new QAudioSink(deviceInfo, format)); m_generator->start(); qreal initialVolume = QAudio::convertVolume(m_audioOutput->volume(), @@ -235,11 +235,11 @@ void AudioTest::toggleMode() toggleSuspendResume(); if (m_pullMode) { - //switch to pull mode (QAudioOutput pulls from Generator as needed) + //switch to pull mode (QAudioSink pulls from Generator as needed) m_modeButton->setText(tr("Enable push mode")); m_audioOutput->start(m_generator.data()); } else { - //switch to push mode (periodically push to QAudioOutput using a timer) + //switch to push mode (periodically push to QAudioSink using a timer) m_modeButton->setText(tr("Enable pull mode")); auto io = m_audioOutput->start(); m_pushTimer->disconnect(); diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h index 3f5f7db0c..1a7bf9f63 100644 --- a/examples/multimedia/audiooutput/audiooutput.h +++ b/examples/multimedia/audiooutput/audiooutput.h @@ -53,7 +53,7 @@ #include <math.h> -#include <QAudioOutput> +#include <QAudioSink> #include <QByteArray> #include <QComboBox> #include <QIODevice> @@ -113,7 +113,7 @@ private: QSlider *m_volumeSlider = nullptr; QScopedPointer<Generator> m_generator; - QScopedPointer<QAudioOutput> m_audioOutput; + QScopedPointer<QAudioSink> m_audioOutput; bool m_pullMode = true; diff --git a/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc b/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc index 92dbc7e2c..af007a1b8 100644 --- a/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc +++ b/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc @@ -29,9 +29,9 @@ \example multimedia/audiooutput \title Audio Output Example \ingroup multimedia_examples - \brief Enabling audio playback using the QAudioOutput class. + \brief Enabling audio playback using the QAudioSink class. - \e{Audio Output} demonstrates the basic use cases of QAudioOutput. + \e{Audio Output} demonstrates the basic use cases of QAudioSink. \image audiooutput-example.png |