slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renaming StopppedState to StoppedState

Browse Source 
Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Angus Cummings
2012-06-07 11:01:28 +10:00
committed by Qt by Nokia
parent 931c2d3ffe
commit 80f37d2d80
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/imports/audioengine/qdeclarative_audioengine_p.cpp
View File

@@ -309,7 +309,7 @@ void QDeclarativeAudioEngine::updateSoundInstances()
for (QList<QDeclarativeSoundInstance*>::Iterator it = m_managedDeclSoundInstances.begin(); for (QList<QDeclarativeSoundInstance*>::Iterator it = m_managedDeclSoundInstances.begin();
it != m_managedDeclSoundInstances.end();) { it != m_managedDeclSoundInstances.end();) {
QDeclarativeSoundInstance *declSndInstance = *it; QDeclarativeSoundInstance *declSndInstance = *it;
if (declSndInstance->state() == QDeclarativeSoundInstance::StopppedState) { if (declSndInstance->state() == QDeclarativeSoundInstance::StoppedState) {
it = m_managedDeclSoundInstances.erase(it); it = m_managedDeclSoundInstances.erase(it);
releaseManagedDeclarativeSoundInstance(declSndInstance); releaseManagedDeclarativeSoundInstance(declSndInstance);
#ifdef DEBUG_AUDIOENGINE #ifdef DEBUG_AUDIOENGINE

4
src/imports/audioengine/qdeclarative_soundinstance_p.cpp
View File

@@ -171,7 +171,7 @@ QDeclarativeSoundInstance::QDeclarativeSoundInstance(QObject *parent)
, m_velocity(0, 0, 0) , m_velocity(0, 0, 0)
, m_gain(1) , m_gain(1)
, m_pitch(1) , m_pitch(1)
, m_requestState(QDeclarativeSoundInstance::StopppedState) , m_requestState(QDeclarativeSoundInstance::StoppedState)
, m_coneInnerAngle(360) , m_coneInnerAngle(360)
, m_coneOuterAngle(360) , m_coneOuterAngle(360)
, m_coneOuterGain(0) , m_coneOuterGain(0)
@@ -343,7 +343,7 @@ void QDeclarativeSoundInstance::stop()
#ifdef DEBUG_AUDIOENGINE #ifdef DEBUG_AUDIOENGINE
qDebug() << "QDeclarativeSoundInstance::stop()"; qDebug() << "QDeclarativeSoundInstance::stop()";
#endif #endif
m_requestState = QDeclarativeSoundInstance::StopppedState; m_requestState = QDeclarativeSoundInstance::StoppedState;
if (!m_instance) if (!m_instance)
return; return;
m_instance->stop(); m_instance->stop();

2
src/imports/audioengine/qdeclarative_soundinstance_p.h
View File

@@ -71,7 +71,7 @@ class QDeclarativeSoundInstance : public QObject
public: public:
enum State enum State
{ {
StopppedState = QSoundInstance::StopppedState, StoppedState = QSoundInstance::StoppedState,
PlayingState = QSoundInstance::PlayingState, PlayingState = QSoundInstance::PlayingState,
PausedState = QSoundInstance::PausedState PausedState = QSoundInstance::PausedState
}; };

10
src/imports/audioengine/qsoundinstance_p.cpp
View File

@@ -68,7 +68,7 @@ QSoundInstance::QSoundInstance(QObject *parent)
, m_varGain(1) , m_varGain(1)
, m_pitch(1) , m_pitch(1)
, m_varPitch(1) , m_varPitch(1)
, m_state(QSoundInstance::StopppedState) , m_state(QSoundInstance::StoppedState)
, m_coneOuterGain(0) , m_coneOuterGain(0)
, m_engine(0) , m_engine(0)
{ {
@@ -190,7 +190,7 @@ void QSoundInstance::handleSourceStateChanged(QSoundSource::State newState)
State ns = State(newState); State ns = State(newState);
if (ns == m_state) if (ns == m_state)
return; return;
if (ns == QSoundInstance::StopppedState) { if (ns == QSoundInstance::StoppedState) {
prepareNewVariation(); prepareNewVariation();
} }
setState(ns); setState(ns);
@@ -217,7 +217,7 @@ void QSoundInstance::sourceStop()
{ {
Q_ASSERT(m_soundSource); Q_ASSERT(m_soundSource);
m_soundSource->stop(); m_soundSource->stop();
setState(QSoundInstance::StopppedState); setState(QSoundInstance::StoppedState);
} }
void QSoundInstance::detach() void QSoundInstance::detach()
@@ -285,8 +285,8 @@ void QSoundInstance::sourcePause()
void QSoundInstance::stop() void QSoundInstance::stop()
{ {
if (!m_isReady || !m_soundSource || m_state == QSoundInstance::StopppedState) { if (!m_isReady || !m_soundSource || m_state == QSoundInstance::StoppedState) {
setState(QSoundInstance::StopppedState); setState(QSoundInstance::StoppedState);
return; return;
} }
sourceStop(); sourceStop();

2
src/imports/audioengine/qsoundinstance_p.h
View File

@@ -64,7 +64,7 @@ public:
enum State enum State
{ {
StopppedState = QSoundSource::StoppedState, StoppedState = QSoundSource::StoppedState,
PlayingState = QSoundSource::PlayingState, PlayingState = QSoundSource::PlayingState,
PausedState = QSoundSource::PausedState PausedState = QSoundSource::PausedState
}; };