diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-11-01 13:37:41 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-07 16:32:32 +0100 |
commit | fbac3a06473535c1559d9a7ff7695e3e28f3abb2 (patch) | |
tree | d0d5075a041aa2c21aee20cc47720f5cc6c581dd /src/multimedia | |
parent | e3a8c165eabe139d71a762089ab396e5b492c70b (diff) |
Use QAtomicInt::load() and ::store()
The operator=(int) and implicit int cast operators are deprecated
and will be removed.
Change-Id: I5091d705fba45195239c901f210355e09e123faa
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/audio/qaudio_mac.cpp | 6 | ||||
-rw-r--r-- | src/multimedia/audio/qaudioinput_mac_p.cpp | 6 | ||||
-rw-r--r-- | src/multimedia/audio/qaudiooutput_mac_p.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/multimedia/audio/qaudio_mac.cpp b/src/multimedia/audio/qaudio_mac.cpp index 733f20a82..cadf76ce6 100644 --- a/src/multimedia/audio/qaudio_mac.cpp +++ b/src/multimedia/audio/qaudio_mac.cpp @@ -105,12 +105,12 @@ QAudioRingBuffer::~QAudioRingBuffer() int QAudioRingBuffer::used() const { - return m_bufferUsed; + return m_bufferUsed.load(); } int QAudioRingBuffer::free() const { - return m_bufferSize - m_bufferUsed; + return m_bufferSize - m_bufferUsed.load(); } int QAudioRingBuffer::size() const @@ -122,7 +122,7 @@ void QAudioRingBuffer::reset() { m_readPos = 0; m_writePos = 0; - m_bufferUsed = 0; + m_bufferUsed.store(0); } QT_END_NAMESPACE diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp index 184935add..3ce6b4f6b 100644 --- a/src/multimedia/audio/qaudioinput_mac_p.cpp +++ b/src/multimedia/audio/qaudioinput_mac_p.cpp @@ -894,14 +894,14 @@ void QAudioInputPrivate::audioThreadStop() void QAudioInputPrivate::audioThreadStart() { startTimers(); - audioThreadState = Running; + audioThreadState.store(Running); AudioOutputUnitStart(audioUnit); } void QAudioInputPrivate::audioDeviceStop() { AudioOutputUnitStop(audioUnit); - audioThreadState = Stopped; + audioThreadState.store(Stopped); threadFinished.wakeOne(); } @@ -960,7 +960,7 @@ OSStatus QAudioInputPrivate::inputCallback(void* inRefCon, QAudioInputPrivate* d = static_cast<QAudioInputPrivate*>(inRefCon); - const int threadState = d->audioThreadState.fetchAndAddAcquire(0); + const int threadState = d->audioThreadState.loadAcquire(); if (threadState == Stopped) d->audioDeviceStop(); else { diff --git a/src/multimedia/audio/qaudiooutput_mac_p.cpp b/src/multimedia/audio/qaudiooutput_mac_p.cpp index 5e0c1cb07..66df9aae9 100644 --- a/src/multimedia/audio/qaudiooutput_mac_p.cpp +++ b/src/multimedia/audio/qaudiooutput_mac_p.cpp @@ -295,7 +295,7 @@ QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray& device) clockFrequency = AudioGetHostClockFrequency() / 1000; errorCode = QAudio::NoError; stateCode = QAudio::StoppedState; - audioThreadState = Stopped; + audioThreadState.store(Stopped); intervalTimer = new QTimer(this); intervalTimer->setInterval(1000); @@ -599,7 +599,7 @@ QAudio::State QAudioOutputPrivate::state() const void QAudioOutputPrivate::audioThreadStart() { startTimers(); - audioThreadState = Running; + audioThreadState.store(Running); AudioOutputUnitStart(audioUnit); } @@ -620,7 +620,7 @@ void QAudioOutputPrivate::audioThreadDrain() void QAudioOutputPrivate::audioDeviceStop() { AudioOutputUnitStop(audioUnit); - audioThreadState = Stopped; + audioThreadState.store(Stopped); threadFinished.wakeOne(); } |