celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-19 20:11:59 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

use sigc in imgmanager to hopefully get rid of some lifetime errors

Browse Source
This commit is contained in:
ouwou
2020-10-04 15:31:39 -04:00
parent 77fc962de4
commit 69c4b0c948
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
imgmanager.cpp
View File

@@ -26,11 +26,13 @@ Glib::RefPtr<Gdk::Pixbuf> ImageManager::ReadFileToPixbuf(std::string path) {
}
void ImageManager::LoadFromURL(std::string url, callback_type cb) {
m_cache.GetFileFromURL(url, [this, url, cb](std::string path) {
sigc::signal<void(Glib::RefPtr<Gdk::Pixbuf>)> signal;
signal.connect(cb);
m_cache.GetFileFromURL(url, [this, url, signal](std::string path) {
try {
auto buf = ReadFileToPixbuf(path);
m_cb_mutex.lock();
m_cb_queue.push(std::make_pair(buf, cb));
m_cb_queue.push([signal, buf]() { signal.emit(buf); });
m_cb_dispatcher.emit();
m_cb_mutex.unlock();
} catch (std::exception &e) {
@@ -41,8 +43,7 @@ void ImageManager::LoadFromURL(std::string url, callback_type cb) {
void ImageManager::RunCallbacks() {
m_cb_mutex.lock();
const auto &pair = m_cb_queue.front();
pair.second(pair.first);
m_cb_queue.front()();
m_cb_queue.pop();
m_cb_mutex.unlock();
}