FCL/sf/mw/qt: comparison src/multimedia/audio/qaudioinput.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 #include <QtMultimedia/qaudioengine.h>
 #include <QtMultimedia/qaudioinput.h>
 #include "qaudiodevicefactory_p.h"
 QT_BEGIN_NAMESPACE
 /*!
 \class QAudioInput
 \brief The QAudioInput class provides an interface for receiving audio data from an audio input device.
 Starting up the QAudioInput is simply a matter of calling start()
 with a QIODevice opened for writing. For instance, to record to a
 file, you can:
 \code
+QFile outputFile;   // class member.
+QAudioInput* audio; // class member.
+\endcode
+\code
 {
-QFile outputFile;
 outputFile.setFileName("/tmp/test.raw");
 outputFile.open( QIODevice::WriteOnly | QIODevice::Truncate );
 QAudioFormat format;
 // set up the format you want, eg.
 format.setSampleSize(8);
 format.setCodec("audio/pcm");
 format.setByteOrder(QAudioFormat::LittleEndian);
 format.setSampleType(QAudioFormat::UnSignedInt);
-QAudioInput *audio = new QAudioInput(format, this);
+if (QAudioDeviceInfo info(QAudioDeviceInfo::defaultInputDevice());
+if (!info.isFormatSupported(format)) {
+qWarning()<<"default format not supported try to use nearest";
+format = info.nearestFormat(format);
+}
+audio = new QAudioInput(format, this);
 QTimer::singleShot(3000, this, SLOT(stopRecording()));
 audio->start(outputFile);
 // Records audio for 3000ms
 }
 \endcode
 \code
 void stopRecording()
 {
 audio->stop();
 outputFile->close();
+delete audio;
 }
 \endcode
 At any point in time, QAudioInput will be in one of four states:
 active, suspended, stopped, or idle. These states are specified by
 suspend(), resume(), stop(), reset(), and start(). The current
 state is reported by state(). QAudioOutput will also signal you
 when the state changes (stateChanged()).
 QAudioInput provides several ways of measuring the time that has
-passed since the start() of the recording. The \c totalTime()
+passed since the start() of the recording. The \c processedUSecs()
 function returns the length of the stream in microseconds written,
 i.e., it leaves out the times the audio input was suspended or idle.
-The clock() function returns the time elapsed since start() was called regardless of
+The elapsedUSecs() function returns the time elapsed since start() was called regardless of
 which states the QAudioInput has been in.
 If an error should occur, you can fetch its reason with error().
 The possible error reasons are described by the QAudio::Error
-enum. The QAudioInput will enter the \l{QAudio::}{StopState} when
+enum. The QAudioInput will enter the \l{QAudio::}{StoppedState} when
 an error is encountered.  Connect to the stateChanged() signal to
 handle the error:
 \snippet doc/src/snippets/audio/main.cpp 0
 {
 delete d;
 }
 /*!
 Uses the \a device as the QIODevice to transfer data.
-If \a device is null then the class creates an internal QIODevice.
+Passing a QIODevice allows the data to be transfered without any extra code.
+All that is required is to open the QIODevice.
+\sa QIODevice
+*/
+void QAudioInput::start(QIODevice* device)
+{
+/*
+-If currently not StoppedState, stop
+-If previous start was push mode, delete internal QIODevice.
+-open audio input.
+If ok, NoError and ActiveState, else OpenError and StoppedState.
+-emit stateChanged()
+*/
+d->start(device);
+}
+/*!
 Returns a pointer to the QIODevice being used to handle the data
 transfer. This QIODevice can be used to read() audio data
 directly.
-Passing a QIODevice allows the data to be transfered without any extra code.
-All that is required is to open the QIODevice.
 \sa QIODevice
 */
-QIODevice* QAudioInput::start(QIODevice* device)
+QIODevice* QAudioInput::start()
 {
 /*
-PULL MODE (valid QIODevice)
+-If currently not StoppedState, stop
--If currently not StopState, stop
--If previous start was push mode, delete internal QIODevice.
--open audio input.
-If ok, NoError and ActiveState, else OpenError and StopState.
--emit stateChanged()
--return device
-PUSH MODE (device = 0)
--If currently not StopState, stop
 -If no internal QIODevice, create one.
 -open audio input.
--If ok, NoError and IdleState, else OpenError and StopState
+-If ok, NoError and IdleState, else OpenError and StoppedState
 -emit stateChanged()
 -return internal QIODevice
 */
-return d->start(device);
+return d->start(0);
 }
 /*!
 Returns the QAudioFormat being used.
 */
 */
 void QAudioInput::stop()
 {
 /*
--If StopState, return
+-If StoppedState, return
--set to StopState
+-set to StoppedState
 -detach from audio device
 -emit stateChanged()
 */
 d->stop();
 }
 void QAudioInput::suspend()
 {
 /*
 -If not ActiveState|IdleState, return
 -stop processing audio, saving all buffered audio data
--set NoError and SuspendState
+-set NoError and SuspendedState
 -emit stateChanged()
 */
 d->suspend();
 }
 */
 void QAudioInput::resume()
 {
 /*
--If SuspendState, return
+-If SuspendedState, return
 -resume audio
 -(PULL MODE): set ActiveState, NoError
 -(PUSH MODE): set IdleState, NoError
 -kick start audio if needed
 -emit stateChanged()
 /*!
 Returns the amount of audio data processed since start()
 was called in microseconds.
 */
-qint64 QAudioInput::totalTime() const
+qint64 QAudioInput::processedUSecs() const
 {
-return d->totalTime();
+return d->processedUSecs();
 }
 /*!
 Returns the microseconds since start() was called, including time in Idle and
 Suspend states.
 */
-qint64 QAudioInput::clock() const
+qint64 QAudioInput::elapsedUSecs() const
 {
-return d->clock();
+return d->elapsedUSecs();
 }
 /*!
 Returns the error state.
 */

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7
child 7	f7bc934e204c
child 18	2f34d5167611