diff options
author | dec05eba <dec05eba@protonmail.com> | 2022-03-09 01:23:22 +0100 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2022-03-09 01:23:22 +0100 |
commit | 15d06abbc5a8752631288441131b3ebf9124f25b (patch) | |
tree | 883387e6a1e835572c65145d58ccf0d42886c0aa /include | |
parent | a26d0fcc0a30a28ce0e458ea275fc0787c693bc6 (diff) |
Fix compile on clang
Diffstat (limited to 'include')
-rw-r--r-- | include/Body.hpp | 2 | ||||
-rw-r--r-- | include/QuickMedia.hpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/Body.hpp b/include/Body.hpp index 45749ce..ec73a29 100644 --- a/include/Body.hpp +++ b/include/Body.hpp @@ -20,7 +20,7 @@ namespace Json { namespace QuickMedia { void init_body_themes(); - class ThumbnailData; + struct ThumbnailData; using BodyItemRenderCallback = std::function<void(std::shared_ptr<BodyItem> &body_item)>; // Return true to merge using BodyItemMergeHandler = std::function<bool(BodyItem *prev_item, BodyItem *this_item)>; diff --git a/include/QuickMedia.hpp b/include/QuickMedia.hpp index f93b47c..d7680ff 100644 --- a/include/QuickMedia.hpp +++ b/include/QuickMedia.hpp @@ -18,14 +18,15 @@ #include <future> #include <thread> #include <stack> -#include <X11/Xlib.h> + +typedef struct _XDisplay Display; namespace QuickMedia { class Matrix; class FileManager; class MangaImagesPage; class ImageBoardThreadPage; - class RoomData; + struct RoomData; class MatrixChatPage; class VideoPage; class Tabs; @@ -111,7 +112,7 @@ namespace QuickMedia { void set_clipboard(const std::string &str); private: - void init(Window parent_window, std::string &program_path); + void init(unsigned long parent_window, std::string &program_path); void load_plugin_by_name(std::vector<Tab> &tabs, int &start_tab_index, FileManagerMimeType fm_mime_type, FileSelectionHandler file_selection_handler, std::string instance); void common_event_handler(mgl::Event &event); void handle_x11_events(); @@ -125,7 +126,7 @@ namespace QuickMedia { using PageLoopSubmitHandler = std::function<void(const std::vector<Tab> &new_tabs)>; // Returns false if the page loop was escaped by user navigation (pressing escape) or if there was an error at startup bool page_loop(std::vector<Tab> &tabs, int start_tab_index = 0, PageLoopSubmitHandler after_submit_handler = nullptr, bool go_to_previous_on_escape = true); - void video_page_download_video(const std::string &url, mgl::WindowHandle video_player_window = None); + void video_page_download_video(const std::string &url, mgl::WindowHandle video_player_window = 0); bool video_download_if_non_streamable(std::string &video_url, std::string &audio_url, bool &is_audio_only, bool &has_embedded_audio, PageType previous_page); int video_get_max_height(); void video_content_page(Page *parent_page, VideoPage *video_page, std::string video_title, bool download_if_streaming_fails, Body *parent_body, int play_index, int *parent_body_page = nullptr, const std::string &parent_page_search = ""); @@ -215,7 +216,6 @@ namespace QuickMedia { bool low_cpu_mode = false; bool window_closed = false; std::string pipe_selected_text; - XEvent xev; std::filesystem::path file_manager_start_dir; std::string youtube_url; std::unique_ptr<VideoPlayer> video_player; |