diff options
-rw-r--r-- | src/3rdparty/phonon/mmf/abstractaudioeffect.h | 1 | ||||
-rw-r--r-- | src/3rdparty/phonon/mmf/effectfactory.cpp | 8 | ||||
-rw-r--r-- | src/plugins/phonon/mmf/plugin/plugin.pro | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractaudioeffect.h b/src/3rdparty/phonon/mmf/abstractaudioeffect.h index 9957e25..01542c9 100644 --- a/src/3rdparty/phonon/mmf/abstractaudioeffect.h +++ b/src/3rdparty/phonon/mmf/abstractaudioeffect.h @@ -76,7 +76,6 @@ public: EffectEnvironmentalReverb, EffectListenerOrientation, EffectLoudness, - //EffectRoomLevel, EffectSourceOrientation, EffectStereoWidening }; diff --git a/src/3rdparty/phonon/mmf/effectfactory.cpp b/src/3rdparty/phonon/mmf/effectfactory.cpp index 41f48d2..f33af68 100644 --- a/src/3rdparty/phonon/mmf/effectfactory.cpp +++ b/src/3rdparty/phonon/mmf/effectfactory.cpp @@ -26,7 +26,6 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include <ListenerOrientationBase.h> #include <LocationBase.h> #include <LoudnessBase.h> -#include <RoomLevelBase.h> #include <SourceOrientationBase.h> #include <StereoWideningBase.h> @@ -69,7 +68,6 @@ QHash<QByteArray, QVariant> EffectFactory::audioEffectDescriptions(AbstractAudio return constructEffectDescription(QObject::tr("Environmental Reverb"), "Environmental Reverb."); case AbstractAudioEffect::EffectLoudness: return constructEffectDescription(QObject::tr("Loudness"), "Loudness."); - //case EffectRoomLevel: case AbstractAudioEffect::EffectSourceOrientation: return constructEffectDescription(QObject::tr("Source Orientation"), "Source Orientation."); case AbstractAudioEffect::EffectStereoWidening: @@ -95,7 +93,6 @@ AbstractAudioEffect *EffectFactory::createAudioEffect(AbstractAudioEffect::Type case AbstractAudioEffect::EffectEnvironmentalReverb: case AbstractAudioEffect::EffectListenerOrientation: case AbstractAudioEffect::EffectLoudness: - //AbstractAudioEffect::EffectRoomLevel, case AbstractAudioEffect::EffectSourceOrientation: case AbstractAudioEffect::EffectStereoWidening: ; @@ -141,11 +138,6 @@ QList<int> EffectFactory::effectIndexes() if (isEffectSupported<CSourceOrientation>()) retval.append(AbstractAudioEffect::EffectSourceOrientation); - /* - if (isEffectSupported<CRoomLevel>()) - retval.append(EffectRoomLevel); - */ - if (isEffectSupported<CStereoWidening>()) retval.append(AbstractAudioEffect::EffectStereoWidening); diff --git a/src/plugins/phonon/mmf/plugin/plugin.pro b/src/plugins/phonon/mmf/plugin/plugin.pro index 9a9002f..0dd909d 100644 --- a/src/plugins/phonon/mmf/plugin/plugin.pro +++ b/src/plugins/phonon/mmf/plugin/plugin.pro @@ -73,7 +73,7 @@ LIBS += -lefsrv # For file server LIBS += -lapgrfx -lapmime # For recognizer # These are for effects. -LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lRoomLevelEffect -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect +LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect # This is needed for having the .qtplugin file properly created on Symbian. QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend |