diff options
author | Chris Robinson <[email protected]> | 2018-12-27 13:40:43 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2018-12-27 13:40:43 -0800 |
commit | 4782d6107d250e3528c5e567dca48da727584ee7 (patch) | |
tree | 05679c4196c4dacfce65991fa4caa7862cf1c381 /Alc/backends/alsa.cpp | |
parent | 7880f27054cd69cd1e36ebd3d20aa9d6148e3bbd (diff) |
Use a proper constructor/destructor for the ALCbackend base
Diffstat (limited to 'Alc/backends/alsa.cpp')
-rw-r--r-- | Alc/backends/alsa.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Alc/backends/alsa.cpp b/Alc/backends/alsa.cpp index 97b2e965..2d0b3070 100644 --- a/Alc/backends/alsa.cpp +++ b/Alc/backends/alsa.cpp @@ -429,6 +429,8 @@ struct ALCplaybackAlsa final : public ALCbackend { std::atomic<ALenum> mKillNow{AL_TRUE}; std::thread mThread; + + ALCplaybackAlsa(ALCdevice *device) noexcept : ALCbackend{device} { } }; int ALCplaybackAlsa_mixerProc(ALCplaybackAlsa *self); @@ -451,8 +453,7 @@ DEFINE_ALCBACKEND_VTABLE(ALCplaybackAlsa); void ALCplaybackAlsa_Construct(ALCplaybackAlsa *self, ALCdevice *device) { - new (self) ALCplaybackAlsa{}; - ALCbackend_Construct(STATIC_CAST(ALCbackend, self), device); + new (self) ALCplaybackAlsa{device}; SET_VTABLE2(ALCplaybackAlsa, ALCbackend, self); } @@ -462,7 +463,6 @@ void ALCplaybackAlsa_Destruct(ALCplaybackAlsa *self) snd_pcm_close(self->mPcmHandle); self->mPcmHandle = nullptr; - ALCbackend_Destruct(STATIC_CAST(ALCbackend, self)); self->~ALCplaybackAlsa(); } @@ -932,6 +932,8 @@ struct ALCcaptureAlsa final : public ALCbackend { RingBufferPtr mRing{nullptr}; snd_pcm_sframes_t mLastAvail{0}; + + ALCcaptureAlsa(ALCdevice *device) noexcept : ALCbackend{device} { } }; void ALCcaptureAlsa_Construct(ALCcaptureAlsa *self, ALCdevice *device); @@ -952,8 +954,7 @@ DEFINE_ALCBACKEND_VTABLE(ALCcaptureAlsa); void ALCcaptureAlsa_Construct(ALCcaptureAlsa *self, ALCdevice *device) { - new (self) ALCcaptureAlsa{}; - ALCbackend_Construct(STATIC_CAST(ALCbackend, self), device); + new (self) ALCcaptureAlsa{device}; SET_VTABLE2(ALCcaptureAlsa, ALCbackend, self); } @@ -963,7 +964,6 @@ void ALCcaptureAlsa_Destruct(ALCcaptureAlsa *self) snd_pcm_close(self->mPcmHandle); self->mPcmHandle = nullptr; - ALCbackend_Destruct(STATIC_CAST(ALCbackend, self)); self->~ALCcaptureAlsa(); } |