From 3f0421bea6b37d81d2d66c001b0fac2df91dd702 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Fri, 3 Sep 2021 03:54:00 +0200 Subject: Show youtube play fail reason in notification, more items below correct width! --- plugins/Page.hpp | 5 ++++- plugins/Youtube.hpp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'plugins') diff --git a/plugins/Page.hpp b/plugins/Page.hpp index 3ecb016..6944afb 100644 --- a/plugins/Page.hpp +++ b/plugins/Page.hpp @@ -151,7 +151,10 @@ namespace QuickMedia { virtual std::string url_get_playable_url(const std::string &url) { return url; } virtual bool video_should_be_skipped(const std::string &url) { (void)url; return false; } // This needs to be called before the other functions are called - virtual PluginResult load(std::string &title, std::string &channel_url, std::vector &chapters) { (void)title; (void)channel_url; (void)chapters; return PluginResult::OK; } + virtual PluginResult load(std::string &title, std::string &channel_url, std::vector &chapters, std::string &err_str) { + (void)title; (void)channel_url; (void)chapters; (void)err_str; + return PluginResult::OK; + } virtual void mark_watched() {}; // Should not do any network request to not slow down video loading virtual void get_subtitles(SubtitleData &subtitle_data) { (void)subtitle_data; } diff --git a/plugins/Youtube.hpp b/plugins/Youtube.hpp index e2bc2a4..97dea19 100644 --- a/plugins/Youtube.hpp +++ b/plugins/Youtube.hpp @@ -151,11 +151,11 @@ namespace QuickMedia { std::string get_url_timestamp() override { return timestamp; } std::string get_video_url(int max_height, bool &has_embedded_audio, std::string &ext) override; std::string get_audio_url(std::string &ext) override; - PluginResult load(std::string &title, std::string &channel_url, std::vector &chapters) override; + PluginResult load(std::string &title, std::string &channel_url, std::vector &chapters, std::string &err_str) override; void mark_watched() override; void get_subtitles(SubtitleData &subtitle_data) override; private: - PluginResult parse_video_response(const Json::Value &json_root, std::string &title, std::string &channel_url, std::vector &chapters); + PluginResult parse_video_response(const Json::Value &json_root, std::string &title, std::string &channel_url, std::vector &chapters, std::string &err_str); void parse_format(const Json::Value &format_json, bool is_adaptive); void parse_formats(const Json::Value &streaming_data_json); private: -- cgit v1.2.3