diff options
| author | 2016-09-21 11:29:48 -0700 | |
|---|---|---|
| committer | 2016-09-21 11:29:48 -0700 | |
| commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/audio_core/sink_details.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/audio_core/sink_details.cpp')
| -rw-r--r-- | src/audio_core/sink_details.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/audio_core/sink_details.cpp b/src/audio_core/sink_details.cpp index ba5e83d17..95ccc9e9d 100644 --- a/src/audio_core/sink_details.cpp +++ b/src/audio_core/sink_details.cpp | |||
| @@ -4,10 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | #include <memory> | 5 | #include <memory> |
| 6 | #include <vector> | 6 | #include <vector> |
| 7 | |||
| 8 | #include "audio_core/null_sink.h" | 7 | #include "audio_core/null_sink.h" |
| 9 | #include "audio_core/sink_details.h" | 8 | #include "audio_core/sink_details.h" |
| 10 | |||
| 11 | #ifdef HAVE_SDL2 | 9 | #ifdef HAVE_SDL2 |
| 12 | #include "audio_core/sdl2_sink.h" | 10 | #include "audio_core/sdl2_sink.h" |
| 13 | #endif | 11 | #endif |
| @@ -17,9 +15,9 @@ namespace AudioCore { | |||
| 17 | // g_sink_details is ordered in terms of desirability, with the best choice at the top. | 15 | // g_sink_details is ordered in terms of desirability, with the best choice at the top. |
| 18 | const std::vector<SinkDetails> g_sink_details = { | 16 | const std::vector<SinkDetails> g_sink_details = { |
| 19 | #ifdef HAVE_SDL2 | 17 | #ifdef HAVE_SDL2 |
| 20 | { "sdl2", []() { return std::make_unique<SDL2Sink>(); } }, | 18 | {"sdl2", []() { return std::make_unique<SDL2Sink>(); }}, |
| 21 | #endif | 19 | #endif |
| 22 | { "null", []() { return std::make_unique<NullSink>(); } }, | 20 | {"null", []() { return std::make_unique<NullSink>(); }}, |
| 23 | }; | 21 | }; |
| 24 | 22 | ||
| 25 | } // namespace AudioCore | 23 | } // namespace AudioCore |