archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-02 13:01:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix noexcept warnings in XAudio

Browse source
This commit is contained in:
Megamouse 2025-06-26 20:01:34 +02:00
parent 786ac95dc0
commit bfd2adab5e
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp
View file

@ -337,7 +337,7 @@ f64 XAudio2Backend::GetCallbackFrameLen()
return std::max<f64>(min_latency, _10ms); // 10ms is the minimum for XAudio return std::max<f64>(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); 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) 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<u32>(Error)); XAudio.error("OnCriticalError() called: %s (0x%08x)", std::system_category().message(Error), static_cast<u32>(Error));

20
rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h
View file

@ -54,18 +54,18 @@ private:
atomic_t<bool> m_reset_req = false; atomic_t<bool> m_reset_req = false;
// XAudio voice callbacks // XAudio voice callbacks
void OnVoiceProcessingPassStart(UINT32 BytesRequired) override; void OnVoiceProcessingPassStart(UINT32 BytesRequired) noexcept override;
void OnVoiceProcessingPassEnd() override {} void OnVoiceProcessingPassEnd() noexcept override {}
void OnStreamEnd() override {} void OnStreamEnd() noexcept override {}
void OnBufferStart(void* /* pBufferContext */) override {} void OnBufferStart(void* /* pBufferContext */) noexcept override {}
void OnBufferEnd(void* /* pBufferContext*/) override {} void OnBufferEnd(void* /* pBufferContext*/) noexcept override {}
void OnLoopEnd(void* /* pBufferContext */) override {} void OnLoopEnd(void* /* pBufferContext */) noexcept override {}
void OnVoiceError(void* /* pBufferContext */, HRESULT /* Error */) override {} void OnVoiceError(void* /* pBufferContext */, HRESULT /* Error */) noexcept override {}
// XAudio engine callbacks // XAudio engine callbacks
void OnProcessingPassStart() override {}; void OnProcessingPassStart() noexcept override {};
void OnProcessingPassEnd() override {}; void OnProcessingPassEnd() noexcept override {};
void OnCriticalError(HRESULT Error) override; void OnCriticalError(HRESULT Error) noexcept override;
// IMMNotificationClient callbacks // IMMNotificationClient callbacks
IFACEMETHODIMP_(ULONG) AddRef() override { return 1; }; IFACEMETHODIMP_(ULONG) AddRef() override { return 1; };