aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/backends/wave.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-11-26 17:31:04 -0800
committerChris Robinson <[email protected]>2018-11-26 17:31:04 -0800
commit04c2802a82e3db8a49b197037ca2e5b2ab74fe8e (patch)
tree1d7b70a38bb4b656933396ad6bb8fe6ca440d90a /Alc/backends/wave.cpp
parent04cbdbd5695bb8547966cc850ad854b0640ef7b0 (diff)
Rename some struct members
Diffstat (limited to 'Alc/backends/wave.cpp')
-rw-r--r--Alc/backends/wave.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Alc/backends/wave.cpp b/Alc/backends/wave.cpp
index ec5e787b..2475aa9f 100644
--- a/Alc/backends/wave.cpp
+++ b/Alc/backends/wave.cpp
@@ -84,8 +84,8 @@ struct ALCwaveBackend final : public ALCbackend {
al::vector<ALbyte> mBuffer;
- std::atomic<ALenum> killNow{AL_TRUE};
- std::thread thread;
+ std::atomic<ALenum> mKillNow{AL_TRUE};
+ std::thread mThread;
};
int ALCwaveBackend_mixerProc(ALCwaveBackend *self);
@@ -134,7 +134,7 @@ int ALCwaveBackend_mixerProc(ALCwaveBackend *self)
ALint64 done{0};
auto start = std::chrono::steady_clock::now();
- while(!ATOMIC_LOAD(&self->killNow, almemory_order_acquire) &&
+ while(!self->mKillNow.load(std::memory_order_acquire) &&
ATOMIC_LOAD(&device->Connected, almemory_order_acquire))
{
auto now = std::chrono::steady_clock::now();
@@ -348,8 +348,8 @@ ALCboolean ALCwaveBackend_reset(ALCwaveBackend *self)
ALCboolean ALCwaveBackend_start(ALCwaveBackend *self)
{
try {
- ATOMIC_STORE(&self->killNow, AL_FALSE, almemory_order_release);
- self->thread = std::thread(ALCwaveBackend_mixerProc, self);
+ self->mKillNow.store(AL_FALSE, std::memory_order_release);
+ self->mThread = std::thread(ALCwaveBackend_mixerProc, self);
return ALC_TRUE;
}
catch(std::exception& e) {
@@ -362,9 +362,9 @@ ALCboolean ALCwaveBackend_start(ALCwaveBackend *self)
void ALCwaveBackend_stop(ALCwaveBackend *self)
{
- if(self->killNow.exchange(AL_TRUE, std::memory_order_acq_rel) || !self->thread.joinable())
+ if(self->mKillNow.exchange(AL_TRUE, std::memory_order_acq_rel) || !self->mThread.joinable())
return;
- self->thread.join();
+ self->mThread.join();
long size{ftell(self->mFile)};
if(size > 0)