AudioServer: Add a buffer queue so we can buffer some sound.

The idea here is to keep a small number of sample buffers queued in the
AudioServer so we don't get caught without something to play.

3 files changed, 19 insertions, 0 deletions

diff --git a/Libraries/LibAudio/AClientConnection.cpp b/Libraries/LibAudio/AClientConnection.cpp
index 0cb64578b2..abe9a307c4 100644
--- a/Libraries/LibAudio/AClientConnection.cpp
+++ b/Libraries/LibAudio/AClientConnection.cpp
@@ -25,3 +25,18 @@ void AClientConnection::play(const ABuffer& buffer, bool block)
     request.play_buffer.buffer_id = buffer.shared_buffer_id();
     sync_request(request, block ? ASAPI_ServerMessage::Type::FinishedPlayingBuffer : ASAPI_ServerMessage::Type::PlayingBuffer);
 }
+
+void AClientConnection::enqueue(const ABuffer& buffer)
+{
+    for (;;) {
+        const_cast<ABuffer&>(buffer).shared_buffer().share_with(server_pid());
+        ASAPI_ClientMessage request;
+        request.type = ASAPI_ClientMessage::Type::EnqueueBuffer;
+        request.play_buffer.buffer_id = buffer.shared_buffer_id();
+        auto response = sync_request(request, ASAPI_ServerMessage::Type::EnqueueBufferResponse);
+        if (response.success)
+            break;
+        dbg() << "EnqueueBuffer failed, retrying...";
+        sleep(1);
+    }
+}
diff --git a/Libraries/LibAudio/AClientConnection.h b/Libraries/LibAudio/AClientConnection.h
index 214af48bc0..2cc224353d 100644
--- a/Libraries/LibAudio/AClientConnection.h
+++ b/Libraries/LibAudio/AClientConnection.h
@@ -12,4 +12,5 @@ public:
 
     virtual void handshake() override;
     void play(const ABuffer&, bool block);
+    void enqueue(const ABuffer&);
 };
diff --git a/Libraries/LibAudio/ASAPI.h b/Libraries/LibAudio/ASAPI.h
index 227aee1027..0dabd28c86 100644
--- a/Libraries/LibAudio/ASAPI.h
+++ b/Libraries/LibAudio/ASAPI.h
@@ -6,10 +6,12 @@ struct ASAPI_ServerMessage {
         Greeting,
         PlayingBuffer,
         FinishedPlayingBuffer,
+        EnqueueBufferResponse,
     };
 
     Type type { Type::Invalid };
     unsigned extra_size { 0 };
+    bool success { true };
 
     union {
         struct {
@@ -27,6 +29,7 @@ struct ASAPI_ClientMessage {
         Invalid,
         Greeting,
         PlayBuffer,
+        EnqueueBuffer,
     };
 
     Type type { Type::Invalid };