diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-09 09:20:32 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-29 16:00:08 (GMT) |
| commit | 5c4ed2858f31d6b3adcf5200c3a64fbf188a3f4d (patch) | |
| tree | 4a60b2f3cb76eef204803ab80818521959ede939 /src | |
| parent | 7a6296197cdab656053fbf1fc2584707e78cbe54 (diff) | |
| download | Qt-5c4ed2858f31d6b3adcf5200c3a64fbf188a3f4d.zip Qt-5c4ed2858f31d6b3adcf5200c3a64fbf188a3f4d.tar.gz Qt-5c4ed2858f31d6b3adcf5200c3a64fbf188a3f4d.tar.bz2 | |
Fix QFeature QT_NO_PHONON_VOLUMEFADEREFFECT
Reviewed-by: Jens Bache-Wiig
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/backend.cpp | 4 | ||||
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/volumefadereffect.cpp | 4 | ||||
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/volumefadereffect.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/gstreamer/backend.cpp b/src/3rdparty/phonon/gstreamer/backend.cpp index cd49454..ceaf94a 100644 --- a/src/3rdparty/phonon/gstreamer/backend.cpp +++ b/src/3rdparty/phonon/gstreamer/backend.cpp @@ -134,7 +134,11 @@ QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const } case VolumeFaderEffectClass: +#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT return new VolumeFaderEffect(this, parent); +#else + return 0; +#endif //QT_NO_PHONON_VOLUMEFADEREFFECT case VisualizationClass: //Fall through default: diff --git a/src/3rdparty/phonon/gstreamer/volumefadereffect.cpp b/src/3rdparty/phonon/gstreamer/volumefadereffect.cpp index d7ee11b..bf0d646 100644 --- a/src/3rdparty/phonon/gstreamer/volumefadereffect.cpp +++ b/src/3rdparty/phonon/gstreamer/volumefadereffect.cpp @@ -21,11 +21,11 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT namespace Phonon { namespace Gstreamer { - VolumeFaderEffect::VolumeFaderEffect(Backend *backend, QObject *parent) : Effect(backend, parent, AudioSource | AudioSink) , m_fadeCurve(Phonon::VolumeFaderEffect::Fade3Decibel) @@ -156,7 +156,7 @@ bool VolumeFaderEffect::event(QEvent *event) } }} //namespace Phonon::Gstreamer - +#endif //QT_NO_PHONON_VOLUMEFADEREFFECT QT_END_NAMESPACE #include "moc_volumefadereffect.cpp" diff --git a/src/3rdparty/phonon/gstreamer/volumefadereffect.h b/src/3rdparty/phonon/gstreamer/volumefadereffect.h index d74014c..748d2d6 100644 --- a/src/3rdparty/phonon/gstreamer/volumefadereffect.h +++ b/src/3rdparty/phonon/gstreamer/volumefadereffect.h @@ -30,7 +30,7 @@ #include <gst/gst.h> QT_BEGIN_NAMESPACE - +#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT namespace Phonon { namespace Gstreamer @@ -64,7 +64,7 @@ namespace Gstreamer QTime m_fadeStartTime; }; }} //namespace Phonon::Gstreamer - +#endif //QT_NO_PHONON_VOLUMEFADEREFFECT QT_END_NAMESPACE #endif // Phonon_GSTREAMER_VOLUMEFADEREFFECT_H |