From 0e8a2c7222b978507f62d7e0b83187b16532eae8 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 28 Jul 2018 13:35:22 -0400
Subject: audio_core: Misc. improvements to stream/buffer/audio_out.

---
 src/audio_core/audio_out.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/src/audio_core/audio_out.h b/src/audio_core/audio_out.h
index a86499d10..962360d09 100644
--- a/src/audio_core/audio_out.h
+++ b/src/audio_core/audio_out.h
@@ -13,15 +13,13 @@
 
 namespace AudioCore {
 
-using StreamPtr = std::shared_ptr<Stream>;
-
 /**
  * Represents an audio playback interface, used to open and play audio streams
  */
 class AudioOut {
 public:
     /// Opens a new audio stream
-    StreamPtr OpenStream(int sample_rate, int num_channels,
+    StreamPtr OpenStream(u32 sample_rate, u32 num_channels,
                          Stream::ReleaseCallback&& release_callback);
 
     /// Returns a vector of recently released buffers specified by tag for the specified stream
@@ -37,7 +35,7 @@ public:
     bool QueueBuffer(StreamPtr stream, Buffer::Tag tag, std::vector<u8>&& data);
 
 private:
-    /// Active audio streams on the interface
+    SinkPtr sink;
     std::vector<StreamPtr> streams;
 };
 
-- 
cgit v1.2.3


From f437c11caf2c1afc0b7d0fdb808be10d7b1adfcf Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 28 Jul 2018 13:44:50 -0400
Subject: audio_core: Implement Sink and SinkStream interfaces with cubeb.

---
 src/audio_core/audio_out.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/audio_core/audio_out.h b/src/audio_core/audio_out.h
index 962360d09..8d9b695d4 100644
--- a/src/audio_core/audio_out.h
+++ b/src/audio_core/audio_out.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "audio_core/buffer.h"
+#include "audio_core/sink.h"
 #include "audio_core/stream.h"
 #include "common/common_types.h"
 
@@ -36,7 +37,6 @@ public:
 
 private:
     SinkPtr sink;
-    std::vector<StreamPtr> streams;
 };
 
 } // namespace AudioCore
-- 
cgit v1.2.3