diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-01-12 13:31:15 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-01-12 13:31:15 (GMT) |
| commit | 1b62c32319feb673a65ea9f2d3e6e7056ffa9787 (patch) | |
| tree | ee232642d4f444b820570ca7855702b03fcc4f43 /src/3rdparty/phonon/mmf/backend.cpp | |
| parent | 008bae01b016926209dddacc6e31c79b9d99d4f7 (diff) | |
| parent | 24392fb62bb34a80eb7ce13662b0a8744c9ab415 (diff) | |
| download | Qt-1b62c32319feb673a65ea9f2d3e6e7056ffa9787.zip Qt-1b62c32319feb673a65ea9f2d3e6e7056ffa9787.tar.gz Qt-1b62c32319feb673a65ea9f2d3e6e7056ffa9787.tar.bz2 | |
Merge commit 'origin/mmfphonon' into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/backend.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/backend.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/3rdparty/phonon/mmf/backend.cpp b/src/3rdparty/phonon/mmf/backend.cpp index 0c07f66..3568a49 100644 --- a/src/3rdparty/phonon/mmf/backend.cpp +++ b/src/3rdparty/phonon/mmf/backend.cpp @@ -45,6 +45,7 @@ using namespace Phonon::MMF; Backend::Backend(QObject *parent) : QObject(parent) , m_ancestorMoveMonitor(new AncestorMoveMonitor(this)) + , m_effectFactory(new EffectFactory(this)) { TRACE_CONTEXT(Backend::Backend, EBackend); TRACE_ENTRY_0(); @@ -81,9 +82,9 @@ QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const { Q_ASSERT(args.count() == 1); Q_ASSERT(args.first().type() == QVariant::Int); - const AbstractAudioEffect::Type effect = AbstractAudioEffect::Type(args.first().toInt()); - - return EffectFactory::createAudioEffect(effect, parent); + const EffectFactory::Type type = + static_cast<EffectFactory::Type>(args.first().toInt()); + return m_effectFactory->createAudioEffect(type, parent); } case VideoWidgetClass: result = new VideoWidget(m_ancestorMoveMonitor.data(), qobject_cast<QWidget *>(parent)); @@ -105,7 +106,7 @@ QList<int> Backend::objectDescriptionIndexes(ObjectDescriptionType type) const switch(type) { case EffectType: - retval.append(EffectFactory::effectIndexes()); + retval.append(m_effectFactory->effectIndexes()); break; case AudioOutputDeviceType: // We only have one possible output device, but we need at least @@ -126,7 +127,7 @@ QHash<QByteArray, QVariant> Backend::objectDescriptionProperties(ObjectDescripti switch (type) { case EffectType: - return EffectFactory::audioEffectDescriptions(AbstractAudioEffect::Type(index)); + return m_effectFactory->audioEffectDescriptions(EffectFactory::Type(index)); case AudioOutputDeviceType: return AudioOutput::audioOutputDescription(index); default: |