From 4c07c6330dbce356c4e7ad33cf1bfcf2a9aa07c7 Mon Sep 17 00:00:00 2001 From: Lev Zelenskiy Date: Thu, 16 Feb 2012 16:46:21 +1000 Subject: Added QAudioDecoderControl::sourceChanged signal. The signal is mentioned in QAudioDecoder but is missing from QAudioDecoderControl. Change-Id: I0cd13c53541585098edd02093858501ffb5af1fb Reviewed-by: Ling Hu Reviewed-by: Michael Goddard Reviewed-by: Dmytro Poplavskiy --- src/multimedia/audio/qaudiodecoder_p.cpp | 1 + src/multimedia/controls/qaudiodecodercontrol_p.cpp | 8 ++++++++ src/multimedia/controls/qaudiodecodercontrol_p.h | 1 + 3 files changed, 10 insertions(+) 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 @@ -173,6 +173,14 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent): 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) 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); -- cgit v1.2.3