comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-07 08:24:47 -04:00
Code Issues Projects Releases Wiki Activity

Add functional Spectrum view to demodulator visuals

Browse Source 
- Might need to do some renaming from Scope->AVDisplay or something for
ScopeCanvas to avoid confusion.
This commit is contained in:
Charles J. Cliffe
2015-08-24 01:31:37 -04:00
parent 13140ec28c
commit c30cce9114
11 changed files with 405 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/ThreadQueue.h
+12 -7
View File
@@ -30,13 +30,17 @@ class ThreadQueue : public ThreadQueueBase {
public:
/*! Create safe queue. */
ThreadQueue() = default;
ThreadQueue() {
m_max_num_items.store(0);
};
ThreadQueue(ThreadQueue&& sq) {
m_queue = std::move(sq.m_queue);
m_max_num_items.store(0);
}
ThreadQueue(const ThreadQueue& sq) {
std::lock_guard < std::mutex > lock(sq.m_mutex);
m_queue = sq.m_queue;
m_max_num_items.store(0);
}
/*! Destroy safe queue. */
@@ -50,8 +54,9 @@ public:
*/
void set_max_num_items(unsigned int max_num_items) {
std::lock_guard < std::mutex > lock(m_mutex);
m_max_num_items = max_num_items;
if (m_max_num_items.load() != max_num_items) {
m_max_num_items.store(max_num_items);
}
}
/**
@@ -62,7 +67,7 @@ public:
bool push(const value_type& item) {
std::lock_guard < std::mutex > lock(m_mutex);
if (m_max_num_items > 0 && m_queue.size() > m_max_num_items)
if (m_max_num_items.load() > 0 && m_queue.size() > m_max_num_items.load())
return false;
m_queue.push(item);
@@ -78,7 +83,7 @@ public:
bool push(const value_type&& item) {
std::lock_guard < std::mutex > lock(m_mutex);
if (m_max_num_items > 0 && m_queue.size() > m_max_num_items)
if (m_max_num_items.load() > 0 && m_queue.size() > m_max_num_items.load())
return false;
m_queue.push(item);
@@ -219,7 +224,7 @@ public:
*/
bool full() const {
std::lock_guard < std::mutex > lock(m_mutex);
return (m_max_num_items != 0) && (m_queue.size() >= m_max_num_items);
return (m_max_num_items.load() != 0) && (m_queue.size() >= m_max_num_items.load());
}
/**
@@ -280,7 +285,7 @@ private:
std::queue<T, Container> m_queue;
mutable std::mutex m_mutex;
std::condition_variable m_condition;
unsigned int m_max_num_items = 0;
std::atomic_uint m_max_num_items;
};
/*! Swaps the contents of two ThreadQueue objects. */