diff options
| author | 2022-11-21 17:24:59 -0600 | |
|---|---|---|
| committer | 2022-11-21 17:24:59 -0600 | |
| commit | 3027917f39667b627d3279957a88f99ae063bf6c (patch) | |
| tree | 92da8176bbe5251740f39445a7d24df294de2b56 | |
| parent | Merge pull request #9279 from liamwhite/this-would-have-never-happened-in-rust (diff) | |
| parent | qt_amiibo_settings: Use WebClient only if ENABLE_WEB_SERVICE is enabled (diff) | |
| download | yuzu-3027917f39667b627d3279957a88f99ae063bf6c.tar.gz yuzu-3027917f39667b627d3279957a88f99ae063bf6c.tar.xz yuzu-3027917f39667b627d3279957a88f99ae063bf6c.zip | |
Merge pull request #9292 from Morph1984/amiibo-web-service
qt_amiibo_settings: Use WebClient only if ENABLE_WEB_SERVICE is enabled
| -rw-r--r-- | src/yuzu/applets/qt_amiibo_settings.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/yuzu/applets/qt_amiibo_settings.cpp b/src/yuzu/applets/qt_amiibo_settings.cpp index efb7f6ecc..93ad4b4f9 100644 --- a/src/yuzu/applets/qt_amiibo_settings.cpp +++ b/src/yuzu/applets/qt_amiibo_settings.cpp | |||
| @@ -13,7 +13,9 @@ | |||
| 13 | #include "input_common/drivers/virtual_amiibo.h" | 13 | #include "input_common/drivers/virtual_amiibo.h" |
| 14 | #include "input_common/main.h" | 14 | #include "input_common/main.h" |
| 15 | #include "ui_qt_amiibo_settings.h" | 15 | #include "ui_qt_amiibo_settings.h" |
| 16 | #ifdef ENABLE_WEB_SERVICE | ||
| 16 | #include "web_service/web_backend.h" | 17 | #include "web_service/web_backend.h" |
| 18 | #endif | ||
| 17 | #include "yuzu/applets/qt_amiibo_settings.h" | 19 | #include "yuzu/applets/qt_amiibo_settings.h" |
| 18 | #include "yuzu/main.h" | 20 | #include "yuzu/main.h" |
| 19 | 21 | ||
| @@ -90,6 +92,7 @@ void QtAmiiboSettingsDialog::LoadAmiiboInfo() { | |||
| 90 | } | 92 | } |
| 91 | 93 | ||
| 92 | void QtAmiiboSettingsDialog::LoadAmiiboApiInfo(std::string_view amiibo_id) { | 94 | void QtAmiiboSettingsDialog::LoadAmiiboApiInfo(std::string_view amiibo_id) { |
| 95 | #ifdef ENABLE_WEB_SERVICE | ||
| 93 | // TODO: Host this data on our website | 96 | // TODO: Host this data on our website |
| 94 | WebService::Client client{"https://amiiboapi.com", {}, {}}; | 97 | WebService::Client client{"https://amiiboapi.com", {}, {}}; |
| 95 | WebService::Client image_client{"https://raw.githubusercontent.com", {}, {}}; | 98 | WebService::Client image_client{"https://raw.githubusercontent.com", {}, {}}; |
| @@ -134,6 +137,7 @@ void QtAmiiboSettingsDialog::LoadAmiiboApiInfo(std::string_view amiibo_id) { | |||
| 134 | pixmap = pixmap.scaled(250, 350, Qt::AspectRatioMode::KeepAspectRatio, | 137 | pixmap = pixmap.scaled(250, 350, Qt::AspectRatioMode::KeepAspectRatio, |
| 135 | Qt::TransformationMode::SmoothTransformation); | 138 | Qt::TransformationMode::SmoothTransformation); |
| 136 | ui->amiiboImageLabel->setPixmap(pixmap); | 139 | ui->amiiboImageLabel->setPixmap(pixmap); |
| 140 | #endif | ||
| 137 | } | 141 | } |
| 138 | 142 | ||
| 139 | void QtAmiiboSettingsDialog::LoadAmiiboData() { | 143 | void QtAmiiboSettingsDialog::LoadAmiiboData() { |