diff options
Diffstat (limited to 'src/QuickMedia.cpp')
| -rw-r--r-- | src/QuickMedia.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index d49aa32..1ee0816 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -1239,7 +1239,7 @@ namespace QuickMedia { } } else if(strcmp(plugin_name, "pornhub") == 0) { check_youtube_dl_installed(plugin_name); - auto search_page = std::make_unique<MediaGenericSearchPage>(this, "https://www.pornhub.com/", mgl::vec2i(320/1.5f, 180/1.5f), false); + auto search_page = std::make_unique<MediaGenericSearchPage>(this, "https://www.pornhub.com/", mgl::vec2i(320/1.5f, 180/1.5f), true); add_pornhub_handlers(search_page.get()); tabs.push_back(Tab{create_body(false, true), std::move(search_page), create_search_bar("Search...", 500)}); use_youtube_dl = true; @@ -1253,15 +1253,15 @@ namespace QuickMedia { check_youtube_dl_installed(plugin_name); std::vector<CommandArg> extra_commands = { - { "-H", "Cookie: last_views=%5B%2236247565-" + std::to_string(time(nullptr)) + "%22%5D" } + { "--header", "Cookie: last_views=%5B%2236247565-" + std::to_string(time(nullptr)) + "%22%5D" } }; - auto search_page = std::make_unique<MediaGenericSearchPage>(this, "https://www.xvideos.com/", mgl::vec2i(352/1.5f, 198/1.5f), false, std::move(extra_commands)); + auto search_page = std::make_unique<MediaGenericSearchPage>(this, "https://www.xvideos.com/", mgl::vec2i(352/1.5f, 198/1.5f), true, std::move(extra_commands)); add_xvideos_handlers(search_page.get()); tabs.push_back(Tab{create_body(false, true), std::move(search_page), create_search_bar("Search...", 500)}); use_youtube_dl = true; } else if(strcmp(plugin_name, "xhamster") == 0) { check_youtube_dl_installed(plugin_name); - auto search_page = std::make_unique<MediaGenericSearchPage>(this, "https://xhamster.com/", mgl::vec2i(240, 135), false); + auto search_page = std::make_unique<MediaGenericSearchPage>(this, "https://xhamster.com/", mgl::vec2i(240, 135), true); add_xhamster_handlers(search_page.get()); tabs.push_back(Tab{create_body(false, true), std::move(search_page), create_search_bar("Search...", 500)}); use_youtube_dl = true; @@ -3234,16 +3234,16 @@ namespace QuickMedia { if(video_page->autoplay_next_item()) return; - // TODO: Make this also work for other video plugins - if(strcmp(plugin_name, "youtube") != 0 || is_resume_go_back) - return; - std::string url = video_page->get_url(); related_videos_task = AsyncTask<void>([&related_videos, url, video_page]() { video_page->mark_watched(); related_videos = video_page->get_related_media(url); }); + // TODO: Make this also work for other video plugins + if(strcmp(plugin_name, "youtube") != 0 || is_resume_go_back) + return; + std::string video_id; if(!youtube_url_extract_id(video_page->get_url(), video_id)) { std::string err_msg = "Failed to extract id of youtube url "; @@ -3371,6 +3371,11 @@ namespace QuickMedia { video_player->get_time_in_file(&resume_start_time); load_video_error_check(std::to_string((int)resume_start_time)); } else if(pressed_keysym == XK_r && pressing_ctrl && !video_page->is_local()) { + cursor_hide_timer.restart(); + if(!cursor_visible) + window.set_cursor_visible(true); + cursor_visible = true; + bool cancelled = false; if(related_videos_task.valid()) { XUnmapWindow(disp, video_player_window); @@ -3396,9 +3401,9 @@ namespace QuickMedia { } if(!cancelled) { - if(!cursor_visible) - window.set_cursor_visible(true); - cursor_visible = true; + XUnmapWindow(disp, video_player_window); + XSync(disp, False); + XFlush(disp); std::vector<Tab> related_pages; TaskResult related_pages_result = run_task_with_loading_screen([&video_page, &related_videos, &channel_url, &related_pages]{ @@ -3409,7 +3414,7 @@ namespace QuickMedia { XMapWindow(disp, video_player_window); XSync(disp, False); show_notification("QuickMedia", "Failed to get related pages", Urgency::CRITICAL); - } else if(related_pages_result == TaskResult::TRUE) { + } else if(related_pages_result == TaskResult::TRUE && !related_pages.empty()) { bool page_changed = false; double resume_start_time = 0.0; page_loop(related_pages, video_page->get_related_pages_first_tab(), [&](const std::vector<Tab> &new_tabs) { |