diff options
author | Lioncash <mathew1800@gmail.com> | 2020-08-11 17:08:10 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-08-13 20:19:08 +0200 |
commit | b724a4d90c2dcff0e800f7ab630b6ad0d5be1e58 (patch) | |
tree | 8cf24f11888d563e7f00f79f5023876b9752c107 /src/core/hle/service | |
parent | Merge pull request #4502 from lioncash/build (diff) | |
download | yuzu-b724a4d90c2dcff0e800f7ab630b6ad0d5be1e58.tar yuzu-b724a4d90c2dcff0e800f7ab630b6ad0d5be1e58.tar.gz yuzu-b724a4d90c2dcff0e800f7ab630b6ad0d5be1e58.tar.bz2 yuzu-b724a4d90c2dcff0e800f7ab630b6ad0d5be1e58.tar.lz yuzu-b724a4d90c2dcff0e800f7ab630b6ad0d5be1e58.tar.xz yuzu-b724a4d90c2dcff0e800f7ab630b6ad0d5be1e58.tar.zst yuzu-b724a4d90c2dcff0e800f7ab630b6ad0d5be1e58.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/am/applets/web_browser.cpp | 3 | ||||
-rw-r--r-- | src/core/hle/service/audio/audout_u.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/bcat/backend/boxcat.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.h | 10 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/core/hle/service/am/applets/web_browser.cpp b/src/core/hle/service/am/applets/web_browser.cpp index 9f30e167d..4157fbf39 100644 --- a/src/core/hle/service/am/applets/web_browser.cpp +++ b/src/core/hle/service/am/applets/web_browser.cpp @@ -551,7 +551,8 @@ void WebBrowser::ExecuteShop() { } void WebBrowser::ExecuteOffline() { - frontend.OpenPageLocal(filename, [this] { UnpackRomFS(); }, [this] { Finalize(); }); + frontend.OpenPageLocal( + filename, [this] { UnpackRomFS(); }, [this] { Finalize(); }); } } // namespace Service::AM::Applets diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index dd80dd1dc..9b4910e53 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -206,7 +206,7 @@ private: AudioCore::StreamPtr stream; std::string device_name; - [[maybe_unused]] AudoutParams audio_params {}; + [[maybe_unused]] AudoutParams audio_params{}; /// This is the event handle used to check if the audio buffer was released Kernel::EventPair buffer_event; diff --git a/src/core/hle/service/bcat/backend/boxcat.cpp b/src/core/hle/service/bcat/backend/boxcat.cpp index d29e78d7e..51c2ba964 100644 --- a/src/core/hle/service/bcat/backend/boxcat.cpp +++ b/src/core/hle/service/bcat/backend/boxcat.cpp @@ -365,8 +365,7 @@ bool Boxcat::Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) std::thread([this, title, &progress] { SynchronizeInternal(applet_manager, dir_getter, title, progress); - }) - .detach(); + }).detach(); return true; } @@ -377,8 +376,7 @@ bool Boxcat::SynchronizeDirectory(TitleIDVersion title, std::string name, std::thread([this, title, name, &progress] { SynchronizeInternal(applet_manager, dir_getter, title, progress, name); - }) - .detach(); + }).detach(); return true; } diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.h index ff85cbba6..1ebe949c0 100644 --- a/src/core/hle/service/nvflinger/nvflinger.h +++ b/src/core/hle/service/nvflinger/nvflinger.h @@ -86,11 +86,13 @@ public: [[nodiscard]] s64 GetNextTicks() const; - [[nodiscard]] std::unique_lock<std::mutex> Lock() const { return std::unique_lock{*guard}; } + [[nodiscard]] std::unique_lock<std::mutex> Lock() const { + return std::unique_lock{*guard}; + } - private : - /// Finds the display identified by the specified ID. - [[nodiscard]] VI::Display* FindDisplay(u64 display_id); +private: + /// Finds the display identified by the specified ID. + [[nodiscard]] VI::Display* FindDisplay(u64 display_id); /// Finds the display identified by the specified ID. [[nodiscard]] const VI::Display* FindDisplay(u64 display_id) const; |