diff options
| -rw-r--r-- | README.md | 2 | ||||
| m--------- | depends/html-search | 0 | ||||
| -rw-r--r-- | include/ResourceLoader.hpp | 3 | ||||
| -rw-r--r-- | project.conf | 4 | ||||
| -rw-r--r-- | src/ResourceLoader.cpp | 9 |
5 files changed, 7 insertions, 11 deletions
@@ -91,7 +91,7 @@ See project.conf \[dependencies]. ### Optional `mpv` needs to be installed to play videos.\ `youtube-dl` needs to be installed to play youtube music/video or spotify podcasts.\ -`notify-send` needs to be installed to show notifications (on Linux and other systems that uses d-bus notification system).\ +`libnotify` which provides `notify-send` needs to be installed to show notifications (on Linux and other systems that uses d-bus notification system).\ [automedia](https://git.dec05eba.com/AutoMedia/) needs to be installed when tracking manga with `Ctrl + T`.\ `waifu2x-ncnn-vulkan` needs to be installed when using the `--upscale-images` or `--upscale-images-always` option.\ `xdg-utils` which provides `xdg-open` needs to be installed when downloading torrents with `nyaa.si` plugin.\ diff --git a/depends/html-search b/depends/html-search -Subproject 3408efcc9d379d8ce8eb8c29db327e436ee5adb +Subproject 7edc6c0d896088cb981ea7bf60d929d62c7bb7e diff --git a/include/ResourceLoader.hpp b/include/ResourceLoader.hpp index 440eb7f..a778f18 100644 --- a/include/ResourceLoader.hpp +++ b/include/ResourceLoader.hpp @@ -14,8 +14,7 @@ namespace QuickMedia::FontLoader { enum class FontType { LATIN, LATIN_BOLD, - CJK, - EMOJI + CJK }; // Note: not thread-safe diff --git a/project.conf b/project.conf index 0ef12d7..1a3d734 100644 --- a/project.conf +++ b/project.conf @@ -4,8 +4,10 @@ type = "executable" version = "1.0.0" platforms = ["posix"] +[config] +# Ubuntu requires this +include_dirs = ["/usr/include/tidy"] # This needs to be commented out for now because rapidjson depends on undefined behavior according to gcc... -#[config] #error_on_warning = "true" [lang.cpp] diff --git a/src/ResourceLoader.cpp b/src/ResourceLoader.cpp index 85b3619..f7ce555 100644 --- a/src/ResourceLoader.cpp +++ b/src/ResourceLoader.cpp @@ -42,16 +42,10 @@ namespace QuickMedia::FontLoader { } case FontType::CJK: { noto_directories.push_back("/usr/share/fonts/noto-cjk"); - noto_directories.push_back("/usr/share/fonts/truetype/noto-cjk"); + noto_directories.push_back("/usr/share/fonts/opentype/noto"); font_file_name = "NotoSansCJK-Regular.ttc"; break; } - case FontType::EMOJI: { - noto_directories.push_back("/usr/share/fonts/noto"); - noto_directories.push_back("/usr/share/fonts/truetype/noto"); - font_file_name = "NotoColorEmoji.ttf"; - break; - } } for(const std::string ¬o_dir : noto_directories) { @@ -59,6 +53,7 @@ namespace QuickMedia::FontLoader { break; } + fprintf(stderr, "Warning: Failed to load font: %s\n", font_file_name.c_str()); font = new_font.get(); font_cache[(size_t)font_type] = std::move(new_font); malloc_trim(0); |