From b5f0dc95db9af2ce58c3c0348598763f470458ab Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 2 Mar 2019 15:17:40 -0500 Subject: core/core: Replace direct usage of the global system telemetry accessor from Shutdown() The telemetry instance is actually a member of the class itself, so we can access it directly instead of going through the global accessor. --- src/core/core.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/core') diff --git a/src/core/core.cpp b/src/core/core.cpp index ab7181a05..3f4e9c3a8 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -182,13 +182,13 @@ struct System::Impl { void Shutdown() { // Log last frame performance stats - auto perf_results = GetAndResetPerfStats(); - Telemetry().AddField(Telemetry::FieldType::Performance, "Shutdown_EmulationSpeed", - perf_results.emulation_speed * 100.0); - Telemetry().AddField(Telemetry::FieldType::Performance, "Shutdown_Framerate", - perf_results.game_fps); - Telemetry().AddField(Telemetry::FieldType::Performance, "Shutdown_Frametime", - perf_results.frametime * 1000.0); + const auto perf_results = GetAndResetPerfStats(); + telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_EmulationSpeed", + perf_results.emulation_speed * 100.0); + telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Framerate", + perf_results.game_fps); + telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Frametime", + perf_results.frametime * 1000.0); is_powered_on = false; -- cgit v1.2.3 From b11492845938b5bea8f5927753e00328aaec56fc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 2 Mar 2019 15:22:14 -0500 Subject: core/core: Remove the global telemetry accessor function With all usages converted off of it, this function can be removed. --- src/core/core.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/core') diff --git a/src/core/core.h b/src/core/core.h index d720013f7..ba76a41d8 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -293,10 +293,6 @@ inline ARM_Interface& CurrentArmInterface() { return System::GetInstance().CurrentArmInterface(); } -inline TelemetrySession& Telemetry() { - return System::GetInstance().TelemetrySession(); -} - inline Kernel::Process* CurrentProcess() { return System::GetInstance().CurrentProcess(); } -- cgit v1.2.3