slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added QAudioDecoderControl::sourceChanged signal.

Browse Source 
The signal is mentioned in QAudioDecoder but is missing from
QAudioDecoderControl.

Change-Id: I0cd13c53541585098edd02093858501ffb5af1fb
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Lev Zelenskiy
2012-02-16 16:46:21 +10:00
committed by Qt by Nokia
parent 696e434129
commit 4c07c6330d
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/multimedia/audio/qaudiodecoder_p.cpp
View File

@@ -149,6 +149,7 @@ QAudioDecoder::QAudioDecoder(QObject *parent)
connect(d->control, SIGNAL(error(int,QString)), SLOT(_q_error(int,QString))); connect(d->control, SIGNAL(error(int,QString)), SLOT(_q_error(int,QString)));
connect(d->control, SIGNAL(formatChanged(QAudioFormat)), SIGNAL(formatChanged(QAudioFormat))); connect(d->control, SIGNAL(formatChanged(QAudioFormat)), SIGNAL(formatChanged(QAudioFormat)));
connect(d->control, SIGNAL(sourceChanged()), SIGNAL(sourceChanged()));
connect(d->control, SIGNAL(bufferReady()), this, SIGNAL(bufferReady())); connect(d->control, SIGNAL(bufferReady()), this, SIGNAL(bufferReady()));
connect(d->control ,SIGNAL(bufferAvailableChanged(bool)), this, SIGNAL(bufferAvailableChanged(bool))); connect(d->control ,SIGNAL(bufferAvailableChanged(bool)), this, SIGNAL(bufferAvailableChanged(bool)));
} }

8
src/multimedia/controls/qaudiodecodercontrol_p.cpp
View File

@@ -173,6 +173,14 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent):
Signals that a new buffer is ready for reading. Signals that a new buffer is ready for reading.
*/ */
/*!
\fn QAudioDecoderControl::sourceChanged()
Signals that the current source of the decoder has changed.
\sa sourceFilename(), sourceDevice()
*/
/*! /*!
\fn QAudioDecoderControl::formatChanged(const QAudioFormat &format) \fn QAudioDecoderControl::formatChanged(const QAudioFormat &format)

1
src/multimedia/controls/qaudiodecodercontrol_p.h
View File

@@ -83,6 +83,7 @@ public:
Q_SIGNALS: Q_SIGNALS:
void stateChanged(QAudioDecoder::State newState); void stateChanged(QAudioDecoder::State newState);
void formatChanged(const QAudioFormat &format); void formatChanged(const QAudioFormat &format);
void sourceChanged();
void error(int error, const QString &errorString); void error(int error, const QString &errorString);