Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Added absolute path to sqlite3.sis in s60installs.pro
  Added changelog entries.
  Added enable/disable parameter to each effect in Phonon MMF backend
  Simplified error handling for audio effects
  Implemented stereo widening effect in Phonon MMF backend
  Implemented reverb effect in Phonon MMF backend
  Implemented loudness effect in Phonon MMF backend
  Implemented bass boost in Phonon MMF backend
  Refactored AbstractAudioEffect to reduce redundancy in derived classes
  Removed unnecessary check in Phonon MMF backend
  Added a macro to reduce boilerplate code in Phonon MMF backend
  Removed dependency of EffectFactory on native effect headers
  Delayed creation of audio effect object until audio is initialized
  Modified effect parameter handling to improve user experience
  Added comments to clarify usage of Phonon::EffectParameter API
  Shortened description of audio equalizer bands
  Implemented audio effects capability querying in Phonon MMF backend
  Corrected parameter name ordering in internal Phonon MMF function signatures
  Fixed typo in Phonon::EffectWidget implementation

1 files changed, 58 insertions, 0 deletions

diff --git a/src/3rdparty/phonon/mmf/loudness.cpp b/src/3rdparty/phonon/mmf/loudness.cpp
new file mode 100644
index 0000000..1079a35
--- /dev/null
+++ b/src/3rdparty/phonon/mmf/loudness.cpp
@@ -0,0 +1,58 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <LoudnessBase.h>
+#include "loudness.h"
+
+QT_BEGIN_NAMESPACE
+
+using namespace Phonon;
+using namespace Phonon::MMF;
+
+// Define functions which depend on concrete native effect class name
+PHONON_MMF_DEFINE_EFFECT_FUNCTIONS(Loudness)
+
+/*! \class MMF::Loudness
+  \internal
+*/
+
+Loudness::Loudness(QObject *parent, const QList<EffectParameter>& parameters)
+    :   AbstractAudioEffect::AbstractAudioEffect(parent, parameters)
+{
+
+}
+
+//-----------------------------------------------------------------------------
+// Static functions
+//-----------------------------------------------------------------------------
+
+const char* Loudness::description()
+{
+    return "Loudness";
+}
+
+bool Loudness::getParameters(CMdaAudioOutputStream *stream,
+    QList<EffectParameter> &parameters)
+{
+    QScopedPointer<CLoudness> effect;
+    TRAPD(err, effect.reset(CLoudness::NewL(*stream)));
+    return (KErrNone == err);
+}
+
+QT_END_NAMESPACE
+