diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-12-04 11:49:12 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2009-12-08 13:07:39 (GMT) |
| commit | 3f648dc075689e2ffedda2769cc76b4a56fb1073 (patch) | |
| tree | e216758e5d86e14c7d3d8630796e11f355b4add4 /src/3rdparty/phonon/mmf/audiooutput.cpp | |
| parent | 8e21fc62fe40c8e393007516958c216ad8dbd629 (diff) | |
| download | Qt-3f648dc075689e2ffedda2769cc76b4a56fb1073.zip Qt-3f648dc075689e2ffedda2769cc76b4a56fb1073.tar.gz Qt-3f648dc075689e2ffedda2769cc76b4a56fb1073.tar.bz2 | |
Implemented node disconnection in Phonon MMF backend
Task-number: QTBUG-4663
Reviewed-by: Frans Englich
Diffstat (limited to 'src/3rdparty/phonon/mmf/audiooutput.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/audiooutput.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/mmf/audiooutput.cpp b/src/3rdparty/phonon/mmf/audiooutput.cpp index d6e0c13..c6be20b 100644 --- a/src/3rdparty/phonon/mmf/audiooutput.cpp +++ b/src/3rdparty/phonon/mmf/audiooutput.cpp @@ -81,13 +81,18 @@ bool MMF::AudioOutput::setOutputDevice(int index) return true; } -bool MMF::AudioOutput::activateOnMediaObject(MediaObject *mo) +void MMF::AudioOutput::connectMediaObject(MediaObject *mediaObject) { // Ensure that the MediaObject has the correct initial volume - mo->volumeChanged(m_volume); + mediaObject->volumeChanged(m_volume); // Connect MediaObject to receive future volume changes - connect(this, SIGNAL(volumeChanged(qreal)), mo, SLOT(volumeChanged(qreal))); - return true; + connect(this, SIGNAL(volumeChanged(qreal)), mediaObject, SLOT(volumeChanged(qreal))); +} + +void MMF::AudioOutput::disconnectMediaObject(MediaObject *mediaObject) +{ + // Disconnect all signal-slot connections + disconnect(this, 0, mediaObject, 0); } QHash<QByteArray, QVariant> MMF::AudioOutput::audioOutputDescription(int index) |