From a1327e910b77b23bc91ec9614a8132189f0b8486 Mon Sep 17 00:00:00 2001
From: Gilles Boccon-Gibod <bok@bok.net>
Date: Sun, 4 Jun 2023 15:11:13 -0700
Subject: [PATCH] allow the ui to join late

---
 apps/speaker/speaker.js | 17 +++++++++++------
 apps/speaker/speaker.py | 18 ++++++++++++++++--
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/apps/speaker/speaker.js b/apps/speaker/speaker.js
index 7010524..77cb1ff 100644
--- a/apps/speaker/speaker.js
+++ b/apps/speaker/speaker.js
@@ -123,6 +123,11 @@ function setConnectionText(message) {
     }
 }
 
+function setStreamState(state) {
+    streamState = state;
+    streamStateText.innerText = streamState;
+}
+
 function onAnimationFrame() {
     // FFT
     if (audioAnalyzer !== undefined) {
@@ -254,21 +259,21 @@ function onHelloMessage(params) {
         audioSupportMessageText.innerText = "";
         audioSupportMessageText.style.display = "none";
     }
+    if (params.streamState) {
+        setStreamState(params.streamState);
+    }
 }
 
 function onStartMessage(params) {
-    streamState = "STARTED";
-    streamStateText.innerText = streamState;
+    setStreamState("STARTED");
 }
 
 function onStopMessage(params) {
-    streamState = "STOPPED";
-    streamStateText.innerText = streamState;
+    setStreamState("STOPPED");
 }
 
 function onSuspendMessage(params) {
-    streamState = "SUSPENDED";
-    streamStateText.innerText = streamState;
+    setStreamState("SUSPENDED");
 }
 
 function onConnectionMessage(params) {
diff --git a/apps/speaker/speaker.py b/apps/speaker/speaker.py
index 93bafe2..b5482d3 100644
--- a/apps/speaker/speaker.py
+++ b/apps/speaker/speaker.py
@@ -19,6 +19,7 @@ from __future__ import annotations
 import asyncio
 import asyncio.subprocess
 from importlib import resources
+import enum
 import json
 import os
 import logging
@@ -364,9 +365,11 @@ class UiServer:
             await handler(**message_params)
 
     async def on_hello_message(self):
-        logger.debug('HELLO')
         await self.send_message(
-            'hello', bumble_version=bumble.__version__, codec=self.speaker().codec
+            'hello',
+            bumble_version=bumble.__version__,
+            codec=self.speaker().codec,
+            streamState=self.speaker().stream_state.name,
         )
         if connection := self.speaker().connection:
             await self.send_message(
@@ -394,6 +397,12 @@ class UiServer:
 
 # -----------------------------------------------------------------------------
 class Speaker:
+    class StreamState(enum.Enum):
+        IDLE = 0
+        STOPPED = 1
+        STARTED = 2
+        SUSPENDED = 3
+
     def __init__(self, device_config, transport, codec, discover, outputs, ui_port):
         self.device_config = device_config
         self.transport = transport
@@ -405,6 +414,7 @@ class Speaker:
         self.listener = None
         self.packets_received = 0
         self.bytes_received = 0
+        self.stream_state = Speaker.StreamState.IDLE
         self.outputs = []
         for output in outputs:
             if output == '@ffplay':
@@ -515,14 +525,17 @@ class Speaker:
 
     def on_sink_start(self):
         print("Sink Started\u001b[0K")
+        self.stream_state = self.StreamState.STARTED
         AsyncRunner.spawn(self.dispatch_to_outputs(lambda output: output.start()))
 
     def on_sink_stop(self):
         print("Sink Stopped\u001b[0K")
+        self.stream_state = self.StreamState.STOPPED
         AsyncRunner.spawn(self.dispatch_to_outputs(lambda output: output.stop()))
 
     def on_sink_suspend(self):
         print("Sink Suspended\u001b[0K")
+        self.stream_state = self.StreamState.SUSPENDED
         AsyncRunner.spawn(self.dispatch_to_outputs(lambda output: output.suspend()))
 
     def on_sink_configuration(self, config):
@@ -534,6 +547,7 @@ class Speaker:
 
     def on_rtp_channel_close(self):
         print("RTP Channel Closed")
+        self.stream_state = self.StreamState.IDLE
 
     def on_rtp_packet(self, packet):
         self.packets_received += 1