diff options
| author | 2016-09-21 11:29:48 -0700 | |
|---|---|---|
| committer | 2016-09-21 11:29:48 -0700 | |
| commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/core/settings.cpp | |
| parent | README: Specify master branch for Travis CI badge (diff) | |
| parent | Fix Travis clang-format check (diff) | |
| download | yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip | |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/core/settings.cpp')
| -rw-r--r-- | src/core/settings.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 1b6733a79..4a0969b00 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp | |||
| @@ -2,12 +2,9 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "settings.h" | ||
| 6 | |||
| 7 | #include "audio_core/audio_core.h" | 5 | #include "audio_core/audio_core.h" |
| 8 | |||
| 9 | #include "core/gdbstub/gdbstub.h" | 6 | #include "core/gdbstub/gdbstub.h" |
| 10 | 7 | #include "settings.h" | |
| 11 | #include "video_core/video_core.h" | 8 | #include "video_core/video_core.h" |
| 12 | 9 | ||
| 13 | namespace Settings { | 10 | namespace Settings { |
| @@ -25,7 +22,6 @@ void Apply() { | |||
| 25 | 22 | ||
| 26 | AudioCore::SelectSink(values.sink_id); | 23 | AudioCore::SelectSink(values.sink_id); |
| 27 | AudioCore::EnableStretching(values.enable_audio_stretching); | 24 | AudioCore::EnableStretching(values.enable_audio_stretching); |
| 28 | |||
| 29 | } | 25 | } |
| 30 | 26 | ||
| 31 | } // namespace | 27 | } // namespace |