summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2017-06-27 22:46:52 -0400
committerGravatar bunnei2017-07-10 00:15:39 -0400
commit8abf808854e92af5f656744d582fbc7830eb68e2 (patch)
tree6dccb43e9db5ff0d3d1037a2b5c0a545d3fb7e54
parentlogging: Add WebService as a log cateogry. (diff)
downloadyuzu-8abf808854e92af5f656744d582fbc7830eb68e2.tar.gz
yuzu-8abf808854e92af5f656744d582fbc7830eb68e2.tar.xz
yuzu-8abf808854e92af5f656744d582fbc7830eb68e2.zip
settings: Add telemetry endpoint URL.
Diffstat (limited to '')
-rw-r--r--src/citra/config.cpp4
-rw-r--r--src/citra/default_ini.h4
-rw-r--r--src/citra_qt/configuration/config.cpp12
-rw-r--r--src/core/settings.h3
4 files changed, 23 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 957d8dc86..69247b166 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -151,6 +151,10 @@ void Config::ReadValues() {
151 Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false); 151 Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false);
152 Settings::values.gdbstub_port = 152 Settings::values.gdbstub_port =
153 static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689)); 153 static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689));
154
155 // Web Service
156 Settings::values.telemetry_endpoint_url = sdl2_config->Get(
157 "WebService", "telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry");
154} 158}
155 159
156void Config::Reload() { 160void Config::Reload() {
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index d8a8fe44f..a12498e0f 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -168,5 +168,9 @@ log_filter = *:Info
168# Port for listening to GDB connections. 168# Port for listening to GDB connections.
169use_gdbstub=false 169use_gdbstub=false
170gdbstub_port=24689 170gdbstub_port=24689
171
172[WebService]
173# Endpoint URL for submitting telemetry data
174telemetry_endpoint_url =
171)"; 175)";
172} 176}
diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp
index 64ffc9152..40142b6d9 100644
--- a/src/citra_qt/configuration/config.cpp
+++ b/src/citra_qt/configuration/config.cpp
@@ -133,6 +133,13 @@ void Config::ReadValues() {
133 Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt(); 133 Settings::values.gdbstub_port = qt_config->value("gdbstub_port", 24689).toInt();
134 qt_config->endGroup(); 134 qt_config->endGroup();
135 135
136 qt_config->beginGroup("WebService");
137 Settings::values.telemetry_endpoint_url =
138 qt_config->value("telemetry_endpoint_url", "https://services.citra-emu.org/api/telemetry")
139 .toString()
140 .toStdString();
141 qt_config->endGroup();
142
136 qt_config->beginGroup("UI"); 143 qt_config->beginGroup("UI");
137 144
138 qt_config->beginGroup("UILayout"); 145 qt_config->beginGroup("UILayout");
@@ -268,6 +275,11 @@ void Config::SaveValues() {
268 qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port); 275 qt_config->setValue("gdbstub_port", Settings::values.gdbstub_port);
269 qt_config->endGroup(); 276 qt_config->endGroup();
270 277
278 qt_config->beginGroup("WebService");
279 qt_config->setValue("telemetry_endpoint_url",
280 QString::fromStdString(Settings::values.telemetry_endpoint_url));
281 qt_config->endGroup();
282
271 qt_config->beginGroup("UI"); 283 qt_config->beginGroup("UI");
272 284
273 qt_config->beginGroup("UILayout"); 285 qt_config->beginGroup("UILayout");
diff --git a/src/core/settings.h b/src/core/settings.h
index 03c64c94c..ee16bb90a 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -126,6 +126,9 @@ struct Values {
126 // Debugging 126 // Debugging
127 bool use_gdbstub; 127 bool use_gdbstub;
128 u16 gdbstub_port; 128 u16 gdbstub_port;
129
130 // WebService
131 std::string telemetry_endpoint_url;
129} extern values; 132} extern values;
130 133
131// a special value for Values::region_value indicating that citra will automatically select a region 134// a special value for Values::region_value indicating that citra will automatically select a region