ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11682 from lioncash/queue 

Common: Move FixedSizeQueue into Common namespace
This commit is contained in:
Admiral H. Curtiss 2023-03-24 12:55:10 +01:00 committed by GitHub
parent eb7d7836fd 0f326c6067
commit 2edb69f89f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/AudioCommon/SurroundDecoder.h
View File

@ -29,7 +29,7 @@ private:
std::unique_ptr<DPL2FSDecoder> m_fsdecoder;
std::array<float, 32768> m_float_conversion_buffer;
FixedSizeQueue<float, 32768> m_decoded_fifo;
Common::FixedSizeQueue<float, 32768> m_decoded_fifo;
};
} // namespace AudioCommon

3
Source/Core/Common/FixedSizeQueue.h
View File

@ -13,6 +13,8 @@
//
// Not fully featured, no safety checking yet. Add features as needed.
namespace Common
{
template <class T, int N>
class FixedSizeQueue
{
@ -84,3 +86,4 @@ private:
// Sacrifice 4 bytes for a simpler implementation. may optimize away in the future.
int count = 0;
};
} // namespace Common

2
Source/Core/DolphinQt/Config/LogWidget.h
View File

@ -52,5 +52,5 @@ private:
static constexpr int MAX_LOG_LINES = 5000;
std::mutex m_log_mutex;
FixedSizeQueue<LogEntry, MAX_LOG_LINES> m_log_ring_buffer;
Common::FixedSizeQueue<LogEntry, MAX_LOG_LINES> m_log_ring_buffer;
};

6
Source/UnitTests/Common/FixedSizeQueueTest.cpp
View File

@ -7,7 +7,7 @@
TEST(FixedSizeQueue, Simple)
{
FixedSizeQueue<int, 5> q;
Common::FixedSizeQueue<int, 5> q;
EXPECT_EQ(0u, q.size());
@ -34,7 +34,7 @@ TEST(FixedSizeQueue, Simple)
TEST(FixedSizeQueue, RingBuffer)
{
// Testing if queue works when used as a ring buffer
FixedSizeQueue<int, 5> q;
Common::FixedSizeQueue<int, 5> q;
EXPECT_EQ(0u, q.size());
@ -84,7 +84,7 @@ public:
TEST(FixedSizeQueue, NonTrivialTypes)
{
// Testing if construction/destruction of non-trivial types happens as expected
FixedSizeQueue<NonTrivialTypeTestData, 2> q;
Common::FixedSizeQueue<NonTrivialTypeTestData, 2> q;
EXPECT_EQ(0u, q.size());