From f6e90b4c720ae6eb25b495fb7dd7b62310dcc523 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 1 Feb 2020 13:33:39 +0300 Subject: [PATCH] Fix FAudio logging --- rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp b/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp index 9965d32bc0..fb988f5489 100644 --- a/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp +++ b/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp @@ -4,7 +4,7 @@ #include "FAudioBackend.h" -LOG_CHANNEL(FAudio); +LOG_CHANNEL(FAudio_, "FAudio"); FAudioBackend::FAudioBackend() { @@ -13,14 +13,14 @@ FAudioBackend::FAudioBackend() res = FAudioCreate(&m_instance, 0, FAUDIO_DEFAULT_PROCESSOR); if (res) { - FAudio.fatal("FAudioCreate() failed(0x%08x)", res); + FAudio_.fatal("FAudioCreate() failed(0x%08x)", res); return; } res = FAudio_CreateMasteringVoice(m_instance, &m_master_voice, g_cfg.audio.downmix_to_2ch ? 2 : 8, 48000, 0, 0, nullptr); if (res) { - FAudio.fatal("FAudio_CreateMasteringVoice() failed(0x%08x)", res); + FAudio_.fatal("FAudio_CreateMasteringVoice() failed(0x%08x)", res); return; } } @@ -52,7 +52,7 @@ void FAudioBackend::Play() u32 res = FAudioSourceVoice_Start(m_source_voice, 0, FAUDIO_COMMIT_NOW); if (res) { - FAudio.error("FAudioSourceVoice_Start() failed(0x%08x)", res); + FAudio_.error("FAudioSourceVoice_Start() failed(0x%08x)", res); Emu.Pause(); } } @@ -64,7 +64,7 @@ void FAudioBackend::Pause() u32 res = FAudioSourceVoice_Stop(m_source_voice, 0, FAUDIO_COMMIT_NOW); if (res) { - FAudio.error("FAudioSourceVoice_Stop() failed(0x%08x)", res); + FAudio_.error("FAudioSourceVoice_Stop() failed(0x%08x)", res); Emu.Pause(); } } @@ -76,7 +76,7 @@ void FAudioBackend::Flush() u32 res = FAudioSourceVoice_FlushSourceBuffers(m_source_voice); if (res) { - FAudio.error("FAudioSourceVoice_FlushSourceBuffers() failed(0x%08x)", res); + FAudio_.error("FAudioSourceVoice_FlushSourceBuffers() failed(0x%08x)", res); Emu.Pause(); } } @@ -115,7 +115,7 @@ void FAudioBackend::Open(u32 /* num_buffers */) u32 res = FAudio_CreateSourceVoice(m_instance, &m_source_voice, &waveformatex, 0, FAUDIO_DEFAULT_FREQ_RATIO, nullptr, nullptr, nullptr); if (res) { - FAudio.error("FAudio_CreateSourceVoice() failed(0x%08x)", res); + FAudio_.error("FAudio_CreateSourceVoice() failed(0x%08x)", res); Emu.Pause(); } @@ -132,7 +132,7 @@ bool FAudioBackend::AddData(const void* src, u32 num_samples) if (state.BuffersQueued >= MAX_AUDIO_BUFFERS) { - FAudio.warning("Too many buffers enqueued (%d)", state.BuffersQueued); + FAudio_.warning("Too many buffers enqueued (%d)", state.BuffersQueued); return false; } @@ -150,7 +150,7 @@ bool FAudioBackend::AddData(const void* src, u32 num_samples) u32 res = FAudioSourceVoice_SubmitSourceBuffer(m_source_voice, &buffer, nullptr); if (res) { - FAudio.error("FAudioSourceVoice_SubmitSourceBuffer() failed(0x%08x)", res); + FAudio_.error("FAudioSourceVoice_SubmitSourceBuffer() failed(0x%08x)", res); Emu.Pause(); return false; } @@ -174,7 +174,7 @@ f32 FAudioBackend::SetFrequencyRatio(f32 new_ratio) u32 res = FAudioSourceVoice_SetFrequencyRatio(m_source_voice, new_ratio, FAUDIO_COMMIT_NOW); if (res) { - FAudio.error("FAudioSourceVoice_SetFrequencyRatio() failed(0x%08x)", res); + FAudio_.error("FAudioSourceVoice_SetFrequencyRatio() failed(0x%08x)", res); Emu.Pause(); return 1.0f; }