summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar Kelebek12024-01-26 15:29:04 +0000
committerGravatar Kelebek12024-01-27 03:30:09 +0000
commitda410506a401abc853ee23e56ca1e25eb47cd6e6 (patch)
tree6a42e537b6bfbdb460e7f542e4731fc5cad40dd8 /src/core/core.cpp
parentMerge pull request #12808 from t895/uri-moment (diff)
downloadyuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.tar.gz
yuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.tar.xz
yuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.zip
Move time services to new IPC.
Add some fixes/improvements to usage with the new IPC
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 1b412ac98..11bf8d2f6 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -200,22 +200,22 @@ struct System::Impl {
200 system.ServiceManager().GetService<Service::PSC::Time::StaticService>("time:s", true); 200 system.ServiceManager().GetService<Service::PSC::Time::StaticService>("time:s", true);
201 201
202 std::shared_ptr<Service::PSC::Time::SystemClock> user_clock; 202 std::shared_ptr<Service::PSC::Time::SystemClock> user_clock;
203 static_service_a->GetStandardUserSystemClock(user_clock); 203 static_service_a->GetStandardUserSystemClock(&user_clock);
204 204
205 std::shared_ptr<Service::PSC::Time::SystemClock> local_clock; 205 std::shared_ptr<Service::PSC::Time::SystemClock> local_clock;
206 static_service_a->GetStandardLocalSystemClock(local_clock); 206 static_service_a->GetStandardLocalSystemClock(&local_clock);
207 207
208 std::shared_ptr<Service::PSC::Time::SystemClock> network_clock; 208 std::shared_ptr<Service::PSC::Time::SystemClock> network_clock;
209 static_service_s->GetStandardNetworkSystemClock(network_clock); 209 static_service_s->GetStandardNetworkSystemClock(&network_clock);
210 210
211 std::shared_ptr<Service::Glue::Time::TimeZoneService> timezone_service; 211 std::shared_ptr<Service::Glue::Time::TimeZoneService> timezone_service;
212 static_service_a->GetTimeZoneService(timezone_service); 212 static_service_a->GetTimeZoneService(&timezone_service);
213 213
214 Service::PSC::Time::LocationName name{}; 214 Service::PSC::Time::LocationName name{};
215 auto new_name = Settings::GetTimeZoneString(Settings::values.time_zone_index.GetValue()); 215 auto new_name = Settings::GetTimeZoneString(Settings::values.time_zone_index.GetValue());
216 std::memcpy(name.name.data(), new_name.data(), std::min(name.name.size(), new_name.size())); 216 std::memcpy(name.data(), new_name.data(), std::min(name.size(), new_name.size()));
217 217
218 timezone_service->SetDeviceLocation(name); 218 timezone_service->SetDeviceLocationName(name);
219 219
220 u64 time_offset = 0; 220 u64 time_offset = 0;
221 if (Settings::values.custom_rtc_enabled) { 221 if (Settings::values.custom_rtc_enabled) {
@@ -233,7 +233,7 @@ struct System::Impl {
233 233
234 local_clock->SetCurrentTime(new_time); 234 local_clock->SetCurrentTime(new_time);
235 235
236 network_clock->GetSystemClockContext(context); 236 network_clock->GetSystemClockContext(&context);
237 settings_service->SetNetworkSystemClockContext(context); 237 settings_service->SetNetworkSystemClockContext(context);
238 network_clock->SetCurrentTime(new_time); 238 network_clock->SetCurrentTime(new_time);
239 } 239 }