diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 04:54:49 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 05:43:42 (GMT) |
| commit | 77f722aca2c5243f07733dcb302035fb3c454f3a (patch) | |
| tree | bbd4c77369a59d8b8a715230ca43126a2660472c /src/multimedia | |
| parent | e9f3edcb0a0223b90606108993999ad3cb37af9f (diff) | |
| download | Qt-77f722aca2c5243f07733dcb302035fb3c454f3a.zip Qt-77f722aca2c5243f07733dcb302035fb3c454f3a.tar.gz Qt-77f722aca2c5243f07733dcb302035fb3c454f3a.tar.bz2 | |
Qt namespace fixes.
Reviewed-by: Dmytro Poplavskiy
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/qml/qsoundeffect_pulse_p.cpp | 5 | ||||
| -rw-r--r-- | src/multimedia/qml/qsoundeffect_qmedia_p.cpp | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.cpp b/src/multimedia/qml/qsoundeffect_pulse_p.cpp index ec851aa..7e9a25c 100644 --- a/src/multimedia/qml/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/qml/qsoundeffect_pulse_p.cpp @@ -72,6 +72,8 @@ // Less than ideal #define PA_SCACHE_ENTRY_SIZE_MAX (1024*1024*16) +QT_BEGIN_NAMESPACE + namespace { inline pa_sample_spec audioFormatToSampleSpec(const QAudioFormat &format) @@ -502,3 +504,6 @@ void QSoundEffectPrivate::play_callback(pa_context *c, int success, void *userda } } +QT_END_NAMESPACE + + diff --git a/src/multimedia/qml/qsoundeffect_qmedia_p.cpp b/src/multimedia/qml/qsoundeffect_qmedia_p.cpp index 886380a..48fb257 100644 --- a/src/multimedia/qml/qsoundeffect_qmedia_p.cpp +++ b/src/multimedia/qml/qsoundeffect_qmedia_p.cpp @@ -59,6 +59,8 @@ #include "qsoundeffect_qmedia_p.h" +QT_BEGIN_NAMESPACE + QSoundEffectPrivate::QSoundEffectPrivate(QObject* parent): QObject(parent), m_muted(false), @@ -161,3 +163,5 @@ void QSoundEffectPrivate::setMedia(const QMediaContent &media) m_player->setMedia(media.canonicalUrl()); } +QT_END_NAMESPACE + |