diff options
author | Lev Zelenskiy <lev.zelenskiy@nokia.com> | 2012-02-16 16:46:21 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 07:27:51 +0100 |
commit | 4c07c6330dbce356c4e7ad33cf1bfcf2a9aa07c7 (patch) | |
tree | b06198cc91ab591d69dd941d5143e3660e5acd80 | |
parent | 696e434129c23fddb786e101c9efc7ede1f2943b (diff) |
Added QAudioDecoderControl::sourceChanged signal.
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>
-rw-r--r-- | src/multimedia/audio/qaudiodecoder_p.cpp | 1 | ||||
-rw-r--r-- | src/multimedia/controls/qaudiodecodercontrol_p.cpp | 8 | ||||
-rw-r--r-- | src/multimedia/controls/qaudiodecodercontrol_p.h | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/multimedia/audio/qaudiodecoder_p.cpp b/src/multimedia/audio/qaudiodecoder_p.cpp index fea933774..ac0450227 100644 --- a/src/multimedia/audio/qaudiodecoder_p.cpp +++ b/src/multimedia/audio/qaudiodecoder_p.cpp @@ -149,6 +149,7 @@ QAudioDecoder::QAudioDecoder(QObject *parent) 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(sourceChanged()), SIGNAL(sourceChanged())); connect(d->control, SIGNAL(bufferReady()), this, SIGNAL(bufferReady())); connect(d->control ,SIGNAL(bufferAvailableChanged(bool)), this, SIGNAL(bufferAvailableChanged(bool))); } diff --git a/src/multimedia/controls/qaudiodecodercontrol_p.cpp b/src/multimedia/controls/qaudiodecodercontrol_p.cpp index 204445614..3569e022d 100644 --- a/src/multimedia/controls/qaudiodecodercontrol_p.cpp +++ b/src/multimedia/controls/qaudiodecodercontrol_p.cpp @@ -174,6 +174,14 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent): */ /*! + \fn QAudioDecoderControl::sourceChanged() + + Signals that the current source of the decoder has changed. + + \sa sourceFilename(), sourceDevice() +*/ + +/*! \fn QAudioDecoderControl::formatChanged(const QAudioFormat &format) Signals that the current audio format of the decoder has changed to \a format. diff --git a/src/multimedia/controls/qaudiodecodercontrol_p.h b/src/multimedia/controls/qaudiodecodercontrol_p.h index 1130661cd..ed5b321f7 100644 --- a/src/multimedia/controls/qaudiodecodercontrol_p.h +++ b/src/multimedia/controls/qaudiodecodercontrol_p.h @@ -83,6 +83,7 @@ public: Q_SIGNALS: void stateChanged(QAudioDecoder::State newState); void formatChanged(const QAudioFormat &format); + void sourceChanged(); void error(int error, const QString &errorString); |