diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2016-04-27 13:53:23 +0100 | 
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2016-04-30 07:41:02 +0100 | 
| commit | 4e971f44a27c2e4abc25ddf0720d287a688e0a4d (patch) | |
| tree | c88ce045e20e40dd022a56dbd4a5281024591e61 /src/audio_core/hle | |
| parent | 8b94422e3e51d29171c7e8cc02bec1fbec9b29ea (diff) | |
Audio: Add sink selection to configuration files
Diffstat (limited to 'src/audio_core/hle')
| -rw-r--r-- | src/audio_core/hle/dsp.cpp | 9 | ||||
| -rw-r--r-- | src/audio_core/hle/dsp.h | 11 | 
2 files changed, 20 insertions, 0 deletions
| diff --git a/src/audio_core/hle/dsp.cpp b/src/audio_core/hle/dsp.cpp index 5759a5b9e..4d44bd2d9 100644 --- a/src/audio_core/hle/dsp.cpp +++ b/src/audio_core/hle/dsp.cpp @@ -2,8 +2,11 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. +#include <memory> +  #include "audio_core/hle/dsp.h"  #include "audio_core/hle/pipe.h" +#include "audio_core/sink.h"  namespace DSP {  namespace HLE { @@ -35,6 +38,8 @@ static SharedMemory& WriteRegion() {      return g_regions[1 - CurrentRegionIndex()];  } +static std::unique_ptr<AudioCore::Sink> sink; +  void Init() {      DSP::HLE::ResetPipes();  } @@ -46,5 +51,9 @@ bool Tick() {      return true;  } +void SetSink(std::unique_ptr<AudioCore::Sink> sink_) { +    sink = std::move(sink_); +} +  } // namespace HLE  } // namespace DSP diff --git a/src/audio_core/hle/dsp.h b/src/audio_core/hle/dsp.h index f0f125284..4f2410c27 100644 --- a/src/audio_core/hle/dsp.h +++ b/src/audio_core/hle/dsp.h @@ -6,6 +6,7 @@  #include <array>  #include <cstddef> +#include <memory>  #include <type_traits>  #include "audio_core/hle/common.h" @@ -15,6 +16,10 @@  #include "common/common_types.h"  #include "common/swap.h" +namespace AudioCore { +class Sink; +} +  namespace DSP {  namespace HLE { @@ -535,5 +540,11 @@ void Shutdown();   */  bool Tick(); +/** + * Set the output sink. This must be called before calling Tick(). + * @param sink The sink to which audio will be output to. + */ +void SetSink(std::unique_ptr<AudioCore::Sink> sink); +  } // namespace HLE  } // namespace DSP | 
