From a8f1ebca36d90d965e8a55ebc766f659db65b0c1 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Thu, 29 Oct 2020 10:14:53 +0100 Subject: Matrix: download unstreamable videos before playing them (mp4) --- include/MessageQueue.hpp | 2 +- include/QuickMedia.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/MessageQueue.hpp b/include/MessageQueue.hpp index 174a227..df331ac 100644 --- a/include/MessageQueue.hpp +++ b/include/MessageQueue.hpp @@ -20,9 +20,9 @@ namespace QuickMedia { } std::optional pop_wait() { + std::unique_lock lock(mutex); if(!running) return std::nullopt; - std::unique_lock lock(mutex); while(data_queue.empty() && running) cv.wait(lock); if(!running) return std::nullopt; diff --git a/include/QuickMedia.hpp b/include/QuickMedia.hpp index bdbafef..99bab7a 100644 --- a/include/QuickMedia.hpp +++ b/include/QuickMedia.hpp @@ -56,7 +56,7 @@ namespace QuickMedia { private: void base_event_handler(sf::Event &event, PageType previous_page, Body *body, SearchBar *search_bar, bool handle_key_press = true, bool handle_searchbar = true); void page_loop(std::vector &tabs); - void video_content_page(Page *page, std::string video_url, std::string video_title); + void video_content_page(Page *page, std::string video_url, std::string video_title, bool download_if_streaming_fails); // Returns -1 to go to previous chapter, 0 to stay on same chapter and 1 to go to next chapter int image_page(MangaImagesPage *images_page, Body *chapters_body); void image_continuous_page(MangaImagesPage *images_page); -- cgit v1.2.3