diff options
| author | 2024-01-26 15:29:04 +0000 | |
|---|---|---|
| committer | 2024-01-27 03:30:09 +0000 | |
| commit | da410506a401abc853ee23e56ca1e25eb47cd6e6 (patch) | |
| tree | 6a42e537b6bfbdb460e7f542e4731fc5cad40dd8 /src/core/hle/service/caps | |
| parent | Merge pull request #12808 from t895/uri-moment (diff) | |
| download | yuzu-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/hle/service/caps')
| -rw-r--r-- | src/core/hle/service/caps/caps_manager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/caps/caps_manager.cpp b/src/core/hle/service/caps/caps_manager.cpp index e3b8ecf3e..3a22b135f 100644 --- a/src/core/hle/service/caps/caps_manager.cpp +++ b/src/core/hle/service/caps/caps_manager.cpp | |||
| @@ -246,10 +246,10 @@ Result AlbumManager::SaveScreenShot(ApplicationAlbumEntry& out_entry, | |||
| 246 | system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true); | 246 | system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true); |
| 247 | 247 | ||
| 248 | std::shared_ptr<Service::PSC::Time::SystemClock> user_clock{}; | 248 | std::shared_ptr<Service::PSC::Time::SystemClock> user_clock{}; |
| 249 | static_service->GetStandardUserSystemClock(user_clock); | 249 | static_service->GetStandardUserSystemClock(&user_clock); |
| 250 | 250 | ||
| 251 | s64 posix_time{}; | 251 | s64 posix_time{}; |
| 252 | auto result = user_clock->GetCurrentTime(posix_time); | 252 | auto result = user_clock->GetCurrentTime(&posix_time); |
| 253 | 253 | ||
| 254 | if (result.IsError()) { | 254 | if (result.IsError()) { |
| 255 | return result; | 255 | return result; |
| @@ -268,10 +268,10 @@ Result AlbumManager::SaveEditedScreenShot(ApplicationAlbumEntry& out_entry, | |||
| 268 | system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true); | 268 | system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true); |
| 269 | 269 | ||
| 270 | std::shared_ptr<Service::PSC::Time::SystemClock> user_clock{}; | 270 | std::shared_ptr<Service::PSC::Time::SystemClock> user_clock{}; |
| 271 | static_service->GetStandardUserSystemClock(user_clock); | 271 | static_service->GetStandardUserSystemClock(&user_clock); |
| 272 | 272 | ||
| 273 | s64 posix_time{}; | 273 | s64 posix_time{}; |
| 274 | auto result = user_clock->GetCurrentTime(posix_time); | 274 | auto result = user_clock->GetCurrentTime(&posix_time); |
| 275 | 275 | ||
| 276 | if (result.IsError()) { | 276 | if (result.IsError()) { |
| 277 | return result; | 277 | return result; |
| @@ -470,11 +470,11 @@ AlbumFileDateTime AlbumManager::ConvertToAlbumDateTime(u64 posix_time) const { | |||
| 470 | system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true); | 470 | system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true); |
| 471 | 471 | ||
| 472 | std::shared_ptr<Service::Glue::Time::TimeZoneService> timezone_service{}; | 472 | std::shared_ptr<Service::Glue::Time::TimeZoneService> timezone_service{}; |
| 473 | static_service->GetTimeZoneService(timezone_service); | 473 | static_service->GetTimeZoneService(&timezone_service); |
| 474 | 474 | ||
| 475 | Service::PSC::Time::CalendarTime calendar_time{}; | 475 | Service::PSC::Time::CalendarTime calendar_time{}; |
| 476 | Service::PSC::Time::CalendarAdditionalInfo additional_info{}; | 476 | Service::PSC::Time::CalendarAdditionalInfo additional_info{}; |
| 477 | timezone_service->ToCalendarTimeWithMyRule(calendar_time, additional_info, posix_time); | 477 | timezone_service->ToCalendarTimeWithMyRule(&calendar_time, &additional_info, posix_time); |
| 478 | 478 | ||
| 479 | return { | 479 | return { |
| 480 | .year = calendar_time.year, | 480 | .year = calendar_time.year, |