diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-26 16:04:47 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-26 16:04:47 (GMT) |
| commit | 2e08308e49ea287a6dcb4ec257698281ac8ff0a8 (patch) | |
| tree | 331724033b4dcced4961053f2d5454748d7c3694 /src/multimedia/qml | |
| parent | 27e403d9c6185c606980bb7881e39a2c88138a13 (diff) | |
| parent | d7616f00149a1d520f291fdb2b934bd36bbd7c90 (diff) | |
| download | Qt-2e08308e49ea287a6dcb4ec257698281ac8ff0a8.zip Qt-2e08308e49ea287a6dcb4ec257698281ac8ff0a8.tar.gz Qt-2e08308e49ea287a6dcb4ec257698281ac8ff0a8.tar.bz2 | |
Merge branch 'master' of git:qt/qt-multimedia-staging into qml
Conflicts:
configure.exe
Diffstat (limited to 'src/multimedia/qml')
| -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 + |