diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp index 0a84d747bf..b9a4daeecc 100644 --- a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp +++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp @@ -337,7 +337,7 @@ f64 XAudio2Backend::GetCallbackFrameLen() return std::max(min_latency, _10ms); // 10ms is the minimum for XAudio } -void XAudio2Backend::OnVoiceProcessingPassStart(UINT32 BytesRequired) +void XAudio2Backend::OnVoiceProcessingPassStart(UINT32 BytesRequired) noexcept { std::unique_lock lock(m_cb_mutex, std::defer_lock); if (BytesRequired && !m_reset_req.observe() && lock.try_lock_for(std::chrono::microseconds{50}) && m_write_callback && m_playing) @@ -366,7 +366,7 @@ void XAudio2Backend::OnVoiceProcessingPassStart(UINT32 BytesRequired) } } -void XAudio2Backend::OnCriticalError(HRESULT Error) +void XAudio2Backend::OnCriticalError(HRESULT Error) noexcept { XAudio.error("OnCriticalError() called: %s (0x%08x)", std::system_category().message(Error), static_cast(Error)); diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h index 0312e7f633..1bab624d67 100644 --- a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h +++ b/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h @@ -54,18 +54,18 @@ private: atomic_t m_reset_req = false; // XAudio voice callbacks - void OnVoiceProcessingPassStart(UINT32 BytesRequired) override; - void OnVoiceProcessingPassEnd() override {} - void OnStreamEnd() override {} - void OnBufferStart(void* /* pBufferContext */) override {} - void OnBufferEnd(void* /* pBufferContext*/) override {} - void OnLoopEnd(void* /* pBufferContext */) override {} - void OnVoiceError(void* /* pBufferContext */, HRESULT /* Error */) override {} + void OnVoiceProcessingPassStart(UINT32 BytesRequired) noexcept override; + void OnVoiceProcessingPassEnd() noexcept override {} + void OnStreamEnd() noexcept override {} + void OnBufferStart(void* /* pBufferContext */) noexcept override {} + void OnBufferEnd(void* /* pBufferContext*/) noexcept override {} + void OnLoopEnd(void* /* pBufferContext */) noexcept override {} + void OnVoiceError(void* /* pBufferContext */, HRESULT /* Error */) noexcept override {} // XAudio engine callbacks - void OnProcessingPassStart() override {}; - void OnProcessingPassEnd() override {}; - void OnCriticalError(HRESULT Error) override; + void OnProcessingPassStart() noexcept override {}; + void OnProcessingPassEnd() noexcept override {}; + void OnCriticalError(HRESULT Error) noexcept override; // IMMNotificationClient callbacks IFACEMETHODIMP_(ULONG) AddRef() override { return 1; };