ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed namespace usage

This commit is contained in:
NicknineTheEagle 2024-06-19 11:09:31 +03:00 committed by Radosław Gliński
parent e4408b6bc3
commit db02755075
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/xenia/kernel/xam/xam_ui.cc
View File

@ -22,14 +22,13 @@
#include "xenia/ui/windowed_app_context.h" #include "xenia/ui/windowed_app_context.h"
#include "xenia/xbox.h" #include "xenia/xbox.h"
namespace xe {
namespace kernel {
namespace xam {
DEFINE_bool(storage_selection_dialog, false, DEFINE_bool(storage_selection_dialog, false,
"Show storage device selection dialog when the game requests it.", "Show storage device selection dialog when the game requests it.",
"UI"); "UI");
namespace xe {
namespace kernel {
namespace xam {
// TODO(gibbed): This is all one giant WIP that seems to work better than the // TODO(gibbed): This is all one giant WIP that seems to work better than the
// previous immediate synchronous completion of dialogs. // previous immediate synchronous completion of dialogs.
// //
@ -291,7 +290,7 @@ static dword_result_t XamShowMessageBoxUi(
} }
X_RESULT result; X_RESULT result;
if (::cvars::headless) { if (cvars::headless) {
// Auto-pick the focused button. // Auto-pick the focused button.
auto run = [result_ptr, active_button]() -> X_RESULT { auto run = [result_ptr, active_button]() -> X_RESULT {
*result_ptr = static_cast<uint32_t>(active_button); *result_ptr = static_cast<uint32_t>(active_button);
@ -363,7 +362,7 @@ dword_result_t XNotifyQueueUI_entry(dword_t exnq, dword_t dwUserIndex,
XELOGI("XNotifyQueueUI: {}", displayText); XELOGI("XNotifyQueueUI: {}", displayText);
if (::cvars::headless) { if (cvars::headless) {
return X_ERROR_SUCCESS; return X_ERROR_SUCCESS;
} }
@ -483,7 +482,7 @@ dword_result_t XamShowKeyboardUI_entry(
auto buffer_size = static_cast<size_t>(buffer_length) * 2; auto buffer_size = static_cast<size_t>(buffer_length) * 2;
X_RESULT result; X_RESULT result;
if (::cvars::headless) { if (cvars::headless) {
auto run = [default_text, buffer, buffer_length, auto run = [default_text, buffer, buffer_length,
buffer_size]() -> X_RESULT { buffer_size]() -> X_RESULT {
// Redirect default_text back into the buffer. // Redirect default_text back into the buffer.
@ -533,7 +532,7 @@ dword_result_t XamShowDeviceSelectorUI_entry(
pointer_t<XAM_OVERLAPPED> overlapped) { pointer_t<XAM_OVERLAPPED> overlapped) {
std::vector<const DummyDeviceInfo*> devices = ListStorageDevices(); std::vector<const DummyDeviceInfo*> devices = ListStorageDevices();
if (::cvars::headless || !cvars::storage_selection_dialog) { if (cvars::headless || !cvars::storage_selection_dialog) {
// Default to the first storage device (HDD) if headless. // Default to the first storage device (HDD) if headless.
return xeXamDispatchHeadless( return xeXamDispatchHeadless(
[device_id_ptr, devices]() -> X_RESULT { [device_id_ptr, devices]() -> X_RESULT {
@ -573,7 +572,7 @@ dword_result_t XamShowDeviceSelectorUI_entry(
DECLARE_XAM_EXPORT1(XamShowDeviceSelectorUI, kUI, kImplemented); DECLARE_XAM_EXPORT1(XamShowDeviceSelectorUI, kUI, kImplemented);
void XamShowDirtyDiscErrorUI_entry(dword_t user_index) { void XamShowDirtyDiscErrorUI_entry(dword_t user_index) {
if (::cvars::headless) { if (cvars::headless) {
assert_always(); assert_always();
exit(1); exit(1);
return; return;