diff options
author | dec05eba <dec05eba@protonmail.com> | 2019-08-04 15:53:47 +0200 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2019-08-04 15:53:50 +0200 |
commit | 2a78b5b047a753874ca1e499f79d5f9fbb1699d5 (patch) | |
tree | 2aa693b3d6a6c0f54d5d2a9541d1d2579bac417c /src/QuickMedia.cpp | |
parent | 62a29abd372a39a413e43a8f75146af823fe7bb3 (diff) |
Move video player to main thread (it's still processed in another thread), fix crash, fix scaling
Diffstat (limited to 'src/QuickMedia.cpp')
-rw-r--r-- | src/QuickMedia.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index b74cd02..fb29058 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -313,7 +313,6 @@ namespace QuickMedia { search_bar->onTextSubmitCallback = [this](const std::string &text) { BodyItem *selected_item = body->get_selected(); - printf("Selected item: %s\n", selected_item->title.c_str()); if(!selected_item) return; video_url = selected_item->url; @@ -401,7 +400,6 @@ namespace QuickMedia { }; } - bool resized = true; sf::Clock resize_timer; sf::Event event; @@ -415,8 +413,8 @@ namespace QuickMedia { window_size.y = event.size.height; sf::FloatRect visible_area(0, 0, window_size.x, window_size.y); window.setView(sf::View(visible_area)); - resized = true; - resize_timer.restart(); + if(video_player) + video_player->resize(sf::Vector2i(window_size.x, window_size.y)); } else if(event.type == sf::Event::KeyPressed) { if(event.key.code == sf::Keyboard::Escape) { current_page = Page::SEARCH_SUGGESTION; @@ -427,14 +425,6 @@ namespace QuickMedia { } } - if(resized && resize_timer.getElapsedTime().asMilliseconds() >= 300) { - resized = false; - if(video_player) { - if(!video_player->resize(sf::Vector2i(window_size.x, window_size.y))) - video_player.release(); - } - } - window.clear(); if(video_player) video_player->draw(window); |