From 34b3f8349814c8c3a7ca5f1f6bd36a98dd32a207 Mon Sep 17 00:00:00 2001
From: bunnei
Date: Thu, 2 Aug 2018 18:54:25 -0400
Subject: audio_core: Sinks need unique names as well.

---
 src/audio_core/null_sink.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/audio_core/null_sink.h')

diff --git a/src/audio_core/null_sink.h b/src/audio_core/null_sink.h
index 2e04438f7..66041ea3f 100644
--- a/src/audio_core/null_sink.h
+++ b/src/audio_core/null_sink.h
@@ -13,7 +13,8 @@ public:
     explicit NullSink(std::string){};
     ~NullSink() override = default;
 
-    SinkStream& AcquireSinkStream(u32 /*sample_rate*/, u32 /*num_channels*/) override {
+    SinkStream& AcquireSinkStream(u32 /*sample_rate*/, u32 /*num_channels*/,
+                                  const std::string& /*name*/) override {
         return null_sink_stream;
     }
 
-- 
cgit v1.2.3


From 1dee8ceda1e5ecd5ebaee464b1450f323e82305f Mon Sep 17 00:00:00 2001
From: bunnei
Date: Sat, 4 Aug 2018 00:03:12 -0400
Subject: audio_core: Use s16 where possible for audio samples.

---
 src/audio_core/null_sink.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/audio_core/null_sink.h')

diff --git a/src/audio_core/null_sink.h b/src/audio_core/null_sink.h
index 66041ea3f..f235d93e5 100644
--- a/src/audio_core/null_sink.h
+++ b/src/audio_core/null_sink.h
@@ -20,8 +20,7 @@ public:
 
 private:
     struct NullSinkStreamImpl final : SinkStream {
-        void EnqueueSamples(u32 /*num_channels*/, const s16* /*samples*/,
-                            size_t /*sample_count*/) override {}
+        void EnqueueSamples(u32 /*num_channels*/, const std::vector<s16>& /*samples*/) override {}
     } null_sink_stream;
 };
 
-- 
cgit v1.2.3