diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-05-06 17:58:39 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-07 06:59:51 +0000 |
commit | 9916a42d1c4405af688b4b834500501323bc5ae3 (patch) | |
tree | edab1dcb51a8214fef5d4855adc5cb7d8cafbe00 /src/multimedia | |
parent | b4d1a38d8796cc6eef4ff4d4e1fc3cda7c82b12e (diff) |
QAudioInput:: Rename bytesReady to bytesAvailable
And use qsizetype, also for bytesFree and the buffer size APIs.
Adjust platform implementations, leave the internal name unchanged for now.
Change-Id: I2471090fc5826e992580d557d0d5b545e2be1a0a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia')
33 files changed, 103 insertions, 103 deletions
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp index f560be300..80840f63c 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/audio/qaudioinput.cpp @@ -257,7 +257,7 @@ void QAudioInput::resume() */ -void QAudioInput::setBufferSize(int value) +void QAudioInput::setBufferSize(qsizetype value) { d->setBufferSize(value); } @@ -272,7 +272,7 @@ void QAudioInput::setBufferSize(int value) */ -int QAudioInput::bufferSize() const +qsizetype QAudioInput::bufferSize() const { return d->bufferSize(); } @@ -284,7 +284,7 @@ int QAudioInput::bufferSize() const state, otherwise returns zero. */ -int QAudioInput::bytesReady() const +qsizetype QAudioInput::bytesAvailable() const { /* -If not ActiveState|IdleState, return 0 diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h index 8db964866..f346a8006 100644 --- a/src/multimedia/audio/qaudioinput.h +++ b/src/multimedia/audio/qaudioinput.h @@ -77,10 +77,10 @@ public: void suspend(); void resume(); - void setBufferSize(int bytes); - int bufferSize() const; + void setBufferSize(qsizetype bytes); + qsizetype bufferSize() const; - int bytesReady() const; + qsizetype bytesAvailable() const; int periodSize() const; void setVolume(qreal volume); diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp index 3257d5c2b..3f0375da3 100644 --- a/src/multimedia/audio/qaudiooutput.cpp +++ b/src/multimedia/audio/qaudiooutput.cpp @@ -239,7 +239,7 @@ void QAudioOutput::resume() \note The returned value is only valid while in QAudio::ActiveState or QAudio::IdleState state, otherwise returns zero. */ -int QAudioOutput::bytesFree() const +qsizetype QAudioOutput::bytesFree() const { return d->bytesFree(); } @@ -264,7 +264,7 @@ int QAudioOutput::periodSize() const set is the actual buffer size used - call bufferSize() anytime after start() to return the actual buffer size being used. */ -void QAudioOutput::setBufferSize(int value) +void QAudioOutput::setBufferSize(qsizetype value) { d->setBufferSize(value); } @@ -278,7 +278,7 @@ void QAudioOutput::setBufferSize(int value) by setBufferSize(). */ -int QAudioOutput::bufferSize() const +qsizetype QAudioOutput::bufferSize() const { return d->bufferSize(); } diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index f361af211..342f7f800 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -77,10 +77,10 @@ public: void suspend(); void resume(); - void setBufferSize(int bytes); - int bufferSize() const; + void setBufferSize(qsizetype bytes); + qsizetype bufferSize() const; - int bytesFree() const; + qsizetype bytesFree() const; int periodSize() const; qint64 processedUSecs() const; diff --git a/src/multimedia/audio/qaudiosystem.cpp b/src/multimedia/audio/qaudiosystem.cpp index 25c6ad399..9aa8d5114 100644 --- a/src/multimedia/audio/qaudiosystem.cpp +++ b/src/multimedia/audio/qaudiosystem.cpp @@ -154,7 +154,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn virtual int QAbstractAudioOutput::bytesFree() const + \fn virtual qsizetype QAbstractAudioOutput::bytesFree() const Returns the free space available in bytes in the audio buffer. */ @@ -170,12 +170,12 @@ int QAbstractAudioOutput::periodSize() const } /*! - \fn virtual void QAbstractAudioOutput::setBufferSize(int value) + \fn virtual void QAbstractAudioOutput::setBufferSize(qsizetype value) Sets the audio buffer size to \a value in bytes. */ /*! - \fn virtual int QAbstractAudioOutput::bufferSize() const + \fn virtual qsizetype QAbstractAudioOutput::bufferSize() const Returns the audio buffer size in bytes. */ @@ -275,7 +275,7 @@ int QAbstractAudioOutput::periodSize() const */ /*! - \fn virtual int QAbstractAudioInput::bytesReady() const + \fn virtual qsizetype QAbstractAudioInput::bytesReady() const Returns the amount of audio data available to read in bytes. */ @@ -291,12 +291,12 @@ int QAbstractAudioInput::periodSize() const } /*! - \fn virtual void QAbstractAudioInput::setBufferSize(int value) + \fn virtual void QAbstractAudioInput::setBufferSize(qsizetype value) Sets the audio buffer size to \a value in milliseconds. */ /*! - \fn virtual int QAbstractAudioInput::bufferSize() const + \fn virtual qsizetype QAbstractAudioInput::bufferSize() const Returns the audio buffer size in milliseconds. */ diff --git a/src/multimedia/audio/qaudiosystem_p.h b/src/multimedia/audio/qaudiosystem_p.h index 1ff4c2a8f..fb0ad3e12 100644 --- a/src/multimedia/audio/qaudiosystem_p.h +++ b/src/multimedia/audio/qaudiosystem_p.h @@ -74,10 +74,10 @@ public: virtual void reset() = 0; virtual void suspend() = 0; virtual void resume() = 0; - virtual int bytesFree() const = 0; + virtual qsizetype bytesFree() const = 0; virtual int periodSize() const; - virtual void setBufferSize(int value) = 0; - virtual int bufferSize() const = 0; + virtual void setBufferSize(qsizetype value) = 0; + virtual qsizetype bufferSize() const = 0; virtual qint64 processedUSecs() const = 0; virtual QAudio::Error error() const = 0; virtual QAudio::State state() const = 0; @@ -106,10 +106,10 @@ public: virtual void reset() = 0; virtual void suspend() = 0; virtual void resume() = 0; - virtual int bytesReady() const = 0; + virtual qsizetype bytesReady() const = 0; virtual int periodSize() const; - virtual void setBufferSize(int value) = 0; - virtual int bufferSize() const = 0; + virtual void setBufferSize(qsizetype value) = 0; + virtual qsizetype bufferSize() const = 0; virtual qint64 processedUSecs() const = 0; virtual QAudio::Error error() const = 0; virtual QAudio::State state() const = 0; diff --git a/src/multimedia/platform/alsa/qalsaaudioinput_p.h b/src/multimedia/platform/alsa/qalsaaudioinput_p.h index bc749beca..9647807a3 100644 --- a/src/multimedia/platform/alsa/qalsaaudioinput_p.h +++ b/src/multimedia/platform/alsa/qalsaaudioinput_p.h @@ -109,10 +109,10 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesReady() const override; + qsizetype bytesReady() const override; int periodSize() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/platform/alsa/qalsaaudiooutput.cpp b/src/multimedia/platform/alsa/qalsaaudiooutput.cpp index 054e9118d..63b23e94b 100644 --- a/src/multimedia/platform/alsa/qalsaaudiooutput.cpp +++ b/src/multimedia/platform/alsa/qalsaaudiooutput.cpp @@ -478,7 +478,7 @@ void QAlsaAudioOutput::close() opened = false; } -int QAlsaAudioOutput::bytesFree() const +qsizetype QAlsaAudioOutput::bytesFree() const { if(resuming) return period_size; @@ -559,13 +559,13 @@ int QAlsaAudioOutput::periodSize() const return period_size; } -void QAlsaAudioOutput::setBufferSize(int value) +void QAlsaAudioOutput::setBufferSize(qsizetype value) { if(deviceState == QAudio::StoppedState) buffer_size = value; } -int QAlsaAudioOutput::bufferSize() const +qsizetype QAlsaAudioOutput::bufferSize() const { return buffer_size; } diff --git a/src/multimedia/platform/alsa/qalsaaudiooutput_p.h b/src/multimedia/platform/alsa/qalsaaudiooutput_p.h index 0a8e3187a..f79b903a8 100644 --- a/src/multimedia/platform/alsa/qalsaaudiooutput_p.h +++ b/src/multimedia/platform/alsa/qalsaaudiooutput_p.h @@ -83,10 +83,10 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesFree() const override; + qsizetype bytesFree() const override; int periodSize() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/platform/android/audio/qopenslesaudioinput.cpp b/src/multimedia/platform/android/audio/qopenslesaudioinput.cpp index f8b972b93..ffa0b7cdb 100644 --- a/src/multimedia/platform/android/audio/qopenslesaudioinput.cpp +++ b/src/multimedia/platform/android/audio/qopenslesaudioinput.cpp @@ -475,7 +475,7 @@ void QOpenSLESAudioInput::flushBuffers() } } -int QOpenSLESAudioInput::bytesReady() const +qsizetype QOpenSLESAudioInput::bytesReady() const { if (m_deviceState == QAudio::ActiveState || m_deviceState == QAudio::SuspendedState) return m_bufferIODevice ? m_bufferIODevice->bytesAvailable() : m_periodSize; @@ -483,12 +483,12 @@ int QOpenSLESAudioInput::bytesReady() const return 0; } -void QOpenSLESAudioInput::setBufferSize(int value) +void QOpenSLESAudioInput::setBufferSize(qsizetype value) { m_bufferSize = value; } -int QOpenSLESAudioInput::bufferSize() const +qsizetype QOpenSLESAudioInput::bufferSize() const { return m_bufferSize; } diff --git a/src/multimedia/platform/android/audio/qopenslesaudioinput_p.h b/src/multimedia/platform/android/audio/qopenslesaudioinput_p.h index 2f24772d3..4162ff84a 100644 --- a/src/multimedia/platform/android/audio/qopenslesaudioinput_p.h +++ b/src/multimedia/platform/android/audio/qopenslesaudioinput_p.h @@ -85,10 +85,10 @@ public: void reset(); void suspend(); void resume(); - int bytesReady() const; + qsizetype bytesReady() const; int periodSize() const; - void setBufferSize(int value); - int bufferSize() const; + void setBufferSize(qsizetype value); + qsizetype bufferSize() const; qint64 processedUSecs() const; QAudio::Error error() const; QAudio::State state() const; diff --git a/src/multimedia/platform/android/audio/qopenslesaudiooutput.cpp b/src/multimedia/platform/android/audio/qopenslesaudiooutput.cpp index dd9f38550..dc4eaa815 100644 --- a/src/multimedia/platform/android/audio/qopenslesaudiooutput.cpp +++ b/src/multimedia/platform/android/audio/qopenslesaudiooutput.cpp @@ -181,7 +181,7 @@ void QOpenSLESAudioOutput::stop() setError(QAudio::NoError); } -int QOpenSLESAudioOutput::bytesFree() const +qsizetype QOpenSLESAudioOutput::bytesFree() const { if (m_state != QAudio::ActiveState && m_state != QAudio::IdleState) return 0; @@ -194,7 +194,7 @@ int QOpenSLESAudioOutput::periodSize() const return m_periodSize; } -void QOpenSLESAudioOutput::setBufferSize(int value) +void QOpenSLESAudioOutput::setBufferSize(qsizetype value) { if (m_state != QAudio::StoppedState) return; @@ -203,7 +203,7 @@ void QOpenSLESAudioOutput::setBufferSize(int value) m_bufferSize = value; } -int QOpenSLESAudioOutput::bufferSize() const +qsizetype QOpenSLESAudioOutput::bufferSize() const { return m_bufferSize; } diff --git a/src/multimedia/platform/android/audio/qopenslesaudiooutput_p.h b/src/multimedia/platform/android/audio/qopenslesaudiooutput_p.h index 197115887..846313d6f 100644 --- a/src/multimedia/platform/android/audio/qopenslesaudiooutput_p.h +++ b/src/multimedia/platform/android/audio/qopenslesaudiooutput_p.h @@ -74,10 +74,10 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesFree() const override; + qsizetype bytesFree() const override; int periodSize() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm b/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm index 240786b4f..025304ae5 100644 --- a/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm +++ b/src/multimedia/platform/darwin/audio/qcoreaudioinput.mm @@ -796,7 +796,7 @@ void CoreAudioInput::resume() } -int CoreAudioInput::bytesReady() const +qsizetype CoreAudioInput::bytesReady() const { if (!m_audioBuffer) return 0; @@ -810,13 +810,13 @@ int CoreAudioInput::periodSize() const } -void CoreAudioInput::setBufferSize(int value) +void CoreAudioInput::setBufferSize(qsizetype value) { m_internalBufferSize = value; } -int CoreAudioInput::bufferSize() const +qsizetype CoreAudioInput::bufferSize() const { return m_internalBufferSize; } diff --git a/src/multimedia/platform/darwin/audio/qcoreaudioinput_p.h b/src/multimedia/platform/darwin/audio/qcoreaudioinput_p.h index a898b817b..df0fa29df 100644 --- a/src/multimedia/platform/darwin/audio/qcoreaudioinput_p.h +++ b/src/multimedia/platform/darwin/audio/qcoreaudioinput_p.h @@ -201,10 +201,10 @@ public: void reset(); void suspend(); void resume(); - int bytesReady() const; + qsizetype bytesReady() const; int periodSize() const; - void setBufferSize(int value); - int bufferSize() const; + void setBufferSize(qsizetype value); + qsizetype bufferSize() const; qint64 processedUSecs() const; QAudio::Error error() const; QAudio::State state() const; diff --git a/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm b/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm index 77594293e..d78ca66bf 100644 --- a/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm +++ b/src/multimedia/platform/darwin/audio/qcoreaudiooutput.mm @@ -358,7 +358,7 @@ void QCoreAudioOutput::resume() } } -int QCoreAudioOutput::bytesFree() const +qsizetype QCoreAudioOutput::bytesFree() const { return m_audioBuffer->available(); } @@ -368,13 +368,13 @@ int QCoreAudioOutput::periodSize() const return m_periodSizeBytes; } -void QCoreAudioOutput::setBufferSize(int value) +void QCoreAudioOutput::setBufferSize(qsizetype value) { if (m_stateCode == QAudio::StoppedState) m_internalBufferSize = value; } -int QCoreAudioOutput::bufferSize() const +qsizetype QCoreAudioOutput::bufferSize() const { return m_internalBufferSize; } diff --git a/src/multimedia/platform/darwin/audio/qcoreaudiooutput_p.h b/src/multimedia/platform/darwin/audio/qcoreaudiooutput_p.h index 107f30886..19e668fd9 100644 --- a/src/multimedia/platform/darwin/audio/qcoreaudiooutput_p.h +++ b/src/multimedia/platform/darwin/audio/qcoreaudiooutput_p.h @@ -134,10 +134,10 @@ public: void reset(); void suspend(); void resume(); - int bytesFree() const; + qsizetype bytesFree() const; int periodSize() const; - void setBufferSize(int value); - int bufferSize() const; + void setBufferSize(qsizetype value); + qsizetype bufferSize() const; qint64 processedUSecs() const; QAudio::Error error() const; QAudio::State state() const; diff --git a/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer.cpp index 93d6a87d3..46f2f8ae9 100644 --- a/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer.cpp +++ b/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer.cpp @@ -251,7 +251,7 @@ gboolean QGStreamerAudioInput::busMessage(GstBus *, GstMessage *msg, gpointer us return false; } -int QGStreamerAudioInput::bytesReady() const +qsizetype QGStreamerAudioInput::bytesReady() const { return m_buffer.size(); } @@ -280,12 +280,12 @@ qreal QGStreamerAudioInput::volume() const return m_volume; } -void QGStreamerAudioInput::setBufferSize(int value) +void QGStreamerAudioInput::setBufferSize(qsizetype value) { m_bufferSize = value; } -int QGStreamerAudioInput::bufferSize() const +qsizetype QGStreamerAudioInput::bufferSize() const { return m_bufferSize; } diff --git a/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer_p.h b/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer_p.h index eecf92a82..30d5c8dff 100644 --- a/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer_p.h +++ b/src/multimedia/platform/gstreamer/audio/qaudioinput_gstreamer_p.h @@ -85,9 +85,9 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesReady() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + qsizetype bytesReady() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer.cpp index 816ddc604..5751c0f90 100644 --- a/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer.cpp +++ b/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer.cpp @@ -272,7 +272,7 @@ void QGStreamerAudioOutput::stop() setState(QAudio::StoppedState); } -int QGStreamerAudioOutput::bytesFree() const +qsizetype QGStreamerAudioOutput::bytesFree() const { if (m_deviceState != QAudio::ActiveState && m_deviceState != QAudio::IdleState) return 0; @@ -286,14 +286,14 @@ int QGStreamerAudioOutput::periodSize() const return qMin(4096, 5*m_format.sampleRate()/1000*m_format.bytesPerFrame()); } -void QGStreamerAudioOutput::setBufferSize(int value) +void QGStreamerAudioOutput::setBufferSize(qsizetype value) { m_bufferSize = value; if (!gstAppSrc.isNull()) gst_app_src_set_max_bytes(GST_APP_SRC(gstAppSrc.element()), value); } -int QGStreamerAudioOutput::bufferSize() const +qsizetype QGStreamerAudioOutput::bufferSize() const { return m_bufferSize; } diff --git a/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer_p.h b/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer_p.h index 532792c1c..c5fa9a49d 100644 --- a/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer_p.h +++ b/src/multimedia/platform/gstreamer/audio/qaudiooutput_gstreamer_p.h @@ -87,10 +87,10 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesFree() const override; + qsizetype bytesFree() const override; int periodSize() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/platform/pulseaudio/qaudioinput_pulse.cpp b/src/multimedia/platform/pulseaudio/qaudioinput_pulse.cpp index fc913e6d2..06cd67b70 100644 --- a/src/multimedia/platform/pulseaudio/qaudioinput_pulse.cpp +++ b/src/multimedia/platform/pulseaudio/qaudioinput_pulse.cpp @@ -392,7 +392,7 @@ int QPulseAudioInput::checkBytesReady() return m_bytesAvailable; } -int QPulseAudioInput::bytesReady() const +qsizetype QPulseAudioInput::bytesReady() const { return qMax(m_bytesAvailable, 0); } @@ -534,12 +534,12 @@ qreal QPulseAudioInput::volume() const return m_volume; } -void QPulseAudioInput::setBufferSize(int value) +void QPulseAudioInput::setBufferSize(qsizetype value) { m_bufferSize = value; } -int QPulseAudioInput::bufferSize() const +qsizetype QPulseAudioInput::bufferSize() const { return m_bufferSize; } diff --git a/src/multimedia/platform/pulseaudio/qaudioinput_pulse_p.h b/src/multimedia/platform/pulseaudio/qaudioinput_pulse_p.h index d4b60eb94..ed6f62ee9 100644 --- a/src/multimedia/platform/pulseaudio/qaudioinput_pulse_p.h +++ b/src/multimedia/platform/pulseaudio/qaudioinput_pulse_p.h @@ -84,10 +84,10 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesReady() const override; + qsizetype bytesReady() const override; int periodSize() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/platform/pulseaudio/qaudiooutput_pulse.cpp b/src/multimedia/platform/pulseaudio/qaudiooutput_pulse.cpp index 5ce3da07b..ebfea9c77 100644 --- a/src/multimedia/platform/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/multimedia/platform/pulseaudio/qaudiooutput_pulse.cpp @@ -544,7 +544,7 @@ void QPulseAudioOutput::stop() setState(QAudio::StoppedState); } -int QPulseAudioOutput::bytesFree() const +qsizetype QPulseAudioOutput::bytesFree() const { if (m_deviceState != QAudio::ActiveState && m_deviceState != QAudio::IdleState) return 0; @@ -561,12 +561,12 @@ int QPulseAudioOutput::periodSize() const return m_periodSize; } -void QPulseAudioOutput::setBufferSize(int value) +void QPulseAudioOutput::setBufferSize(qsizetype value) { m_bufferSize = value; } -int QPulseAudioOutput::bufferSize() const +qsizetype QPulseAudioOutput::bufferSize() const { return m_bufferSize; } diff --git a/src/multimedia/platform/pulseaudio/qaudiooutput_pulse_p.h b/src/multimedia/platform/pulseaudio/qaudiooutput_pulse_p.h index 1d77178b0..9d73b60ab 100644 --- a/src/multimedia/platform/pulseaudio/qaudiooutput_pulse_p.h +++ b/src/multimedia/platform/pulseaudio/qaudiooutput_pulse_p.h @@ -81,10 +81,10 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesFree() const override; + qsizetype bytesFree() const override; int periodSize() const override; - void setBufferSize(int value) override; - int bufferSize() const override; + void setBufferSize(qsizetype value) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/platform/qnx/audio/qnxaudioinput.cpp b/src/multimedia/platform/qnx/audio/qnxaudioinput.cpp index 70245bcc3..da5bd3542 100644 --- a/src/multimedia/platform/qnx/audio/qnxaudioinput.cpp +++ b/src/multimedia/platform/qnx/audio/qnxaudioinput.cpp @@ -155,7 +155,7 @@ void QnxAudioInput::resume() } } -int QnxAudioInput::bytesReady() const +qsizetype QnxAudioInput::bytesReady() const { return qMax(m_bytesAvailable, 0); } @@ -165,12 +165,12 @@ int QnxAudioInput::periodSize() const return m_periodSize; } -void QnxAudioInput::setBufferSize(int bufferSize) +void QnxAudioInput::setBufferSize(qsizetype bufferSize) { m_bufferSize = bufferSize; } -int QnxAudioInput::bufferSize() const +qsizetype QnxAudioInput::bufferSize() const { return m_bufferSize; } diff --git a/src/multimedia/platform/qnx/audio/qnxaudioinput_p.h b/src/multimedia/platform/qnx/audio/qnxaudioinput_p.h index 99323d1f6..f648bb610 100644 --- a/src/multimedia/platform/qnx/audio/qnxaudioinput_p.h +++ b/src/multimedia/platform/qnx/audio/qnxaudioinput_p.h @@ -76,10 +76,10 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesReady() const override; + qsizetype bytesReady() const override; int periodSize() const override; - void setBufferSize(int ) override; - int bufferSize() const override; + void setBufferSize(qsizetype ) override; + qsizetype bufferSize() const override; qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/platform/qnx/audio/qnxaudiooutput.cpp b/src/multimedia/platform/qnx/audio/qnxaudiooutput.cpp index a56ce7c70..902ed6289 100644 --- a/src/multimedia/platform/qnx/audio/qnxaudiooutput.cpp +++ b/src/multimedia/platform/qnx/audio/qnxaudiooutput.cpp @@ -141,7 +141,7 @@ void QnxAudioOutput::resume() resumeInternal(); } -int QnxAudioOutput::bytesFree() const +qsizetype QnxAudioOutput::bytesFree() const { if (m_state != QAudio::ActiveState && m_state != QAudio::IdleState) return 0; diff --git a/src/multimedia/platform/qnx/audio/qnxaudiooutput_p.h b/src/multimedia/platform/qnx/audio/qnxaudiooutput_p.h index 38b590a79..db4439d6d 100644 --- a/src/multimedia/platform/qnx/audio/qnxaudiooutput_p.h +++ b/src/multimedia/platform/qnx/audio/qnxaudiooutput_p.h @@ -79,10 +79,10 @@ public: void reset() override; void suspend() override; void resume() override; - int bytesFree() const override; + qsizetype bytesFree() const override; int periodSize() const override; - void setBufferSize(int) override {} - int bufferSize() const override { return 0; } + void setBufferSize(qsizetype) override {} + qsizetype bufferSize() const override { return 0; } qint64 processedUSecs() const override; QAudio::Error error() const override; QAudio::State state() const override; diff --git a/src/multimedia/platform/windows/audio/qwindowsaudioinput.cpp b/src/multimedia/platform/windows/audio/qwindowsaudioinput.cpp index 173aec2da..65b8426fa 100644 --- a/src/multimedia/platform/windows/audio/qwindowsaudioinput.cpp +++ b/src/multimedia/platform/windows/audio/qwindowsaudioinput.cpp @@ -434,7 +434,7 @@ void QWindowsAudioInput::closeMixer() memset(&mixerLineControls, 0, sizeof(mixerLineControls)); } -int QWindowsAudioInput::bytesReady() const +qsizetype QWindowsAudioInput::bytesReady() const { if(period_size == 0 || buffer_size == 0) return 0; @@ -592,12 +592,12 @@ void QWindowsAudioInput::resume() } } -void QWindowsAudioInput::setBufferSize(int value) +void QWindowsAudioInput::setBufferSize(qsizetype value) { buffer_size = value; } -int QWindowsAudioInput::bufferSize() const +qsizetype QWindowsAudioInput::bufferSize() const { return buffer_size; } diff --git a/src/multimedia/platform/windows/audio/qwindowsaudioinput_p.h b/src/multimedia/platform/windows/audio/qwindowsaudioinput_p.h index 4e8ae0b93..1162fa605 100644 --- a/src/multimedia/platform/windows/audio/qwindowsaudioinput_p.h +++ b/src/multimedia/platform/windows/audio/qwindowsaudioinput_p.h @@ -95,10 +95,10 @@ public: void reset(); void suspend(); void resume(); - int bytesReady() const; + qsizetype bytesReady() const; int periodSize() const; - void setBufferSize(int value); - int bufferSize() const; + void setBufferSize(qsizetype value); + qsizetype bufferSize() const; qint64 processedUSecs() const; QAudio::Error error() const; QAudio::State state() const; diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiooutput.cpp b/src/multimedia/platform/windows/audio/qwindowsaudiooutput.cpp index b81be9667..04e94e4ce 100644 --- a/src/multimedia/platform/windows/audio/qwindowsaudiooutput.cpp +++ b/src/multimedia/platform/windows/audio/qwindowsaudiooutput.cpp @@ -324,7 +324,7 @@ void QWindowsAudioOutput::close() buffer_size = 0; } -int QWindowsAudioOutput::bytesFree() const +qsizetype QWindowsAudioOutput::bytesFree() const { int buf; buf = waveFreeBlockCount*period_size; @@ -337,13 +337,13 @@ int QWindowsAudioOutput::periodSize() const return period_size; } -void QWindowsAudioOutput::setBufferSize(int value) +void QWindowsAudioOutput::setBufferSize(qsizetype value) { if(deviceState == QAudio::StoppedState) buffer_size = value; } -int QWindowsAudioOutput::bufferSize() const +qsizetype QWindowsAudioOutput::bufferSize() const { return buffer_size; } diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiooutput_p.h b/src/multimedia/platform/windows/audio/qwindowsaudiooutput_p.h index 011a9686e..bfc37da58 100644 --- a/src/multimedia/platform/windows/audio/qwindowsaudiooutput_p.h +++ b/src/multimedia/platform/windows/audio/qwindowsaudiooutput_p.h @@ -93,10 +93,10 @@ public: void reset(); void suspend(); void resume(); - int bytesFree() const; + qsizetype bytesFree() const; int periodSize() const; - void setBufferSize(int value); - int bufferSize() const; + void setBufferSize(qsizetype value); + qsizetype bufferSize() const; qint64 processedUSecs() const; QAudio::Error error() const; QAudio::State state() const; |