diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-12 15:36:45 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-30 06:23:04 +0000 |
| commit | 5f56ec9c4f32ff06fb3daa30c0e961997d5fe964 (patch) | |
| tree | 442e5dd959079d6f14889ddde5d1eb71b2873a69 /src/imports | |
| parent | ab6ebd360eb27a0d502839fca07ae0e6e107cec6 (diff) | |
Use QRandomGenerator instead of q?rand
Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/audioengine/qdeclarative_playvariation_p.cpp | 5 | ||||
| -rw-r--r-- | src/imports/audioengine/qdeclarative_sound_p.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.cpp b/src/imports/audioengine/qdeclarative_playvariation_p.cpp index 36ffca668..5dd88506b 100644 --- a/src/imports/audioengine/qdeclarative_playvariation_p.cpp +++ b/src/imports/audioengine/qdeclarative_playvariation_p.cpp @@ -41,6 +41,7 @@ #include "qdeclarative_audioengine_p.h" #include "qsoundinstance_p.h" #include "qdebug.h" +#include "qrandom.h" #define DEBUG_AUDIOENGINE @@ -272,7 +273,7 @@ void QDeclarativePlayVariation::setSampleObject(QDeclarativeAudioSample *sampleO void QDeclarativePlayVariation::applyParameters(QSoundInstance *soundInstance) { - qreal pitch = qreal(qrand() % 1001) * 0.001f * (m_maxPitch - m_minPitch) + m_minPitch; - qreal gain = qreal(qrand() % 1001) * 0.001f * (m_maxGain - m_minGain) + m_minGain; + qreal pitch = QRandomGenerator::bounded(1001 * 0.001f) * (m_maxPitch - m_minPitch) + m_minPitch; + qreal gain = QRandomGenerator::bounded(1001 * 0.001f) * (m_maxGain - m_minGain) + m_minGain; soundInstance->updateVariationParameters(pitch, gain, m_looping); } diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp index 0849215be..adbe9e53a 100644 --- a/src/imports/audioengine/qdeclarative_sound_p.cpp +++ b/src/imports/audioengine/qdeclarative_sound_p.cpp @@ -43,6 +43,7 @@ #include "qdeclarative_soundinstance_p.h" #include "qdeclarative_audioengine_p.h" #include "qdebug.h" +#include "qrandom.h" #define DEBUG_AUDIOENGINE @@ -316,7 +317,7 @@ int QDeclarativeSound::genVariationIndex(int oldVariationIndex) case QDeclarativeSound::Random: { if (oldVariationIndex < 0) oldVariationIndex = 0; - return (oldVariationIndex + (qrand() % (m_playlist.count() + 1))) % m_playlist.count(); + return (oldVariationIndex + (QRandomGenerator::bounded(m_playlist.count() + 1))) % m_playlist.count(); } default: return (oldVariationIndex + 1) % m_playlist.count(); |