aboutsummaryrefslogtreecommitdiff
path: root/include/AsyncImageLoader.hpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2020-10-26 09:48:25 +0100
committerdec05eba <dec05eba@protonmail.com>2020-10-29 04:21:15 +0100
commit620123fbd6c18dc48a25cc735565f6d8d85f8639 (patch)
tree1563c8d2867f80f7c5cf00c15c8a1b6612de9f67 /include/AsyncImageLoader.hpp
parent0d432776c13f7b7bfd94d8ea2a7a41be33f21c8d (diff)
Matrix: add room tags
Fix pinned events that are added after starting QuickMedia (before this change it adds all elements again to the list). Add /me command. Other fixes...
Diffstat (limited to 'include/AsyncImageLoader.hpp')
-rw-r--r--include/AsyncImageLoader.hpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/AsyncImageLoader.hpp b/include/AsyncImageLoader.hpp
index 3189565..c1c2e11 100644
--- a/include/AsyncImageLoader.hpp
+++ b/include/AsyncImageLoader.hpp
@@ -1,16 +1,13 @@
#pragma once
#include "../include/Storage.hpp"
+#include "../include/MessageQueue.hpp"
#include <SFML/System/Vector2.hpp>
#include <SFML/Graphics/Texture.hpp>
#include <SFML/System/Clock.hpp>
#include <string>
-#include <vector>
#include <memory>
#include <thread>
-#include <mutex>
-#include <condition_variable>
-#include <deque>
namespace QuickMedia {
enum class LoadingState {
@@ -55,9 +52,6 @@ namespace QuickMedia {
// TODO: Use curl single-threaded multi-download feature instead
std::thread download_image_thread[NUM_IMAGE_LOAD_THREADS];
std::thread load_image_thread;
- std::mutex load_image_mutex;
- std::condition_variable load_image_cv;
- std::deque<ThumbnailLoadData> images_to_load;
- bool running = true;
+ MessageQueue<ThumbnailLoadData> image_load_queue;
};
} \ No newline at end of file