Mercurial > minori
comparison include/core/config.h @ 231:69f4768a820c
chore: merge divergent branches
| author | Paper <paper@paper.us.eu.org> |
|---|---|
| date | Sat, 13 Jan 2024 09:43:41 -0500 |
| parents | d030b30526d5 |
| children | c130f47f6f48 |
comparison
equal
deleted
inserted
replaced
| 230:2f5a9247e501 | 231:69f4768a820c |
|---|---|
| 7 | 7 |
| 8 #include "animia/player.h" | 8 #include "animia/player.h" |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 #include <set> | |
| 12 #include <utility> | 13 #include <utility> |
| 13 | 14 |
| 14 struct MediaPlayer { | 15 struct MediaPlayer { |
| 15 bool enabled = true; | 16 bool enabled = true; |
| 16 animia::Player player; | 17 animia::Player player; |
| 32 bool display_available_episodes; | 33 bool display_available_episodes; |
| 33 bool highlight_anime_if_available; | 34 bool highlight_anime_if_available; |
| 34 bool highlighted_anime_above_others; | 35 bool highlighted_anime_above_others; |
| 35 } anime_list; | 36 } anime_list; |
| 36 | 37 |
| 37 /* these should preferably be in an | |
| 38 "auth" struct... */ | |
| 39 struct { | 38 struct { |
| 40 struct { | 39 struct { |
| 41 std::string auth_token; | 40 std::string auth_token; |
| 42 std::string username; | |
| 43 int user_id; | 41 int user_id; |
| 44 } anilist; | 42 } anilist; |
| 45 } auth; | 43 } auth; |
| 46 | 44 |
| 47 struct { | 45 struct { |
| 52 struct { | 50 struct { |
| 53 std::string feed_link; | 51 std::string feed_link; |
| 54 } torrents; | 52 } torrents; |
| 55 | 53 |
| 56 struct { | 54 struct { |
| 57 std::vector<std::string> paths; | 55 bool real_time_monitor; |
| 56 std::set<std::string> paths; | |
| 58 } library; | 57 } library; |
| 59 }; | 58 }; |
| 60 | 59 |
| 61 #if (defined(WIN32) || defined(MACOSX)) | 60 #if (defined(WIN32) || defined(MACOSX)) |
| 62 constexpr std::string_view CONFIG_DIR = "Minori"; | 61 constexpr std::string_view CONFIG_DIR = "Minori"; |
