summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-04-03 00:30:04 +0200
committerGitHub <noreply@github.com>2018-04-03 00:30:04 +0200
commit6cd14823540b820ccdbdbbb6891bba6696197396 (patch)
treeab001eb610ab5ca8f8c9bb0d6fb7ac9e90220a5c
parentMerge pull request #304 from daniellimws/fix-openbsd (diff)
parenttelemetry.h: Reword comment from citra to yuzu (diff)
downloadyuzu-6cd14823540b820ccdbdbbb6891bba6696197396.tar
yuzu-6cd14823540b820ccdbdbbb6891bba6696197396.tar.gz
yuzu-6cd14823540b820ccdbdbbb6891bba6696197396.tar.bz2
yuzu-6cd14823540b820ccdbdbbb6891bba6696197396.tar.lz
yuzu-6cd14823540b820ccdbdbbb6891bba6696197396.tar.xz
yuzu-6cd14823540b820ccdbdbbb6891bba6696197396.tar.zst
yuzu-6cd14823540b820ccdbdbbb6891bba6696197396.zip
-rw-r--r--src/common/telemetry.h2
-rw-r--r--src/core/telemetry_session.cpp4
-rw-r--r--src/core/telemetry_session.h4
-rw-r--r--src/yuzu_cmd/default_ini.h10
4 files changed, 10 insertions, 10 deletions
diff --git a/src/common/telemetry.h b/src/common/telemetry.h
index 3694c76f2..7a09df0a7 100644
--- a/src/common/telemetry.h
+++ b/src/common/telemetry.h
@@ -15,7 +15,7 @@ namespace Telemetry {
/// Field type, used for grouping fields together in the final submitted telemetry log
enum class FieldType : u8 {
None = 0, ///< No specified field group
- App, ///< Citra application fields (e.g. version, branch, etc.)
+ App, ///< yuzu application fields (e.g. version, branch, etc.)
Session, ///< Emulated session fields (e.g. title ID, log, etc.)
Performance, ///< Emulated performance (e.g. fps, emulated CPU speed, etc.)
UserFeedback, ///< User submitted feedback (e.g. star rating, user notes, etc.)
diff --git a/src/core/telemetry_session.cpp b/src/core/telemetry_session.cpp
index b3ffcd443..cecf0a5cb 100644
--- a/src/core/telemetry_session.cpp
+++ b/src/core/telemetry_session.cpp
@@ -87,8 +87,8 @@ TelemetrySession::TelemetrySession() {
#ifdef ENABLE_WEB_SERVICE
if (Settings::values.enable_telemetry) {
backend = std::make_unique<WebService::TelemetryJson>(
- Settings::values.telemetry_endpoint_url, Settings::values.citra_username,
- Settings::values.citra_token);
+ Settings::values.telemetry_endpoint_url, Settings::values.yuzu_username,
+ Settings::values.yuzu_token);
} else {
backend = std::make_unique<Telemetry::NullVisitor>();
}
diff --git a/src/core/telemetry_session.h b/src/core/telemetry_session.h
index 550c6ea2d..dbc4f8bd4 100644
--- a/src/core/telemetry_session.h
+++ b/src/core/telemetry_session.h
@@ -50,8 +50,8 @@ u64 RegenerateTelemetryId();
/**
* Verifies the username and token.
- * @param username Citra username to use for authentication.
- * @param token Citra token to use for authentication.
+ * @param username yuzu username to use for authentication.
+ * @param token yuzu token to use for authentication.
* @param func A function that gets exectued when the verification is finished
* @returns Future with bool indicating whether the verification succeeded
*/
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index cf157bf27..895a42c39 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -177,12 +177,12 @@ gdbstub_port=24689
# 0: No, 1 (default): Yes
enable_telemetry =
# Endpoint URL for submitting telemetry data
-telemetry_endpoint_url = https://services.citra-emu.org/api/telemetry
+telemetry_endpoint_url =
# Endpoint URL to verify the username and token
-verify_endpoint_url = https://services.citra-emu.org/api/profile
-# Username and token for Citra Web Service
+verify_endpoint_url =
+# Username and token for yuzu Web Service
# See https://services.citra-emu.org/ for more info
-citra_username =
-citra_token =
+yuzu_username =
+yuzu_token =
)";
}