summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/settings.h44
-rw-r--r--src/core/telemetry_session.cpp9
2 files changed, 0 insertions, 53 deletions
diff --git a/src/core/settings.h b/src/core/settings.h
index ebf072cff..f2c88e5d4 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -10,13 +10,6 @@
10 10
11namespace Settings { 11namespace Settings {
12 12
13enum class LayoutOption {
14 Default,
15 SingleScreen,
16 LargeScreen,
17 SideScreen,
18};
19
20namespace NativeButton { 13namespace NativeButton {
21enum Values { 14enum Values {
22 A, 15 A,
@@ -78,9 +71,6 @@ enum class CpuCore {
78}; 71};
79 72
80struct Values { 73struct Values {
81 // CheckNew3DS
82 bool is_new_3ds;
83
84 // Controls 74 // Controls
85 std::array<std::string, NativeButton::NumButtons> buttons; 75 std::array<std::string, NativeButton::NumButtons> buttons;
86 std::array<std::string, NativeAnalog::NumAnalogs> analogs; 76 std::array<std::string, NativeAnalog::NumAnalogs> analogs;
@@ -93,54 +83,20 @@ struct Values {
93 // Data Storage 83 // Data Storage
94 bool use_virtual_sd; 84 bool use_virtual_sd;
95 85
96 // System Region
97 int region_value;
98
99 // Renderer 86 // Renderer
100 bool use_hw_renderer;
101 bool use_shader_jit;
102 float resolution_factor; 87 float resolution_factor;
103 bool use_vsync;
104 bool toggle_framelimit; 88 bool toggle_framelimit;
105 89
106 LayoutOption layout_option;
107 bool swap_screen;
108 bool custom_layout;
109 u16 custom_top_left;
110 u16 custom_top_top;
111 u16 custom_top_right;
112 u16 custom_top_bottom;
113 u16 custom_bottom_left;
114 u16 custom_bottom_top;
115 u16 custom_bottom_right;
116 u16 custom_bottom_bottom;
117
118 float bg_red; 90 float bg_red;
119 float bg_green; 91 float bg_green;
120 float bg_blue; 92 float bg_blue;
121 93
122 std::string log_filter; 94 std::string log_filter;
123 95
124 // Audio
125 std::string sink_id;
126 bool enable_audio_stretching;
127 std::string audio_device_id;
128
129 // Debugging 96 // Debugging
130 bool use_gdbstub; 97 bool use_gdbstub;
131 u16 gdbstub_port; 98 u16 gdbstub_port;
132
133 // WebService
134 bool enable_telemetry;
135 std::string telemetry_endpoint_url;
136 std::string verify_endpoint_url;
137 std::string citra_username;
138 std::string citra_token;
139} extern values; 99} extern values;
140 100
141// a special value for Values::region_value indicating that citra will automatically select a region
142// value to fit the region lockout info of the game
143static constexpr int REGION_VALUE_AUTO_SELECT = -1;
144
145void Apply(); 101void Apply();
146} // namespace Settings 102} // namespace Settings
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index 4e402bc58..a613889f0 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -146,21 +146,12 @@ TelemetrySession::TelemetrySession() {
146#endif 146#endif
147 147
148 // Log user configuration information 148 // Log user configuration information
149 AddField(Telemetry::FieldType::UserConfig, "Audio_EnableAudioStretching",
150 Settings::values.enable_audio_stretching);
151 AddField(Telemetry::FieldType::UserConfig, "Core_CpuCore", 149 AddField(Telemetry::FieldType::UserConfig, "Core_CpuCore",
152 static_cast<int>(Settings::values.cpu_core)); 150 static_cast<int>(Settings::values.cpu_core));
153 AddField(Telemetry::FieldType::UserConfig, "Renderer_ResolutionFactor", 151 AddField(Telemetry::FieldType::UserConfig, "Renderer_ResolutionFactor",
154 Settings::values.resolution_factor); 152 Settings::values.resolution_factor);
155 AddField(Telemetry::FieldType::UserConfig, "Renderer_ToggleFramelimit", 153 AddField(Telemetry::FieldType::UserConfig, "Renderer_ToggleFramelimit",
156 Settings::values.toggle_framelimit); 154 Settings::values.toggle_framelimit);
157 AddField(Telemetry::FieldType::UserConfig, "Renderer_UseHwRenderer",
158 Settings::values.use_hw_renderer);
159 AddField(Telemetry::FieldType::UserConfig, "Renderer_UseShaderJit",
160 Settings::values.use_shader_jit);
161 AddField(Telemetry::FieldType::UserConfig, "Renderer_UseVsync", Settings::values.use_vsync);
162 AddField(Telemetry::FieldType::UserConfig, "System_IsNew3ds", Settings::values.is_new_3ds);
163 AddField(Telemetry::FieldType::UserConfig, "System_RegionValue", Settings::values.region_value);
164} 155}
165 156
166TelemetrySession::~TelemetrySession() { 157TelemetrySession::~TelemetrySession() {