From 0d8293a5647c2bb10228658f0910515b38ff0d64 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Wed, 21 Oct 2020 21:32:51 +0200 Subject: Workaround sfml image loading thread race condition See: https://github.com/SFML/SFML/issues/1711 Also some other smaller changes --- plugins/Mangadex.hpp | 2 +- plugins/Manganelo.hpp | 2 +- plugins/Mangatown.hpp | 2 +- plugins/Page.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/Mangadex.hpp b/plugins/Mangadex.hpp index 9990792..1b238a2 100644 --- a/plugins/Mangadex.hpp +++ b/plugins/Mangadex.hpp @@ -11,7 +11,7 @@ namespace QuickMedia { bool search_is_filter() override { return false; } SearchResult search(const std::string &str, BodyItems &result_items) override; PluginResult submit(const std::string &title, const std::string &url, std::vector &result_tabs) override; - sf::Vector2i get_max_thumbnail_size() override { return sf::Vector2i(101, 141); }; + sf::Vector2i get_thumbnail_max_size() override { return sf::Vector2i(101, 141); }; private: bool get_rememberme_token(std::string &rememberme_token); std::optional rememberme_token; diff --git a/plugins/Manganelo.hpp b/plugins/Manganelo.hpp index b82476c..4fbce5b 100644 --- a/plugins/Manganelo.hpp +++ b/plugins/Manganelo.hpp @@ -11,7 +11,7 @@ namespace QuickMedia { bool search_is_filter() override { return false; } SearchResult search(const std::string &str, BodyItems &result_items) override; PluginResult submit(const std::string &title, const std::string &url, std::vector &result_tabs) override; - sf::Vector2i get_max_thumbnail_size() override { return sf::Vector2i(101, 141); }; + sf::Vector2i get_thumbnail_max_size() override { return sf::Vector2i(101, 141); }; private: bool extract_id_from_url(const std::string &url, std::string &manga_id) const; }; diff --git a/plugins/Mangatown.hpp b/plugins/Mangatown.hpp index 0062d51..10f2500 100644 --- a/plugins/Mangatown.hpp +++ b/plugins/Mangatown.hpp @@ -12,7 +12,7 @@ namespace QuickMedia { SearchResult search(const std::string &str, BodyItems &result_items) override; PluginResult get_page(const std::string &str, int page, BodyItems &result_items) override; PluginResult submit(const std::string &title, const std::string &url, std::vector &result_tabs) override; - sf::Vector2i get_max_thumbnail_size() override { return sf::Vector2i(101, 141); }; + sf::Vector2i get_thumbnail_max_size() override { return sf::Vector2i(101, 141); }; private: bool extract_id_from_url(const std::string &url, std::string &manga_id) const; }; diff --git a/plugins/Page.hpp b/plugins/Page.hpp index fb828fb..f65cd21 100644 --- a/plugins/Page.hpp +++ b/plugins/Page.hpp @@ -41,7 +41,7 @@ namespace QuickMedia { bool load_manga_content_storage(const char *service_name, const std::string &manga_title, const std::string &manga_id); - virtual sf::Vector2i get_max_thumbnail_size() { return sf::Vector2i(480, 360); }; + virtual sf::Vector2i get_thumbnail_max_size() { return sf::Vector2i(480, 360); }; Program *program; }; -- cgit v1.2.3