lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-27 14:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run clang-format

Browse source
This commit is contained in:
Billy Laws 2023-03-26 20:07:03 +01:00
parent ea5dd02db9
commit 237934b736
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/audio_core/renderer/adsp/audio_renderer.h
View file

@ -10,9 +10,9 @@
#include "audio_core/renderer/adsp/command_buffer.h" #include "audio_core/renderer/adsp/command_buffer.h"
#include "audio_core/renderer/adsp/command_list_processor.h" #include "audio_core/renderer/adsp/command_list_processor.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/polyfill_thread.h"
#include "common/reader_writer_queue.h" #include "common/reader_writer_queue.h"
#include "common/thread.h" #include "common/thread.h"
#include "common/polyfill_thread.h"
namespace Core { namespace Core {
namespace Timing { namespace Timing {

10
src/audio_core/sink/sink_stream.cpp
View file

@ -245,9 +245,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
// Successfully dequeued a new buffer. // Successfully dequeued a new buffer.
queued_buffers--; queued_buffers--;
{ { std::unique_lock lk{release_mutex}; }
std::unique_lock lk{release_mutex};
}
release_cv.notify_one(); release_cv.notify_one();
} }
@ -276,7 +274,8 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
{ {
std::scoped_lock lk{sample_count_lock}; std::scoped_lock lk{sample_count_lock};
last_sample_count_update_time = Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks()); last_sample_count_update_time =
Core::Timing::CyclesToUs(system.CoreTiming().GetClockTicks());
min_played_sample_count = max_played_sample_count; min_played_sample_count = max_played_sample_count;
max_played_sample_count += actual_frames_written; max_played_sample_count += actual_frames_written;
} }
@ -315,7 +314,8 @@ u64 SinkStream::GetExpectedPlayedSampleCount() {
void SinkStream::WaitFreeSpace() { void SinkStream::WaitFreeSpace() {
std::unique_lock lk{release_mutex}; std::unique_lock lk{release_mutex};
release_cv.wait(lk, [this]() { return queued_buffers < max_queue_size || system.IsShuttingDown(); }); release_cv.wait(
lk, [this]() { return queued_buffers < max_queue_size || system.IsShuttingDown(); });
} }
} // namespace AudioCore::Sink } // namespace AudioCore::Sink

1
src/audio_core/sink/sink_stream.h
View file

@ -16,7 +16,6 @@
#include "common/reader_writer_queue.h" #include "common/reader_writer_queue.h"
#include "common/ring_buffer.h" #include "common/ring_buffer.h"
#include "common/thread.h" #include "common/thread.h"
#include "common/polyfill_thread.h"
namespace Core { namespace Core {
class System; class System;