MCL/sf/mw/qt: comparison src/multimedia/audio/qaudiooutput.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 start() with a QIODevice. QAudioOutput will then fetch the data it
 needs from the io device. So playing back an audio file is as
 simple as:
 \code
-QFile inputFile;
+QFile inputFile;     // class member.
+QAudioOutput* audio; // class member.
+\endcode
+\code
 inputFile.setFileName("/tmp/test.raw");
 inputFile.open(QIODevice::ReadOnly);
 QAudioFormat format;
 // Set up the format, eg.
 format.setSampleSize(8);
 format.setCodec("audio/pcm");
 format.setByteOrder(QAudioFormat::LittleEndian);
 format.setSampleType(QAudioFormat::UnSignedInt);
-QAudioOutput *audio = new QAudioOutput(format, this);
+QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
+if (!info.isFormatSupported(format)) {
+qWarning()<<"raw audio format not supported by backend, cannot play audio.";
+return;
+}
+audio = new QAudioOutput(format, this);
 connect(audio,SIGNAL(stateChanged(QAudio::State)),SLOT(finishedPlaying(QAudio::State)));
 audio->start(inputFile);
 \endcode
 void finishedPlaying(QAudio::State state)
 {
 if(state == QAudio::IdleState) {
 audio->stop();
 inputFile.close();
+delete audio;
 }
 }
 \endcode
 At any given time, the QAudioOutput will be in one of four states:
 relative to the position in the stream, i.e., if the QAudioOutput
 is in the SuspendedState or the IdleState, the notify() signal is
 not emitted. A typical use-case would be to update a
 \l{QSlider}{slider} that allows seeking in the stream.
 If you want the time since playback started regardless of which
-states the audio output has been in, clock() is the function for you.
+states the audio output has been in, elapsedUSecs() is the function for you.
 If an error occurs, you can fetch the \l{QAudio::Error}{error
 type} with the error() function. Please see the QAudio::Error enum
 for a description of the possible errors that are reported.  When
-an error is encountered, the state changes to QAudio::StopState.
+an error is encountered, the state changes to QAudio::StoppedState.
 You can check for errors by connecting to the stateChanged()
 signal:
 \snippet doc/src/snippets/audio/main.cpp 3
 return d->format();
 }
 /*!
 Uses the \a device as the QIODevice to transfer data.
-If \a device is null then the class creates an internal QIODevice.
-Returns a pointer to the QIODevice being used to handle the data
-transfer. This QIODevice can be used to write() 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* QAudioOutput::start(QIODevice* device)
+void QAudioOutput::start(QIODevice* device)
 {
 /*
-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 output.
--If ok, NoError and ActiveState, else OpenError and StopState
+-If ok, NoError and ActiveState, else OpenError and StoppedState
 -emit stateChanged()
--return device
+*/
+d->start(device);
-PUSH MODE (device = 0)
+}
--If currently not StopState, stop.
+/*!
+Returns a pointer to the QIODevice being used to handle the data
+transfer. This QIODevice can be used to write() audio data directly.
+\sa QIODevice
+*/
+QIODevice* QAudioOutput::start()
+{
+/*
+-If currently not StoppedState, stop.
 -If no internal QIODevice, create one.
 -open audio output.
--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);
 }
 /*!
 Stops the audio output.
 */
 void QAudioOutput::stop()
 {
 /*
--If StopState, return
+-If StoppedState, return
--set to StopState
+-set to StoppedState
 -detach from audio device
 -emit stateChanged()
 */
 d->stop();
 }
 void QAudioOutput::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 QAudioOutput::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 QAudioOutput::totalTime() const
+qint64 QAudioOutput::processedUSecs() const
 {
-return d->totalTime();
+return d->processedUSecs();
 }
 /*!
 Returns the microseconds since start() was called, including time in Idle and
 Suspend states.
 */
-qint64 QAudioOutput::clock() const
+qint64 QAudioOutput::elapsedUSecs() const
 {
-return d->clock();
+return d->elapsedUSecs();
 }
 /*!
 Returns the error state.
 */

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7