diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-24 00:00:19 (GMT) |
| commit | 56fe1454fe08ec7cc258cbbd38486e721d088c99 (patch) | |
| tree | 597051d1f3b73595f48bcad5a5acb24026c6ba66 /src/multimedia/qml/qsoundeffect.cpp | |
| parent | e26db74521e063a1513731eb14581d93a3d77481 (diff) | |
| parent | af4f30abb88d242d1e310914b53bc91b24e45a59 (diff) | |
| download | Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.zip Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.gz Qt-56fe1454fe08ec7cc258cbbd38486e721d088c99.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
Diffstat (limited to 'src/multimedia/qml/qsoundeffect.cpp')
| -rw-r--r-- | src/multimedia/qml/qsoundeffect.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/multimedia/qml/qsoundeffect.cpp b/src/multimedia/qml/qsoundeffect.cpp index f0c9659..919aa75 100644 --- a/src/multimedia/qml/qsoundeffect.cpp +++ b/src/multimedia/qml/qsoundeffect.cpp @@ -52,6 +52,7 @@ #include "qsoundeffect_qsound_p.h" #endif +QT_BEGIN_NAMESPACE /*! \qmlclass SoundEffect QSoundEffect @@ -139,7 +140,7 @@ QSoundEffect::QSoundEffect(QObject *parent) : QObject(parent), m_loopCount(1), - m_volume(100), + m_vol(100), m_muted(false), m_runningCount(0) { @@ -165,7 +166,7 @@ void QSoundEffect::setSource(const QUrl &url) if (d != 0 && d->media().canonicalUrl() == url) return; - d->setVolume(m_volume); + d->setVolume(m_vol); d->setMuted(m_muted); d->setMedia(url); @@ -191,15 +192,15 @@ void QSoundEffect::setLoopCount(int loopCount) int QSoundEffect::volume() const { - return d != 0 ? d->volume() : m_volume; + return d != 0 ? d->volume() : m_vol; } void QSoundEffect::setVolume(int volume) { - if (m_volume == volume) + if (m_vol == volume) return; - m_volume = volume; + m_vol = volume; if (d != 0) d->setVolume(volume); else @@ -250,3 +251,4 @@ void QSoundEffect::repeat() } } +QT_END_NAMESPACE |