Get rid of QAudioInput/Output::periodSize()

The periodSize() is badly defined and one does not really
need it in the public API. Get rid of it.

Change-Id: If95f040d386ac91620c8de4f907cd206b7dad16a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

6 files changed, 0 insertions, 49 deletions

diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp
index 5d6e64ae0..a51957cc8 100644
--- a/src/multimedia/audio/qaudioinput.cpp
+++ b/src/multimedia/audio/qaudioinput.cpp
@@ -294,17 +294,6 @@ qsizetype QAudioInput::bytesAvailable() const
 }
 
 /*!
-    Returns the period size in bytes.
-
-    Note: This is the recommended read size in bytes.
-*/
-
-int QAudioInput::periodSize() const
-{
-    return d->periodSize();
-}
-
-/*!
     Sets the input volume to \a volume.
 
     The volume is scaled linearly from \c 0.0 (silence) to \c 1.0 (full volume). Values outside this
diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h
index f346a8006..2ac1efcdf 100644
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudioinput.h
@@ -81,7 +81,6 @@ public:
     qsizetype bufferSize() const;
 
     qsizetype bytesAvailable() const;
-    int periodSize() const;
 
     void setVolume(qreal volume);
     qreal volume() const;
diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp
index 2d3639904..1e76457ab 100644
--- a/src/multimedia/audio/qaudiooutput.cpp
+++ b/src/multimedia/audio/qaudiooutput.cpp
@@ -245,18 +245,6 @@ qsizetype QAudioOutput::bytesFree() const
 }
 
 /*!
-    Returns the period size in bytes. This is the amount of data required each period
-    to prevent buffer underrun, and to ensure uninterrupted playback.
-
-    \note It is recommended to provide at least enough data for a full period with each
-    write operation.
-*/
-int QAudioOutput::periodSize() const
-{
-    return d->periodSize();
-}
-
-/*!
     Sets the audio buffer size to \a value in bytes.
 
     \note This function can be called anytime before start().  Calls to this
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h
index e5d47c7bf..fa930b9a6 100644
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -81,7 +81,6 @@ public:
     qsizetype bufferSize() const;
 
     qsizetype bytesFree() const;
-    int periodSize() const;
 
     qint64 processedUSecs() const;
     qint64 elapsedUSecs() const;
diff --git a/src/multimedia/audio/qaudiosystem.cpp b/src/multimedia/audio/qaudiosystem.cpp
index f9c5e41f0..2f4a92b2c 100644
--- a/src/multimedia/audio/qaudiosystem.cpp
+++ b/src/multimedia/audio/qaudiosystem.cpp
@@ -159,17 +159,6 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn virtual int QAbstractAudioOutput::periodSize() const
-    Returns the period size in bytes.
-*/
-int QAbstractAudioOutput::periodSize() const
-{
-    auto f = format();
-    Q_ASSERT(!f.isValid() || f.bytesForDuration(5000) > 0);
-    return f.bytesForDuration(5000);
-}
-
-/*!
     \fn virtual void QAbstractAudioOutput::setBufferSize(qsizetype value)
     Sets the audio buffer size to \a value in bytes.
 */
@@ -285,17 +274,6 @@ void QAbstractAudioOutput::setRole(QAudio::Role role)
 */
 
 /*!
-    \fn virtual int QAbstractAudioInput::periodSize() const
-    Returns the period size in bytes.
-*/
-int QAbstractAudioInput::periodSize() const
-{
-    auto f = format();
-    Q_ASSERT(!f.isValid() || f.bytesForDuration(5000) > 0);
-    return f.bytesForDuration(5000);
-}
-
-/*!
     \fn virtual void QAbstractAudioInput::setBufferSize(qsizetype value)
     Sets the audio buffer size to \a value in milliseconds.
 */
diff --git a/src/multimedia/audio/qaudiosystem_p.h b/src/multimedia/audio/qaudiosystem_p.h
index 7f77484a6..da8840dee 100644
--- a/src/multimedia/audio/qaudiosystem_p.h
+++ b/src/multimedia/audio/qaudiosystem_p.h
@@ -75,7 +75,6 @@ public:
     virtual void suspend() = 0;
     virtual void resume() = 0;
     virtual qsizetype bytesFree() const = 0;
-    virtual int periodSize() const;
     virtual void setBufferSize(qsizetype value) = 0;
     virtual qsizetype bufferSize() const = 0;
     virtual qint64 processedUSecs() const = 0;
@@ -109,7 +108,6 @@ public:
     virtual void suspend()  = 0;
     virtual void resume() = 0;
     virtual qsizetype bytesReady() const = 0;
-    virtual int periodSize() const;
     virtual void setBufferSize(qsizetype value) = 0;
     virtual qsizetype bufferSize() const = 0;
     virtual qint64 processedUSecs() const = 0;